Skip to content

Q
qgroundcontrol
Commit 7f0fa614 authored by John Tapsell's avatar John Tapsell
Browse files
Options

QGCXYPlot: Clean up layout a bit

parent 8966a49f
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 11 deletions
src/ui/designer/QGCXYPlot.cc
View file @ 7f0fa614
...@@ -159,8 +159,7 @@ QGCXYPlot::QGCXYPlot(QWidget *parent) : ...@@ -159,8 +159,7 @@ QGCXYPlot::QGCXYPlot(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
plot = new QwtPlot(); plot = new QwtPlot();
QHBoxLayout* layout = new QHBoxLayout(ui->xyPlotFrame); ui->xyPlotLayout->addWidget(plot);
layout->addWidget(plot);
connect(ui->editFinishButton, SIGNAL(clicked()), this, SLOT(endEditMode())); connect(ui->editFinishButton, SIGNAL(clicked()), this, SLOT(endEditMode()));
......
src/ui/designer/QGCXYPlot.ui
View file @ 7f0fa614
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
...@@ -41,6 +44,9 @@ ...@@ -41,6 +44,9 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
...@@ -56,6 +62,9 @@ ...@@ -56,6 +62,9 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
...@@ -343,17 +352,14 @@ ...@@ -343,17 +352,14 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="xyPlotFrame"> <layout class="QHBoxLayout" name="xyPlotLayout">
<property name="sizePolicy"> <property name="spacing">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="lineWidth">
<number>0</number> <number>0</number>
</property> </property>
</widget> <property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
...@@ -375,6 +381,12 @@ ...@@ -375,6 +381,12 @@
<property name="text"> <property name="text">
<string>Done</string> <string>Done</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment