Merge pull request #2195 from glowtape/glowtape-curvesource

gcs: Fix Curve2 UI.
d-ronin · May 9, 2018 · ab94c51 · ab94c51
2 parents 77a4471 + 132e6f4
commit ab94c51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp
@@ -167,7 +167,7 @@ ConfigCcpmWidget::ConfigCcpmWidget(QWidget *parent)
     // refreshAirframeWidgetsValues triggers a whole cascade of curve-related calls
     // need set the collective curve info after this point to make it stick
     // tell mixercurve this is a pitch curve
-    m_ccpm->PitchCurve->setMixerType(MixerCurve::MIXERCURVE_OTHER);
+    m_ccpm->PitchCurve->setMixerType(MixerCurve::MIXERCURVE_OTHER, false);
     m_ccpm->PitchCurve->initLinearCurve(5, 1.0, -1.0);
 
     UpdateType();

diff --git a/ground/gcs/src/plugins/config/mixercurve.ui b/ground/gcs/src/plugins/config/mixercurve.ui
@@ -335,7 +335,14 @@
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="CBCurve2Source"/>
+      <widget class="QComboBox" name="CBCurve2Source">
+       <property name="objrelation" stdset="0">
+        <stringlist>
+         <string>objname:MixerSettings</string>
+         <string>fieldname:Curve2Source</string>
+        </stringlist>
+       </property>
+      </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">