Corrections on Curves in MixerDialog and ExpoDialog (introduction of

CurveGroup to share code)

companion/src/CMakeLists.txt

@@ -191,6 +191,7 @@ SET( companion9x_MOC_HDRS
      myslider.h
      modelconfigdialog.h
      qcustomplot.h
+     helpers.h
 )
      
 SET( companion9x_UIS

companion/src/eeprominterface.cpp

@@ -412,7 +412,7 @@ QString RawSwitch::toString()
 QString CurveReference::toString()
 {
   if (value == 0) {
-    return "";
+    return "----";
   }
   else {
     switch(type) {

companion/src/eeprominterface.h

@@ -1008,6 +1008,11 @@ enum Capability {
  CSFunc,
  LCDWidth,
  GetThrSwitch,
+ VirtualInputs,
+ LuaInputs,
+ LimitsPer1000,
+ EnhancedCurves,
+ TelemetryInternalAlarms
 };
 
 enum UseContext {

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -694,7 +694,13 @@ int Open9xInterface::getCapability(const Capability capability)
     case LCDWidth:
       return (IS_TARANIS(board) ? 212 : 128) ;
     case GetThrSwitch:
-      return (IS_TARANIS(board) ?DSW_SF1 : DSW_THR) ;
+      return (IS_TARANIS(board) ? DSW_SF1 : DSW_THR) ;
+    case VirtualInputs:
+    case LuaInputs:
+    case LimitsPer1000:
+    case EnhancedCurves:
+    case TelemetryInternalAlarms:
+      return IS_TARANIS(board);
     default:
       return 0;
   }

companion/src/helpers.cpp

@@ -471,14 +471,35 @@ void populatePhasesCB(QComboBox *b, int value)
   b->setCurrentIndex(value + GetEepromInterface()->getCapability(FlightPhases));
 }
 
-void populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags)
+CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
+  QObject(),
+  curveTypeCB(curveTypeCB),
+  curveGVarCB(curveGVarCB),
+  curveValueCB(curveValueCB),
+  curveValueSB(curveValueSB),
+  curve(curve),
+  flags(flags),
+  lock(false),
+  lastType(-1)
 {
-  if (curveTypeCB->count() == 0) {
+  curveTypeCB->addItem(tr("Diff"));
-    curveTypeCB->addItem(QObject::tr("Diff"));
+  curveTypeCB->addItem(tr("Expo"));
-    curveTypeCB->addItem(QObject::tr("Expo"));
+  curveTypeCB->addItem(tr("Func"));
-    curveTypeCB->addItem(QObject::tr("Func"));
+  curveTypeCB->addItem(tr("Curve"));
-    curveTypeCB->addItem(QObject::tr("Curve"));
+
-  }
+  curveValueCB->setMaxVisibleItems(10);
+
+  connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(curveGVarCB, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
+  connect(curveValueCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(curveValueSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
+
+  update();
+}
+
+void CurveGroup::update()
+{
+  lock = true;
 
   curveTypeCB->setCurrentIndex(curve.type);
 
@@ -486,7 +507,10 @@ void populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QCom
     curveGVarCB->show();
     if (curve.value > 100 || curve.value < -100) {
       curveGVarCB->setChecked(true);
+      if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
+        lastType = curve.type;
         populateGVCB(curveValueCB, curve.value);
+      }
       curveValueCB->show();
       curveValueSB->hide();
     }
@@ -503,20 +527,27 @@ void populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QCom
     curveGVarCB->hide();
     curveValueSB->hide();
     curveValueCB->show();
-    curveValueCB->setMaxVisibleItems(10);
     switch (curve.type) {
       case CurveReference::CURVE_REF_FUNC:
+        if (lastType != curve.type) {
+          lastType = curve.type;
+          curveValueCB->clear();
           for (int i=0; i<=6/*TODO constant*/; i++) {
             curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_FUNC, i).toString());
           }
+        }
         curveValueCB->setCurrentIndex(curve.value);
         break;
       case CurveReference::CURVE_REF_CUSTOM:
       {
         int numcurves = GetEepromInterface()->getCapability(NumCurves);
+        if (lastType != curve.type) {
+          lastType = curve.type;
+          curveValueCB->clear();
           for (int i=-numcurves; i<numcurves; i++) {
             curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString());
           }
+        }
         curveValueCB->setCurrentIndex(curve.value+numcurves);
         break;
       }
@@ -524,10 +555,27 @@ void populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QCom
         break;
     }
   }
+
+  lock = false;
 }
 
