Merge branch 'simoninns:master' into master

harrypm · Sep 16, 2024 · a6499da · a6499da
2 parents 9df7750 + 1bb891f
commit a6499da
Show file tree

Hide file tree

Showing 37 changed files with 456 additions and 406 deletions.
diff --git a/Linux-Application/DomesdayDuplicator/CMakeLists.txt b/Linux-Application/DomesdayDuplicator/CMakeLists.txt
@@ -49,4 +49,7 @@ if(WIN32)
     )
 endif()
 
-install(TARGETS DomesdayDuplicator)
+install(TARGETS DomesdayDuplicator
+        BUNDLE DESTINATION .
+        RUNTIME DESTINATION bin
+)
diff --git a/Linux-Application/DomesdayDuplicator/DomesdayDuplicator.pro b/Linux-Application/DomesdayDuplicator/DomesdayDuplicator.pro
@@ -22,7 +22,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-CONFIG += c++11 console
+CONFIG += c++11
 
 # Include the libUSB library
 unix {
@@ -48,7 +48,8 @@ SOURCES += \
     playercontrol.cpp \
     automaticcapturedialog.cpp \
     advancednamingdialog.cpp \
-    amplitudemeasurement.cpp
+    amplitudemeasurement.cpp \
+    qcustomplot.cpp
 
 HEADERS += \
         mainwindow.h \
@@ -62,7 +63,8 @@ HEADERS += \
     playercontrol.h \
     automaticcapturedialog.h \
     advancednamingdialog.h \
-    amplitudemeasurement.h
+    amplitudemeasurement.h \
+    qcustomplot.h
 
 FORMS += \
         mainwindow.ui \

diff --git a/Linux-Application/DomesdayDuplicator/advancednamingdialog.cpp b/Linux-Application/DomesdayDuplicator/advancednamingdialog.cpp
@@ -95,18 +95,12 @@ QString AdvancedNamingDialog::getFileName(bool isTestData)
             fileName += QString("_side%1").arg(ui->discSideSpinBox->value());
         }
 
