Interface Smoothed Over, likes the new combo box now

Desktop_Interface/Labrador.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2017-06-28T11:51:09. -->
+<!-- Written by QtCreator 4.1.0, 2017-06-28T16:15:39. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -346,7 +346,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Labrador.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface/bin</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

Desktop_Interface/isodriver.cpp

@@ -855,7 +855,7 @@ void isoDriver::setMultimeterType(int type){
     multimeterType = (multimeterType_enum) type;
     if(type==R){
         multimeterREnabled(multimeterRsource);
-    }
+    }else multimeterREnabled(255);
     qDebug() << "multimeterType = " << multimeterType;
 }
 
@@ -987,12 +987,12 @@ void isoDriver::multimeterStats(){
         double Vrat = (Vin-Vm)/Vin;
         double Rp = 1/(1/seriesResistance + 1/(R3+R4));
         estimated_resistance = ((1-Vrat)/Vrat) * Rp; //Perturbation term on V2 ignored.  V1 = Vin.  V2 = Vin(Rp/(R+Rp)) + Vn(Rtest||R / (R34 + (Rtest||R34));
-        qDebug() << "Vm = " << Vm;
+        //qDebug() << "Vm = " << Vm;
-        qDebug() << "Vin = " << Vin;
+        //qDebug() << "Vin = " << Vin;
-        qDebug() << "perturbation = " << perturbation;
+        //qDebug() << "perturbation = " << perturbation;
-        qDebug() << "Vrat = " << Vrat;
+        //qDebug() << "Vrat = " << Vrat;
-        qDebug() << "Rp = " << Rp;
+        //qDebug() << "Rp = " << Rp;
-        qDebug() << "estimated_resistance = " << estimated_resistance;
+        //qDebug() << "estimated_resistance = " << estimated_resistance;
         multimeterMax(0);
         multimeterMin(0);
         multimeterMean(0);

Desktop_Interface/mainwindow.cpp

@@ -137,6 +137,9 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->controller_iso->doNotTouchGraph = false;
 
     calibrationMessages = new QMessageBox();
+    ui->multimeterRLabel->setVisible(false);
+    ui->multimeterRComboBox->setVisible(false);
+
 }
 
 MainWindow::~MainWindow()