-void retrieveCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags)
+void CurveGroup::gvarCBChanged(int state)
 {
+  if (!lock) {
+    if (state) {
+      curve.value = 10000; // TODO constant in EEpromInterface ...
+    }
+    else {
+      curve.value = 0; // TODO could be better
+    }
+
+    update();
+  }
+}
+
+void CurveGroup::valuesChanged()
+{
+  if (!lock) {
     switch (curveTypeCB->currentIndex()) {
       case 0:
       case 1:
@@ -537,7 +585,6 @@ void retrieveCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QCom
           value = curveValueCB->itemData(curveValueCB->currentIndex()).toInt();
         else
           value = curveValueSB->value();
-      qDebug() << value;
         curve = CurveReference(curveTypeCB->currentIndex() == 0 ? CurveReference::CURVE_REF_DIFF : CurveReference::CURVE_REF_EXPO, value);
         break;
       }
@@ -548,7 +595,9 @@ void retrieveCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QCom
         curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetEepromInterface()->getCapability(NumCurves));
         break;
     }
-  populateCurveReference(curveTypeCB, curveGVarCB, curveValueCB, curveValueSB, curve, flags);
+
+    update();
+  }
 }
 
 void populateTrimUseCB(QComboBox *b, unsigned int phase)
@@ -831,7 +880,9 @@ void populateGVCB(QComboBox *b, int value)
 {
   int selected=0;
   int nullitem;
+
   b->clear();
+
   int pgvars = GetEepromInterface()->getCapability(Gvars);
   for (int i=-pgvars; i<=-1; i++) {
     int16_t gval = (int16_t)(-10000+i);
@@ -841,12 +892,15 @@ void populateGVCB(QComboBox *b, int value)
       selected=1;
     }
   }
+
   b->addItem("---", 0);
+
   nullitem=b->count()-1;
   if (value == 0) {
     b->setCurrentIndex(b->count()-1);
     selected=1;
   }
+
   for (int i=1; i<=pgvars; i++) {
     int16_t gval = (int16_t)(10000+i);
     b->addItem(QObject::tr("GV%1").arg(i), gval);
@@ -855,6 +909,7 @@ void populateGVCB(QComboBox *b, int value)
       selected=1;
     }
   }
+
   if (selected==0)
     b->setCurrentIndex(nullitem);
 }

companion/src/helpers.h

@@ -29,6 +29,29 @@ void populateTTraceCB(QComboBox *b, int value);
 void populateRotEncCB(QComboBox *b, int value, int renumber);
 void populateBacklightCB(QComboBox *b, const uint8_t value);
 
+class CurveGroup : public QObject {
+
+  Q_OBJECT
+
+  public:
+    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags=0);
+    void update();
+
+  protected slots:
+    void gvarCBChanged(int);
+    void valuesChanged();
+
+  protected:
+    QComboBox *curveTypeCB;
+    QCheckBox *curveGVarCB;
+    QComboBox *curveValueCB;
+    QSpinBox *curveValueSB;
+    CurveReference & curve;
+    unsigned int flags;
+    bool lock;
+    int lastType;
+};
+
 #define POPULATE_ONOFF        0x01
 #define POPULATE_MSWITCHES    0x02
 #define POPULATE_AND_SWITCHES 0x04
@@ -42,9 +65,6 @@ void populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QS
 void populatePhasesCB(QComboBox *b, int value);
 void populateTrimUseCB(QComboBox *b, unsigned int phase);
 void populateGvarUseCB(QComboBox *b, unsigned int phase);
-void populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags);
-void retrieveCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags);
-void populateCurvesCB(QComboBox *b, int value);
 void populateCustomScreenFieldCB(QComboBox *b, unsigned int value, bool last, int hubproto);
 void populateTimerSwitchCB(QComboBox *b, int value);
 QString getCustomSwitchStr(CustomSwData * customSw, const ModelData & model);

companion/src/main.cpp