-        // Require additional conditions to account for side 1 notes/mint without changing spinbox value
-        if (ui->notesCheckBox->isChecked() and notesHolding[ui->discSideSpinBox->value()].isNull()) {
+        if (ui->notesCheckBox->isChecked()) {
             fileName += "_" + ui->notesLineEdit->text();
-        } else {
-            fileName += "_" + notesHolding[ui->discSideSpinBox->value()];
         }
 
-        // Require additional conditions to account for side 1 notes/mint without changing spinbox value
-        if (ui->mintCheckBox->isChecked() and mintHolding[ui->discSideSpinBox->value()].isNull()) {
+        if (ui->mintCheckBox->isChecked()) {
             fileName += "_" + ui->mintLineEdit->text();
-        } else {
-            fileName += "_" + mintHolding[ui->discSideSpinBox->value()];
         }
 
         // Add the date/time stamp
@@ -128,8 +122,20 @@ bool AdvancedNamingDialog::getDurationChecked()
     return fileDurationBox;
 }
 
+// Enable or disable per-side notes
+void AdvancedNamingDialog::setPerSideNotesEnabled(bool enabled)
+{
+    perSideNotesEnabled = enabled;
+}
+
+// Enable or disable per-side mint marks
+void AdvancedNamingDialog::setPerSideMintEnabled(bool enabled)
+{
+    perSideMintEnabled = enabled;
+}
+
 // Update the GUI based on the state of the check boxes
-void AdvancedNamingDialog::updateGui(void)
+void AdvancedNamingDialog::updateGui()
 {
     if (ui->discTitleCheckBox->isChecked()) {
         ui->discTitleLineEdit->setEnabled(true);
@@ -186,26 +192,16 @@ void AdvancedNamingDialog::updateGui(void)
 }
 
 // Update the GUI and hold values from previous side input
-void AdvancedNamingDialog::updateSideHoldings(void)
+void AdvancedNamingDialog::updateSideHoldings()
 {
-    if (ui->mintCheckBox->isChecked()) {
-        mintHolding[discSideSpinBoxPrevVal] = ui->mintLineEdit->text();
-
-        if (mintHolding[ui->discSideSpinBox->value()].isNull()) {
-            ui->mintLineEdit->setText("");
-        } else {
-            ui->mintLineEdit->setText(mintHolding[ui->discSideSpinBox->value()]);
-        }
-    }
-
-    if (ui->notesCheckBox->isChecked()) {
+    if (perSideNotesEnabled && ui->notesCheckBox->isChecked()) {
         notesHolding[discSideSpinBoxPrevVal] = ui->notesLineEdit->text();
+        ui->notesLineEdit->setText(notesHolding[ui->discSideSpinBox->value()]);
+    }
 
-        if (notesHolding[ui->discSideSpinBox->value()].isNull()) {
-            ui->notesLineEdit->setText("");
-        } else {
-            ui->notesLineEdit->setText(notesHolding[ui->discSideSpinBox->value()]);
-        }
+    if (perSideMintEnabled && ui->mintCheckBox->isChecked()) {
+        mintHolding[discSideSpinBoxPrevVal] = ui->mintLineEdit->text();
+        ui->mintLineEdit->setText(mintHolding[ui->discSideSpinBox->value()]);
     }
 
     discSideSpinBoxPrevVal = ui->discSideSpinBox->value();
@@ -249,11 +245,9 @@ void AdvancedNamingDialog::on_mintCheckBox_clicked()
 void AdvancedNamingDialog::on_durationCheckBox_clicked()
 {
     updateGui();
-
 }
 
 void AdvancedNamingDialog::on_discSideSpinBox_valueChanged()
 {
     updateSideHoldings();
-
 }
diff --git a/Linux-Application/DomesdayDuplicator/advancednamingdialog.h b/Linux-Application/DomesdayDuplicator/advancednamingdialog.h
@@ -47,6 +47,9 @@ class AdvancedNamingDialog : public QDialog
     QString getFileName(bool isTestData);
     bool getDurationChecked();
 
+    void setPerSideNotesEnabled(bool enabled);
+    void setPerSideMintEnabled(bool enabled);
+
 private slots:
     void on_discTitleCheckBox_clicked();
     void on_discTypeCheckBox_clicked();
@@ -61,11 +64,14 @@ private slots:
 private:
     Ui::AdvancedNamingDialog *ui;
 
-    void updateGui(void);
-    void updateSideHoldings(void);
+    void updateGui();
+    void updateSideHoldings();
+
     int discSideSpinBoxPrevVal = 1;
-    QString notesHolding[99];
-    QString mintHolding[99];
+    bool perSideNotesEnabled = false;
+    QString notesHolding[100];
+    bool perSideMintEnabled = false;
+    QString mintHolding[100];
 };
 
 #endif // ADVANCEDNAMINGDIALOG_H
diff --git a/Linux-Application/DomesdayDuplicator/advancednamingdialog.ui b/Linux-Application/DomesdayDuplicator/advancednamingdialog.ui
@@ -332,15 +332,24 @@
   <tabstop>formatCheckBox</tabstop>
   <tabstop>formatNtscRadioButton</tabstop>
   <tabstop>formatPalRadioButton</tabstop>
+  <tabstop>audioCheckBox</tabstop>
+  <tabstop>audioDefaultRadioButton</tabstop>
+  <tabstop>audioAnalogueRadioButton</tabstop>
+  <tabstop>audioAc3RadioButton</tabstop>
+  <tabstop>audioDtsRadioButton</tabstop>
   <tabstop>discSideCheckBox</tabstop>
+  <tabstop>discSideSpinBox</tabstop>
   <tabstop>notesCheckBox</tabstop>
   <tabstop>notesLineEdit</tabstop>
+  <tabstop>mintCheckBox</tabstop>
+  <tabstop>mintLineEdit</tabstop>
+  <tabstop>durationCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
  <buttongroups>
+  <buttongroup name="audioButtonGroup"/>
   <buttongroup name="formatButtonGroup"/>
   <buttongroup name="discTypeButtonGroup"/>
-  <buttongroup name="audioButtonGroup"/>
  </buttongroups>
 </ui>
diff --git a/Linux-Application/DomesdayDuplicator/automaticcapturedialog.h b/Linux-Application/DomesdayDuplicator/automaticcapturedialog.h
@@ -62,7 +62,7 @@ class AutomaticCaptureDialog : public QDialog
 
 signals:
     void startAutomaticCapture(CaptureType captureType, qint32 startAddress, qint32 endAddress, DiscType discType);
-    void stopAutomaticCapture(void);
+    void stopAutomaticCapture();
 
 private slots:
     void on_wholeDiscRadioButton_clicked();