@@ -1394,6 +1397,8 @@ void MainWindow::calibrateStage3(){
 
 void MainWindow::rSourceIndexChanged(int newSource){
     if(newSource == 0){
+        ui->multimeterRLabel->setVisible(true);
+        ui->multimeterRComboBox->setVisible(true);
         ui->signalGenGroup_CH2->setEnabled(false);
         ui->psuGroup->setEnabled(true);
         ui->waveformSelect_CH2->setCurrentText("DC");
@@ -1401,8 +1406,24 @@ void MainWindow::rSourceIndexChanged(int newSource){
         ui->amplitudeValue_CH2->setValue(3);
     }
     if(newSource == 1){
+        ui->multimeterRLabel->setVisible(true);
+        ui->multimeterRComboBox->setVisible(true);
         ui->psuGroup->setEnabled(false);
         ui->signalGenGroup_CH2->setEnabled(true);
         ui->psuSlider->setValue(100);
     }
+
+    if(newSource == 255){
+        ui->signalGenGroup_CH2->setEnabled(true);
+        ui->psuGroup->setEnabled(true);
+        ui->multimeterRLabel->setVisible(false);
+        ui->multimeterRComboBox->setVisible(false);
+    }
+}
+
+void MainWindow::multimeterStateChange(bool enabled){
+    if(enabled){
+        int cIdx = ui->multimeterModeSelect->currentIndex();
+        ui->controller_iso->setMultimeterType(cIdx);
+    } else rSourceIndexChanged(255);
 }

Desktop_Interface/mainwindow.h

@@ -125,6 +125,7 @@ private slots:
     void reinitUsbStage2(void);
     void resetUsbState(void);
     void rSourceIndexChanged(int newSource);
+    void multimeterStateChange(bool state);
 
 #ifdef PLATFORM_ANDROID
     //Android Special

Desktop_Interface/moc/moc_mainwindow.cpp

@@ -19,8 +19,8 @@
 
 QT_BEGIN_MOC_NAMESPACE
 struct qt_meta_stringdata_MainWindow_t {
-    QByteArrayData data[75];
+    QByteArrayData data[77];
-    char stringdata0[1650];
+    char stringdata0[1678];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -103,7 +103,9 @@ QT_MOC_LITERAL(70, 1561, 15), // "reinitUsbStage2"
 QT_MOC_LITERAL(71, 1577, 13), // "resetUsbState"
 QT_MOC_LITERAL(72, 1591, 19), // "rSourceIndexChanged"
 QT_MOC_LITERAL(73, 1611, 9), // "newSource"
-QT_MOC_LITERAL(74, 1621, 28) // "on_actionCalibrate_triggered"
+QT_MOC_LITERAL(74, 1621, 21), // "multimeterStateChange"
+QT_MOC_LITERAL(75, 1643, 5), // "state"
+QT_MOC_LITERAL(76, 1649, 28) // "on_actionCalibrate_triggered"
 
     },
     "MainWindow\0on_actionGain0_5_triggered\0"
@@ -153,6 +155,7 @@ QT_MOC_LITERAL(74, 1621, 28) // "on_actionCalibrate_triggered"
     "on_actionTake_Snapshot_triggered\0"
     "reinitUsb\0reinitUsbStage2\0resetUsbState\0"
     "rSourceIndexChanged\0newSource\0"
+    "multimeterStateChange\0state\0"
     "on_actionCalibrate_triggered"
 };
 #undef QT_MOC_LITERAL
@@ -163,7 +166,7 @@ static const uint qt_meta_data_MainWindow[] = {
        7,       // revision
        0,       // classname
        0,    0, // classinfo
-      68,   14, // methods
+      69,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -171,74 +174,75 @@ static const uint qt_meta_data_MainWindow[] = {
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags
-       1,    0,  354,    2, 0x08 /* Private */,
+       1,    0,  359,    2, 0x08 /* Private */,
-       3,    0,  355,    2, 0x08 /* Private */,
+       3,    0,  360,    2, 0x08 /* Private */,
-       4,    0,  356,    2, 0x08 /* Private */,
+       4,    0,  361,    2, 0x08 /* Private */,
-       5,    0,  357,    2, 0x08 /* Private */,
+       5,    0,  362,    2, 0x08 /* Private */,
-       6,    0,  358,    2, 0x08 /* Private */,
+       6,    0,  363,    2, 0x08 /* Private */,
-       7,    0,  359,    2, 0x08 /* Private */,
+       7,    0,  364,    2, 0x08 /* Private */,
-       8,    0,  360,    2, 0x08 /* Private */,
+       8,    0,  365,    2, 0x08 /* Private */,
-       9,    0,  361,    2, 0x08 /* Private */,
+       9,    0,  366,    2, 0x08 /* Private */,
-      10,    0,  362,    2, 0x08 /* Private */,
+      10,    0,  367,    2, 0x08 /* Private */,
-      11,    1,  363,    2, 0x08 /* Private */,
+      11,    1,  368,    2, 0x08 /* Private */,
-      13,    1,  366,    2, 0x08 /* Private */,
+      13,    1,  371,    2, 0x08 /* Private */,
-      15,    1,  369,    2, 0x08 /* Private */,
+      15,    1,  374,    2, 0x08 /* Private */,
-      17,    1,  372,    2, 0x08 /* Private */,
+      17,    1,  377,    2, 0x08 /* Private */,
-      18,    1,  375,    2, 0x08 /* Private */,
+      18,    1,  380,    2, 0x08 /* Private */,
-      19,    1,  378,    2, 0x08 /* Private */,
+      19,    1,  383,    2, 0x08 /* Private */,
-      20,    1,  381,    2, 0x08 /* Private */,
+      20,    1,  386,    2, 0x08 /* Private */,
-      21,    1,  384,    2, 0x08 /* Private */,
+      21,    1,  389,    2, 0x08 /* Private */,
-      22,    0,  387,    2, 0x08 /* Private */,
+      22,    0,  392,    2, 0x08 /* Private */,
-      23,    0,  388,    2, 0x08 /* Private */,
+      23,    0,  393,    2, 0x08 /* Private */,
-      24,    0,  389,    2, 0x08 /* Private */,
+      24,    0,  394,    2, 0x08 /* Private */,
-      25,    0,  390,    2, 0x08 /* Private */,
+      25,    0,  395,    2, 0x08 /* Private */,
-      26,    0,  391,    2, 0x08 /* Private */,
+      26,    0,  396,    2, 0x08 /* Private */,
-      27,    1,  392,    2, 0x08 /* Private */,
+      27,    1,  397,    2, 0x08 /* Private */,
-      28,    1,  395,    2, 0x08 /* Private */,
+      28,    1,  400,    2, 0x08 /* Private */,
-      29,    1,  398,    2, 0x08 /* Private */,
+      29,    1,  403,    2, 0x08 /* Private */,
-      30,    1,  401,    2, 0x08 /* Private */,
+      30,    1,  406,    2, 0x08 /* Private */,
-      31,    1,  404,    2, 0x08 /* Private */,
+      31,    1,  409,    2, 0x08 /* Private */,
-      32,    1,  407,    2, 0x08 /* Private */,
+      32,    1,  412,    2, 0x08 /* Private */,
-      33,    1,  410,    2, 0x08 /* Private */,
+      33,    1,  415,    2, 0x08 /* Private */,
-      34,    1,  413,    2, 0x08 /* Private */,
+      34,    1,  418,    2, 0x08 /* Private */,
-      35,    1,  416,    2, 0x08 /* Private */,
+      35,    1,  421,    2, 0x08 /* Private */,
-      36,    1,  419,    2, 0x08 /* Private */,
+      36,    1,  424,    2, 0x08 /* Private */,
-      37,    1,  422,    2, 0x08 /* Private */,
+      37,    1,  427,    2, 0x08 /* Private */,
-      38,    1,  425,    2, 0x08 /* Private */,
+      38,    1,  430,    2, 0x08 /* Private */,
-      39,    1,  428,    2, 0x08 /* Private */,
+      39,    1,  433,    2, 0x08 /* Private */,
-      40,    1,  431,    2, 0x08 /* Private */,
+      40,    1,  436,    2, 0x08 /* Private */,
-      41,    1,  434,    2, 0x08 /* Private */,
+      41,    1,  439,    2, 0x08 /* Private */,
-      42,    1,  437,    2, 0x08 /* Private */,
+      42,    1,  442,    2, 0x08 /* Private */,
-      43,    1,  440,    2, 0x08 /* Private */,
+      43,    1,  445,    2, 0x08 /* Private */,
-      44,    1,  443,    2, 0x08 /* Private */,
+      44,    1,  448,    2, 0x08 /* Private */,
-      45,    1,  446,    2, 0x08 /* Private */,
+      45,    1,  451,    2, 0x08 /* Private */,
-      46,    1,  449,    2, 0x08 /* Private */,
+      46,    1,  454,    2, 0x08 /* Private */,
-      47,    1,  452,    2, 0x08 /* Private */,
+      47,    1,  457,    2, 0x08 /* Private */,
-      48,    1,  455,    2, 0x08 /* Private */,
+      48,    1,  460,    2, 0x08 /* Private */,
-      49,    1,  458,    2, 0x08 /* Private */,
+      49,    1,  463,    2, 0x08 /* Private */,
-      50,    1,  461,    2, 0x08 /* Private */,
+      50,    1,  466,    2, 0x08 /* Private */,
-      51,    0,  464,    2, 0x08 /* Private */,
+      51,    0,  469,    2, 0x08 /* Private */,
-      52,    0,  465,    2, 0x08 /* Private */,
+      52,    0,  470,    2, 0x08 /* Private */,
-      53,    0,  466,    2, 0x08 /* Private */,
+      53,    0,  471,    2, 0x08 /* Private */,
-      54,    0,  467,    2, 0x08 /* Private */,
+      54,    0,  472,    2, 0x08 /* Private */,
-      55,    1,  468,    2, 0x08 /* Private */,
+      55,    1,  473,    2, 0x08 /* Private */,
-      57,    1,  471,    2, 0x08 /* Private */,
+      57,    1,  476,    2, 0x08 /* Private */,
-      58,    0,  474,    2, 0x08 /* Private */,
+      58,    0,  479,    2, 0x08 /* Private */,
-      59,    0,  475,    2, 0x08 /* Private */,
+      59,    0,  480,    2, 0x08 /* Private */,
-      60,    0,  476,    2, 0x08 /* Private */,
+      60,    0,  481,    2, 0x08 /* Private */,
-      61,    0,  477,    2, 0x08 /* Private */,
+      61,    0,  482,    2, 0x08 /* Private */,
-      62,    0,  478,    2, 0x08 /* Private */,
+      62,    0,  483,    2, 0x08 /* Private */,
-      63,    0,  479,    2, 0x08 /* Private */,
+      63,    0,  484,    2, 0x08 /* Private */,
-      64,    0,  480,    2, 0x08 /* Private */,
+      64,    0,  485,    2, 0x08 /* Private */,
-      65,    0,  481,    2, 0x08 /* Private */,
+      65,    0,  486,    2, 0x08 /* Private */,
-      66,    1,  482,    2, 0x08 /* Private */,
+      66,    1,  487,    2, 0x08 /* Private */,
-      67,    1,  485,    2, 0x08 /* Private */,
+      67,    1,  490,    2, 0x08 /* Private */,
-      68,    0,  488,    2, 0x08 /* Private */,
+      68,    0,  493,    2, 0x08 /* Private */,
-      69,    0,  489,    2, 0x08 /* Private */,
+      69,    0,  494,    2, 0x08 /* Private */,
-      70,    0,  490,    2, 0x08 /* Private */,
+      70,    0,  495,    2, 0x08 /* Private */,
-      71,    0,  491,    2, 0x08 /* Private */,
+      71,    0,  496,    2, 0x08 /* Private */,
-      72,    1,  492,    2, 0x08 /* Private */,
+      72,    1,  497,    2, 0x08 /* Private */,
-      74,    0,  495,    2, 0x08 /* Private */,
+      74,    1,  500,    2, 0x08 /* Private */,
+      76,    0,  503,    2, 0x08 /* Private */,
 
  // slots: parameters
     QMetaType::Void,
@@ -308,6 +312,7 @@ static const uint qt_meta_data_MainWindow[] = {
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void, QMetaType::Int,   73,
+    QMetaType::Void, QMetaType::Bool,   75,
     QMetaType::Void,
 
        0        // eod
@@ -386,7 +391,8 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 64: _t->reinitUsbStage2(); break;
         case 65: _t->resetUsbState(); break;
         case 66: _t->rSourceIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
-        case 67: _t->on_actionCalibrate_triggered(); break;
+        case 67: _t->multimeterStateChange((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 68: _t->on_actionCalibrate_triggered(); break;
         default: ;
         }
     }
@@ -417,13 +423,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 68)
+        if (_id < 69)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 68;
+        _id -= 69;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 68)
+        if (_id < 69)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 68;
+        _id -= 69;
     }
     return _id;
 }