@@ -77,10 +77,10 @@ class MyProxyStyle : public QProxyStyle
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(companion9x);
-    QApplication app(argc, argv);
+    QApplication  * app = new QApplication(argc, argv);
-    app.setApplicationName("Companion9x");
+    app->setApplicationName("Companion9x");
 #ifdef __APPLE__
-    app.setStyle(new MyProxyStyle);
+    app->setStyle(new MyProxyStyle);
 #endif
     QString dir;
     if(argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang";
@@ -95,20 +95,20 @@ int main(int argc, char *argv[])
     qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 //    qDebug() << locale;
 //    qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));    
-    app.installTranslator(&companion9xTranslator);
+    app->installTranslator(&companion9xTranslator);
-    app.installTranslator(&qtTranslator);
+    app->installTranslator(&qtTranslator);
 
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
     QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString();
     firmware_id.replace("open9x", "opentx");
     firmware_id.replace("x9da", "taranis");
-    QPixmap pixmap;
+    QPixmap * pixmap;
     if (firmware_id.contains("taranis"))
-      pixmap = QPixmap(":/images/splasht.png");
+      pixmap = new QPixmap(":/images/splasht.png");
     else
-      pixmap = QPixmap(":/images/splash.png");
+      pixmap = new QPixmap(":/images/splash.png");
-    QSplashScreen *splash = new QSplashScreen(pixmap);
+    QSplashScreen *splash = new QSplashScreen(*pixmap);
 
     RegisterFirmwares();
 
@@ -116,15 +116,15 @@ int main(int argc, char *argv[])
     current_firmware_variant = GetFirmwareVariant(firmware_id);
     // qDebug() << current_firmware_variant;
 
-    MainWindow mainWin;
+    MainWindow * mainWin = new MainWindow();
 	
     if (showSplash) {
       splash->show();
       QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
-      QTimer::singleShot(1000*SPLASH_TIME, &mainWin, SLOT(show()));
+      QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show()));
     }
     else  {
-      mainWin.show();
+      mainWin->show();
     }
-    return app.exec();
+    return app->exec();
 }

companion/src/modeledit/expodialog.cpp

@@ -51,9 +51,11 @@ ExpoDialog::ExpoDialog(QWidget *parent, ExpoData *expoData, int stickMode) :
     }
 
     populateSwitchCB(ui->switchesCB,ed->swtch);
-    populateCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, 0);
 
-    ui->modeCB->setCurrentIndex(ed->mode-1);
+    // TODO keep this group, same in MixerDialog
+    CurveGroup * curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve);
+
+    ui->sideCB->setCurrentIndex(ed->mode-1);
 
     ui->label_expo->hide();
 
@@ -77,6 +79,19 @@ ExpoDialog::ExpoDialog(QWidget *parent, ExpoData *expoData, int stickMode) :
       }      
     }
 
