From 58df97be5f49a3eabee6e5fcdbe28be3936df562 Mon Sep 17 00:00:00 2001
From: Chris Esposito <admin@espotek.com>
Date: Mon, 18 Oct 2021 17:23:31 +1100
Subject: [PATCH] Fixed build

---
 Desktop_Interface/mainwindow.cpp              |  60 +------
 Desktop_Interface/mainwindow.h                |   2 -
 .../ui_files_desktop/mainwindow.ui            | 155 +++++++++---------
 .../ui_files_mobile/mainwindow.ui             |  13 --
 4 files changed, 77 insertions(+), 153 deletions(-)

diff --git a/Desktop_Interface/mainwindow.cpp b/Desktop_Interface/mainwindow.cpp
index bdef3707..e8c3f695 100644
--- a/Desktop_Interface/mainwindow.cpp
+++ b/Desktop_Interface/mainwindow.cpp
@@ -1349,64 +1349,6 @@ void MainWindow::readSettingsFile(){
     }
 }
 
-void MainWindow::on_actionRecord_triggered(bool checked)
-{
-    /*
-    if(!checked){
-        ui->controller_iso->internalBuffer375_CH1->disableFileIO();
-        ui->controller_iso->internalBuffer375_CH2->disableFileIO();
-        ui->controller_iso->internalBuffer750->disableFileIO();
-
-        delete(output375_CH1);
-        delete(output375_CH2);
-        delete(output750);
-        return;
-    }
-    QDateTime now = QDateTime::currentDateTime();
-    QString dateString = now.toString("yyyyMMddhhmmsszzz");
-    qDebug() << dateString;
-
-    qDebug() << "QStandardPaths::DocumentsLocation" << QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    outputDir = new QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
-    outputDir->mkdir("EspoTek");
-    outputDir->cd("EspoTek");
-    outputDir->mkdir("recordings");
-    outputDir->cd("recordings");
-    outputDir->mkdir(dateString);
-    outputDir->cd(dateString);
-
-    qDebug() << outputDir->absolutePath();
-
-    output375_CH1 = new QFile(outputDir->filePath("375_CH1.csv"));
-    output375_CH2 = new QFile(outputDir->filePath("375_CH2.csv"));
-    output750 = new QFile(outputDir->filePath("750.csv"));
-
-    ui->controller_iso->internalBuffer375_CH1->enableFileIO(output375_CH1);
-    ui->controller_iso->internalBuffer375_CH2->enableFileIO(output375_CH2);
-    ui->controller_iso->internalBuffer750->enableFileIO(output750);
-
-    delete(outputDir);
-    return;
-    */
-}
-
-void MainWindow::on_actionTake_Snapshot_triggered()
-{
-    /*
-    QString fileName;
-    showFileDialog(&fileName);
-    qDebug() << fileName;
-    int len = fileName.length();
-
-    if(len==0) return; //User cancelled
-
-    qDebug() << len;
-    fileName.remove(len-4, 4);
-    qDebug() << fileName;
-    ui->controller_iso->takeSnapshot(&fileName);
-    */
-}
-
 void MainWindow::reinitUsb(void){
     ui->controller_iso->doNotTouchGraph = true;
     ui->controller_iso->driver->saveState(&reinitdeviceMode, &reinitScopeGain, &reinitCurrentPsuVoltage, &reinitDigitalPinState);
@@ -2618,6 +2560,8 @@ void MainWindow::on_actionDark_Mode_triggered(bool checked)
 void MainWindow::on_actionShow_Debug_Console_triggered(bool checked)
 {
     enableLabradorDebugging(checked);
+}
+
 void MainWindow::on_actionFrequency_Spectrum_triggered(bool checked)
 {
     ui->controller_iso->spectrum = checked;
diff --git a/Desktop_Interface/mainwindow.h b/Desktop_Interface/mainwindow.h
index 09c8f995..603aade0 100644
--- a/Desktop_Interface/mainwindow.h
+++ b/Desktop_Interface/mainwindow.h
@@ -123,8 +123,6 @@ private slots:
     void on_actionAuto_Lock_toggled(bool arg1);
 
     //File/other
-    void on_actionRecord_triggered(bool checked);
-    void on_actionTake_Snapshot_triggered();
     void reinitUsb(void);
     void reinitUsbStage2(void);
     void resetUsbState(void);
diff --git a/Desktop_Interface/ui_files_desktop/mainwindow.ui b/Desktop_Interface/ui_files_desktop/mainwindow.ui
index 4b972403..92bed354 100644
--- a/Desktop_Interface/ui_files_desktop/mainwindow.ui
+++ b/Desktop_Interface/ui_files_desktop/mainwindow.ui
@@ -1507,7 +1507,7 @@
      <x>0</x>
      <y>0</y>
      <width>1493</width>
-     <height>23</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1535,6 +1535,78 @@
     <addaction name="actionExportImage"/>
     <addaction name="actionQuit"/>
    </widget>
+   <widget class="QMenu" name="menuOscilloscope_2">
+    <property name="title">
+     <string>Oscilloscope</string>
+    </property>
+    <widget class="QMenu" name="menuGain_2">
+     <property name="title">
+      <string>&amp;Gain</string>
+     </property>
+     <addaction name="actionGainAuto"/>
+     <addaction name="actionGain0_5"/>
+     <addaction name="actionGain1"/>
+     <addaction name="actionGain2"/>
+     <addaction name="actionGain4"/>
+     <addaction name="actionGain8"/>
+     <addaction name="actionGain16"/>
+     <addaction name="actionGain32"/>
+     <addaction name="actionGain64"/>
+    </widget>
+    <widget class="noCloseMenu" name="menuCH1_Stats">
+     <property name="title">
+      <string>&amp;CH1 Stats</string>
+     </property>
+     <addaction name="actionMax"/>
+     <addaction name="actionMin"/>
+     <addaction name="actionMean"/>
+     <addaction name="actionRMS"/>
+    </widget>
+    <widget class="noCloseMenu" name="menuCH2_Stats">
+     <property name="title">
+      <string>C&amp;H2 Stats</string>
+     </property>
+     <addaction name="actionMax_2"/>
+     <addaction name="actionMin_2"/>
+     <addaction name="actionMean_2"/>
+     <addaction name="actionRMS_2"/>
+    </widget>
+    <widget class="QMenu" name="menuFrame_rate">
+     <property name="title">
+      <string>&amp;Frame rate</string>
+     </property>
+     <addaction name="action60FPS"/>
+     <addaction name="action30FPS"/>
+     <addaction name="action20FPS"/>
+     <addaction name="action15FPS"/>
+     <addaction name="action10FPS"/>
+     <addaction name="action5FPS"/>
+    </widget>
+    <widget class="QMenu" name="menuRange">
+     <property name="title">
+      <string>&amp;Range</string>
+     </property>
+     <addaction name="actionSnap_to_Cursors"/>
+     <addaction name="actionEnter_Manually"/>
+    </widget>
+    <addaction name="menuRange"/>
+    <addaction name="separator"/>
+    <addaction name="menuFrame_rate"/>
+    <addaction name="separator"/>
+    <addaction name="menuGain_2"/>
+    <addaction name="separator"/>
+    <addaction name="menuCH1_Stats"/>
+    <addaction name="menuCH2_Stats"/>
+    <addaction name="actionCursor_Stats"/>
+    <addaction name="separator"/>
+    <addaction name="actionCalibrate"/>
+    <addaction name="actionForce_Square"/>
+    <addaction name="actionAutomatically_Enable_Cursors"/>
+    <addaction name="actionShow_Range_Dialog_on_Main_Page"/>
+    <addaction name="separator"/>
+    <addaction name="actionHide_Widget_Oscilloscope"/>
+    <addaction name="actionFrequency_Spectrum"/>
+   </widget>
    <widget class="QMenu" name="menuMultimeter_2">
     <property name="title">
      <string>&amp;Multimeter</string>
@@ -1544,8 +1616,8 @@
       <rect>
        <x>0</x>
        <y>0</y>
-       <width>172</width>
-       <height>130</height>
+       <width>160</width>
+       <height>120</height>
       </rect>
      </property>
      <property name="title">
@@ -1731,77 +1803,6 @@
      <string>Accessibility</string>
     </property>
     <addaction name="actionDark_Mode"/>
-   <widget class="QMenu" name="menuOscilloscope_2">
-    <property name="title">
-     <string>Oscilloscope</string>
-    </property>
-    <widget class="QMenu" name="menuGain_2">
-     <property name="title">
-      <string>&amp;Gain</string>
-     </property>
-     <addaction name="actionGainAuto"/>
-     <addaction name="actionGain0_5"/>
-     <addaction name="actionGain1"/>
-     <addaction name="actionGain2"/>
-     <addaction name="actionGain4"/>
-     <addaction name="actionGain8"/>
-     <addaction name="actionGain16"/>
-     <addaction name="actionGain32"/>
-     <addaction name="actionGain64"/>
-    </widget>
-    <widget class="noCloseMenu" name="menuCH1_Stats">
-     <property name="title">
-      <string>&amp;CH1 Stats</string>
-     </property>
-     <addaction name="actionMax"/>
-     <addaction name="actionMin"/>
-     <addaction name="actionMean"/>
-     <addaction name="actionRMS"/>
-    </widget>
-    <widget class="noCloseMenu" name="menuCH2_Stats">
-     <property name="title">
-      <string>C&amp;H2 Stats</string>
-     </property>
-     <addaction name="actionMax_2"/>
-     <addaction name="actionMin_2"/>
-     <addaction name="actionMean_2"/>
-     <addaction name="actionRMS_2"/>
-    </widget>
-    <widget class="QMenu" name="menuFrame_rate">
-     <property name="title">
-      <string>&amp;Frame rate</string>
-     </property>
-     <addaction name="action60FPS"/>
-     <addaction name="action30FPS"/>
-     <addaction name="action20FPS"/>
-     <addaction name="action15FPS"/>
-     <addaction name="action10FPS"/>
-     <addaction name="action5FPS"/>
-    </widget>
-    <widget class="QMenu" name="menuRange">
-     <property name="title">
-      <string>&amp;Range</string>
-     </property>
-     <addaction name="actionSnap_to_Cursors"/>
-     <addaction name="actionEnter_Manually"/>
-    </widget>
-    <addaction name="menuRange"/>
-    <addaction name="separator"/>
-    <addaction name="menuFrame_rate"/>
-    <addaction name="separator"/>
-    <addaction name="menuGain_2"/>
-    <addaction name="separator"/>
-    <addaction name="menuCH1_Stats"/>
-    <addaction name="menuCH2_Stats"/>
-    <addaction name="actionCursor_Stats"/>
-    <addaction name="separator"/>
-    <addaction name="actionCalibrate"/>
-    <addaction name="actionForce_Square"/>
-    <addaction name="actionAutomatically_Enable_Cursors"/>
-    <addaction name="actionShow_Range_Dialog_on_Main_Page"/>
-    <addaction name="separator"/>
-    <addaction name="actionHide_Widget_Oscilloscope"/>
-    <addaction name="actionFrequency_Spectrum"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuOscilloscope_2"/>
@@ -2645,18 +2646,12 @@
    </property>
    <property name="text">
     <string>Dark Mode</string>
-  <action name="actionWidget">
-   <property name="text">
-    <string>Hide Widget</string>
    </property>
   </action>
   <action name="actionFrequency_Spectrum">
    <property name="checkable">
     <bool>true</bool>
    </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
    <property name="text">
     <string>Frequency Spectrum</string>
    </property>
diff --git a/Desktop_Interface/ui_files_mobile/mainwindow.ui b/Desktop_Interface/ui_files_mobile/mainwindow.ui
index 3a6dc41d..f95289f4 100644
--- a/Desktop_Interface/ui_files_mobile/mainwindow.ui
+++ b/Desktop_Interface/ui_files_mobile/mainwindow.ui
@@ -2427,14 +2427,6 @@
     <string>None</string>
    </property>
   </action>
-  <action name="actionRecord">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Record</string>
-   </property>
-  </action>
   <action name="actionForce_Square">
    <property name="checkable">
     <bool>true</bool>
@@ -2526,11 +2518,6 @@
     <string>Enter Manually</string>
    </property>
   </action>
-  <action name="actionTake_Snapshot">
-   <property name="text">
-    <string>Take Snapshot</string>
-   </property>
-  </action>
   <action name="actionOld_Person_Mode">
    <property name="checkable">
     <bool>true</bool>