Desktop_Interface/ui_files_desktop/mainwindow.ui

@@ -729,7 +729,7 @@
           </widget>
          </item>
          <item row="3" column="0">
-          <widget class="QComboBox" name="comboBox">
+          <widget class="QComboBox" name="multimeterRComboBox">
            <item>
             <property name="text">
              <string>Signal Gen CH2</string>
@@ -743,7 +743,7 @@
           </widget>
          </item>
          <item row="2" column="0">
-          <widget class="QLabel" name="label">
+          <widget class="QLabel" name="multimeterRLabel">
            <property name="text">
             <string>Source</string>
            </property>
@@ -3857,7 +3857,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>comboBox</sender>
+   <sender>multimeterRComboBox</sender>
    <signal>currentIndexChanged(int)</signal>
    <receiver>MainWindow</receiver>
    <slot>rSourceIndexChanged(int)</slot>
@@ -3921,7 +3921,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>comboBox</sender>
+   <sender>multimeterRComboBox</sender>
    <signal>currentIndexChanged(int)</signal>
    <receiver>controller_iso</receiver>
    <slot>rSourceChanged(int)</slot>
@@ -3936,10 +3936,27 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>multimeterGroup</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>multimeterStateChange(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>1032</x>
+     <y>418</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>1034</x>
+     <y>388</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>timeBaseNeedsChanging(bool)</slot>
   <slot>reinitUsb()</slot>
   <slot>rSourceIndexChanged(int)</slot>
+  <slot>multimeterStateChange(bool)</slot>
  </slots>
 </ui>

Desktop_Interface/ui_mainwindow.h

@@ -191,8 +191,8 @@ public:
     QLabel *multimeterResistanceLabel;
     QLabel *multimeterModeLabel;
     espoSpinBox *multimeterResistanceSelect;
-    QComboBox *comboBox;
+    QComboBox *multimeterRComboBox;
-    QLabel *label;
+    QLabel *multimeterRLabel;
     QSpacerItem *verticalSpacer_2;
     QHBoxLayout *horizontalLayout_5;
     QGroupBox *signalGenGroup_CH1;
@@ -923,15 +923,15 @@ public:
 
         gridLayout->addWidget(multimeterResistanceSelect, 5, 0, 1, 1);
 
-        comboBox = new QComboBox(multimeterGroup);
+        multimeterRComboBox = new QComboBox(multimeterGroup);
-        comboBox->setObjectName(QStringLiteral("comboBox"));
+        multimeterRComboBox->setObjectName(QStringLiteral("multimeterRComboBox"));
 
-        gridLayout->addWidget(comboBox, 3, 0, 1, 1);
+        gridLayout->addWidget(multimeterRComboBox, 3, 0, 1, 1);
 
-        label = new QLabel(multimeterGroup);
+        multimeterRLabel = new QLabel(multimeterGroup);
-        label->setObjectName(QStringLiteral("label"));
+        multimeterRLabel->setObjectName(QStringLiteral("multimeterRLabel"));
 
-        gridLayout->addWidget(label, 2, 0, 1, 1);
+        gridLayout->addWidget(multimeterRLabel, 2, 0, 1, 1);
 
 
         verticalLayout_5->addWidget(multimeterGroup);
@@ -1510,11 +1510,12 @@ public:
         QObject::connect(frequencyValue_CH1, SIGNAL(valueChanged(double)), frequencyValue_CH1, SLOT(changeStepping(double)));
         QObject::connect(frequencyValue_CH2, SIGNAL(valueChanged(double)), frequencyValue_CH2, SLOT(changeStepping(double)));
         QObject::connect(debugButton2, SIGNAL(clicked()), MainWindow, SLOT(reinitUsb()));
-        QObject::connect(comboBox, SIGNAL(currentIndexChanged(int)), MainWindow, SLOT(rSourceIndexChanged(int)));
+        QObject::connect(multimeterRComboBox, SIGNAL(currentIndexChanged(int)), MainWindow, SLOT(rSourceIndexChanged(int)));
         QObject::connect(controller_iso, SIGNAL(multimeterREnabled(int)), MainWindow, SLOT(rSourceIndexChanged(int)));
         QObject::connect(controller_iso, SIGNAL(multimeterRMS(double)), multimeterRmsDisplay, SLOT(display(double)));
         QObject::connect(controller_iso, SIGNAL(sendMultimeterLabel4(QString)), multimeterRmsLabel, SLOT(setText(QString)));
-        QObject::connect(comboBox, SIGNAL(currentIndexChanged(int)), controller_iso, SLOT(rSourceChanged(int)));
+        QObject::connect(multimeterRComboBox, SIGNAL(currentIndexChanged(int)), controller_iso, SLOT(rSourceChanged(int)));
+        QObject::connect(multimeterGroup, SIGNAL(toggled(bool)), MainWindow, SLOT(multimeterStateChange(bool)));
 
         QMetaObject::connectSlotsByName(MainWindow);
     } // setupUi
