rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-11 01:54:14 +01:00
Code Issues Releases Activity

OP-1168, OP-1180 Fixing Reload for AltitudeHold page. Fixing Realtime updates checkboxes.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2014-01-19 23:15:53 +01:00
parent 8fb17f7383
commit a2f69a5ad6
3 changed files with 84 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
View File

@ -92,6 +92,10 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
addWidget(ui->realTimeUpdates_8); addWidget(ui->realTimeUpdates_8);
connect(ui->realTimeUpdates_12, SIGNAL(toggled(bool)), this, SLOT(realtimeUpdatesSlot(bool))); connect(ui->realTimeUpdates_12, SIGNAL(toggled(bool)), this, SLOT(realtimeUpdatesSlot(bool)));
addWidget(ui->realTimeUpdates_12); addWidget(ui->realTimeUpdates_12);
connect(ui->realTimeUpdates_7, SIGNAL(toggled(bool)), this, SLOT(realtimeUpdatesSlot(bool)));
addWidget(ui->realTimeUpdates_7);
connect(ui->realTimeUpdates_9, SIGNAL(toggled(bool)), this, SLOT(realtimeUpdatesSlot(bool)));
addWidget(ui->realTimeUpdates_9);
connect(ui->checkBox_7, SIGNAL(toggled(bool)), this, SLOT(linkCheckBoxes(bool))); connect(ui->checkBox_7, SIGNAL(toggled(bool)), this, SLOT(linkCheckBoxes(bool)));
addWidget(ui->checkBox_7); addWidget(ui->checkBox_7);
@ -143,6 +147,8 @@ void ConfigStabilizationWidget::realtimeUpdatesSlot(bool value)
ui->realTimeUpdates_6->setChecked(value); ui->realTimeUpdates_6->setChecked(value);
ui->realTimeUpdates_8->setChecked(value); ui->realTimeUpdates_8->setChecked(value);
ui->realTimeUpdates_12->setChecked(value); ui->realTimeUpdates_12->setChecked(value);
ui->realTimeUpdates_7->setChecked(value);
ui->realTimeUpdates_9->setChecked(value);
if (value && !realtimeUpdates->isActive()) { if (value && !realtimeUpdates->isActive()) {
realtimeUpdates->start(AUTOMATIC_UPDATE_RATE); realtimeUpdates->start(AUTOMATIC_UPDATE_RATE);

123
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -8614,16 +8614,16 @@ border-radius: 5;</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>9</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>9</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>9</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>9</number>
</property> </property>
<item> <item>
<widget class="QCheckBox" name="lowThrottleZeroIntegral_8"> <widget class="QCheckBox" name="lowThrottleZeroIntegral_8">
@ -18750,8 +18750,8 @@ border-radius: 5;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>752</width> <width>796</width>
<height>526</height> <height>708</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
@ -26881,14 +26881,11 @@ border-radius: 5;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>284</width> <width>796</width>
<height>133</height> <height>708</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_17"> <layout class="QVBoxLayout" name="verticalLayout_19">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="gridGroupBox"> <widget class="QGroupBox" name="gridGroupBox">
<property name="title"> <property name="title">
@ -27107,7 +27104,7 @@ border-radius: 5;</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_23"> <layout class="QGridLayout" name="gridLayout_23">
<property name="leftMargin"> <property name="leftMargin">
<number>9</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>9</number> <number>9</number>
@ -27118,20 +27115,47 @@ border-radius: 5;</string>
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_11">
<property name="text">
<string>Default</string>
</property>
<property name="objrelation" stdset="0">
<stringlist>
<string>objname:StabilizationSettings</string>
<string>button:default</string>
<string>buttongroup:16</string>
</stringlist>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="horizontalSpacer_58">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="gridGroupBox"> <widget class="QFrame" name="gridFrame">
<layout class="QGridLayout" name="gridLayout_25"> <layout class="QGridLayout" name="gridLayout_25">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>9</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>9</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>9</number>
</property> </property>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QDoubleSpinBox" name="doubleSpinBox_6"> <widget class="QDoubleSpinBox" name="doubleSpinBox_6">
@ -27614,32 +27638,39 @@ border-radius: 5;</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1"> </layout>
<widget class="QPushButton" name="pushButton_11"> </widget>
<property name="text"> </item>
<string>Default</string> <item>
<widget class="QGroupBox" name="groupBox_9">
<property name="title">
<string>Instant Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<widget class="QCheckBox" name="realTimeUpdates_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="objrelation" stdset="0"> <property name="minimumSize">
<stringlist>
<string>objname:StabilizationSettings</string>
<string>button:default</string>
<string>buttongroup:16</string>
</stringlist>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="horizontalSpacer_58">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>136</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enabling this feature mean that any changes made to the sliders will be instantly sent and used by the Flight Controller, useful for two person tuning where one normally flies and ones changes the GCS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Update flight controller in real time</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -27696,8 +27727,8 @@ border-radius: 5;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>347</width> <width>796</width>
<height>500</height> <height>708</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_18"> <layout class="QVBoxLayout" name="verticalLayout_18">
@ -29523,7 +29554,7 @@ border-radius: 5;</string>
<string>element:Kp</string> <string>element:Kp</string>
<string>scale:0.01</string> <string>scale:0.01</string>
<string>haslimits:yes</string> <string>haslimits:yes</string>
<string>buttongroup:98</string> <string>buttongroup:98,10</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
@ -29570,7 +29601,7 @@ border-radius: 5;</string>
<string>element:Kp</string> <string>element:Kp</string>
<string>scale:0.01</string> <string>scale:0.01</string>
<string>haslimits:yes</string> <string>haslimits:yes</string>
<string>buttongroup:98</string> <string>buttongroup:98,10</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
@ -29617,7 +29648,7 @@ border-radius: 5;</string>
<string>element:Ki</string> <string>element:Ki</string>
<string>scale:0.00001</string> <string>scale:0.00001</string>
<string>haslimits:yes</string> <string>haslimits:yes</string>
<string>buttongroup:98</string> <string>buttongroup:98,10</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
@ -30763,7 +30794,7 @@ border-radius: 5;</string>
<string>fieldname:ThrottleExp</string> <string>fieldname:ThrottleExp</string>
<string>haslimits:no</string> <string>haslimits:no</string>
<string>scale:1</string> <string>scale:1</string>
<string>buttongroup:99</string> <string>buttongroup:99,10</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
@ -30837,7 +30868,7 @@ border-radius: 5;</string>
<string>fieldname:ThrottleRate</string> <string>fieldname:ThrottleRate</string>
<string>haslimits:no</string> <string>haslimits:no</string>
<string>scale:1</string> <string>scale:1</string>
<string>buttongroup:99</string> <string>buttongroup:99,10</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>
@ -31491,7 +31522,7 @@ border-radius: 5;</string>
<property name="title"> <property name="title">
<string>Instant Update</string> <string>Instant Update</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_14"> <layout class="QVBoxLayout" name="verticalLayout_14" stretch="0">
<item> <item>
<widget class="QCheckBox" name="realTimeUpdates_7"> <widget class="QCheckBox" name="realTimeUpdates_7">
<property name="sizePolicy"> <property name="sizePolicy">

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -362,7 +362,7 @@ void ConfigTaskWidget::enableControls(bool enable)
button->setEnabled(enable); button->setEnabled(enable);
} }
foreach(WidgetBinding * binding, m_widgetBindingsPerObject) { foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
if (binding->isEnabled() && binding->widget()) { if (binding->isEnabled() && binding->widget()) {
binding->widget()->setEnabled(enable); binding->widget()->setEnabled(enable);
foreach(ShadowWidgetBinding * shadow, binding->shadows()) { foreach(ShadowWidgetBinding * shadow, binding->shadows()) {