+    if (GetEepromInterface()->getCapability(VirtualInputs)) {
+      ui->sideLabel->hide();
+      ui->sideCB->hide();
+    }
+    else {
+      ui->sourceLabel->hide();
+      ui->sourceCB->hide();
+      ui->scaleLabel->hide();
+      ui->scaleSB->hide();
+      ui->trimLabel->hide();
+      ui->trimCB->hide();
+    }
+
     int expolength=GetEepromInterface()->getCapability(HasExpoNames);
     if (!expolength) {
       ui->label_name->hide();
@@ -101,7 +116,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ExpoData *expoData, int stickMode) :
     connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
     connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->modeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->sideCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->expoGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
     connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
     for (int i=0; i<9; i++) {
@@ -164,15 +179,13 @@ void ExpoDialog::valuesChanged()
 {
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
 
-    retrieveCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, 0);
-
     if (ui->weightGV->isChecked()) {
       ed->weight = ui->weightCB->itemData(ui->weightCB->currentIndex()).toInt();
     } else {
       ed->weight = ui->weightSB->value();
     }
     ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
-    ed->mode   = ui->modeCB->currentIndex() + 1;
+    ed->mode   = ui->sideCB->currentIndex() + 1;
     int i=0;
     for (i=0; i<ui->expoName->text().toAscii().length(); i++) {
       ed->name[i]=ui->expoName->text().toAscii().at(i);

companion/src/modeledit/expodialog.ui

@@ -44,14 +44,14 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Weight</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="3" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1,0">
      <item>
       <widget class="QCheckBox" name="weightGV">
@@ -85,14 +85,14 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label_expo">
      <property name="text">
       <string>Expo</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="4" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,1,0">
      <item>
       <widget class="QCheckBox" name="expoGV">
@@ -126,14 +126,14 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_phases">
      <property name="text">
       <string>Flight modes</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="6" column="1">
     <layout class="QGridLayout" name="gridLayout_4">
      <item row="0" column="0">
       <widget class="QLabel" name="lb_FP0">
@@ -290,14 +290,14 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Switch</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="7" column="1">
     <widget class="QComboBox" name="switchesCB">
      <property name="whatsThis">
       <string>Switch used by the expo.
@@ -305,14 +305,14 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="8" column="0">
     <widget class="QLabel" name="label_curves">
      <property name="text">
       <string>Curve</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="8" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0">
      <item>
       <widget class="QComboBox" name="curveTypeCB">
@@ -343,15 +343,15 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </item>
     </layout>
    </item>
-   <item row="6" column="0">
+   <item row="9" column="0">
-    <widget class="QLabel" name="label_9">
+    <widget class="QLabel" name="sideLabel">
      <property name="text">
       <string>Stick Side</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="9" column="1">
-    <widget class="QComboBox" name="modeCB">
+    <widget class="QComboBox" name="sideCB">
      <item>
       <property name="text">
        <string>NEG</string>
@@ -369,7 +369,7 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </item>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
+   <item row="11" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="minimumSize">
       <size>
@@ -388,7 +388,7 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="10" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -401,6 +401,71 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </spacer>
    </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="sourceCB">
+     <property name="whatsThis">
+      <string>The source for the mixer</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QComboBox" name="trimCB">
+     <item>
+      <property name="text">
+       <string>No</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Yes</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="sourceLabel">
+     <property name="text">
+      <string>Source</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="trimLabel">
+     <property name="text">
+      <string>Include Trim</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="scaleLabel">
+     <property name="text">
+      <string>Scale</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDoubleSpinBox" name="scaleSB">
+     <property name="whatsThis">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Slow is not zero then the speed of the mix will be set by the value specified -&amp;gt; the value states the number of seconds it takes to transit from -100 to 100.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="decimals">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>

companion/src/modeledit/inputs.cpp

@@ -76,19 +76,18 @@ void InputsPanel::update()
       str = "   ";
     }
 
+    if (!GetEepromInterface()->getCapability(VirtualInputs)) {
       switch (md->mode) {
         case (1): str += " <-"; break;
         case (2): str += " ->"; break;
         default:  str += "   "; break;
       };
-
-    str += tr("Weight(%1)").arg(getGVarString(md->weight));
-
-    QString curveStr = md->curve.toString();
-    if (!curveStr.isEmpty()) {
-      str += " " + curveStr;
     }
 
+    str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
+
+    if (md->curve.value) str += " " + md->curve.toString();
+
     if (GetEepromInterface()->getCapability(FlightPhases)) {
       if(md->phases) {
         if (md->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {

companion/src/modeledit/mixerdialog.cpp

@@ -70,7 +70,7 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
       ui->offsetCB->hide();
     }
 
-    populateCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve, 0);
+    CurveGroup * curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve);
 
     ui->MixDR_CB->setChecked(md->noExpo==0);
     if (!GetEepromInterface()->getCapability(MixesWithoutExpo)) {
@@ -143,12 +143,6 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
     connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->offsetCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-
-    connect(ui->curveTypeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->curveGVarCB,SIGNAL(stateChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->curveValueCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->curveValueSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-
     connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
     connect(ui->offsetSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
     connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged())); // TODO why the same slot?
@@ -249,9 +243,6 @@ void MixerDialog::valuesChanged()
     }
     md->carryTrim = -(ui->trimCB->currentIndex()-1);
     md->noExpo = ui->MixDR_CB->checkState() ? 0 : 1;
-
-    retrieveCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve, 0);
-
     md->swtch     = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
     md->mixWarn   = ui->warningCB->currentIndex();
     md->mltpx     = (MltpxValue)ui->mltpxCB->currentIndex();