@@ -1641,12 +1642,12 @@ public:
         multimeterResistanceLabel->setText(QApplication::translate("MainWindow", "Series Resistance", Q_NULLPTR));
         multimeterModeLabel->setText(QApplication::translate("MainWindow", "Mode", Q_NULLPTR));
         multimeterResistanceSelect->setSuffix(QApplication::translate("MainWindow", "\316\251", Q_NULLPTR));
-        comboBox->clear();
+        multimeterRComboBox->clear();
-        comboBox->insertItems(0, QStringList()
+        multimeterRComboBox->insertItems(0, QStringList()
          << QApplication::translate("MainWindow", "Signal Gen CH2", Q_NULLPTR)
          << QApplication::translate("MainWindow", "Power Supply", Q_NULLPTR)
         );
-        label->setText(QApplication::translate("MainWindow", "Source", Q_NULLPTR));
+        multimeterRLabel->setText(QApplication::translate("MainWindow", "Source", Q_NULLPTR));
         signalGenGroup_CH1->setTitle(QApplication::translate("MainWindow", "Signal Gen CH1", Q_NULLPTR));
         waveformLabel_CH1->setText(QApplication::translate("MainWindow", "Waveform", Q_NULLPTR));
         frequencyLabel_CH1->setText(QApplication::translate("MainWindow", "Frequency", Q_NULLPTR));