From ea95d5787a9a0d9047d8e0df559110fbebd3b2ac Mon Sep 17 00:00:00 2001
From: Alexander Diamadis <alex@aldiserver.de>
Date: Sun, 7 Nov 2021 14:57:50 +0100
Subject: [PATCH] Minor Improvements

---
 source/about.ui       |  24 ++++++++--
 source/library.cpp    | 104 +++++++++++++++++++++++++-----------------
 source/library.h      |   3 ++
 source/library.ui     |  32 ++++++++++---
 source/mainwindow.cpp |   1 +
 5 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/source/about.ui b/source/about.ui
index d8bac60..b41759b 100644
--- a/source/about.ui
+++ b/source/about.ui
@@ -10,6 +10,24 @@
     <height>307</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>639</width>
+    <height>307</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>639</width>
+    <height>307</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>About PA Calculator</string>
   </property>
@@ -33,7 +51,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>10</y>
+     <y>20</y>
      <width>256</width>
      <height>256</height>
     </rect>
@@ -59,7 +77,7 @@
     <rect>
      <x>290</x>
      <y>10</y>
-     <width>231</width>
+     <width>331</width>
      <height>21</height>
     </rect>
    </property>
@@ -79,7 +97,7 @@
     <rect>
      <x>290</x>
      <y>70</y>
-     <width>271</width>
+     <width>321</width>
      <height>16</height>
     </rect>
    </property>
diff --git a/source/library.cpp b/source/library.cpp
index ee7191a..c4b9211 100644
--- a/source/library.cpp
+++ b/source/library.cpp
@@ -17,6 +17,9 @@ library::library(QWidget *parent) :
     unsaved=false;
     speakerUnsaved=false;
     dacUnsaved=false;
+    initAmps=false;
+    initDacs=false;
+    initSpeaker=false;
 }
 
 library::~library()
@@ -73,8 +76,6 @@ cdac *library::getDacs()
 
 void library::open()
 {
-
-    ui->listWidget_ampView->setCurrentRow(0);
     QSettings settings("DKM-Tech","Pa-Calculator");
     if (settings.value("library/path","")==""){
         settings.setValue("library/path",QFileDialog::getSaveFileName(this,"Select Library Storage File","","Pa Calculator Library File (*.palib)"));
@@ -131,10 +132,6 @@ void library::refreshModeOverview()
             }
         }
     }
-    //std::cerr<<"refreshModeOverview started"<<std::endl;
-    //printAllAmps();
-
-
 }
 
 void library::refreshSpeakerView()
@@ -175,7 +172,7 @@ int library::getCurrentDacIndex()
 
 void library::ampEdited()
 {
-    if(unsaved==false){
+    if(ui->lineEdit_ampName->text()!=QString::fromStdString(m_pCamp[getCurrentAmpIndex()].getName()) && unsaved==false){
         ui->listWidget_ampView->currentItem()->setText(ui->listWidget_ampView->currentItem()->text()+QString::fromStdString("*"));
         unsaved =true;
     }
@@ -183,7 +180,7 @@ void library::ampEdited()
 
 void library::speakerEdited()
 {
-    if (speakerUnsaved==false){
+    if (ui->lineEdit_speakerName->text() != QString::fromStdString(m_pSpeaker[getCurrentSpeakerIndex()].getName()) && speakerUnsaved==false){
         ui->listWidget_speakerView->currentItem()->setText(ui->listWidget_speakerView->currentItem()->text()+QString::fromStdString("*"));
         speakerUnsaved =true;
     }
@@ -191,7 +188,7 @@ void library::speakerEdited()
 
 void library::dacEdited()
 {
-    if (dacUnsaved==false){
+    if (ui->lineEdit_dacName->text()!= QString::fromStdString(m_pDac[getCurrentDacIndex()].name()) && dacUnsaved==false){
         ui->listWidget_dacView->currentItem()->setText(ui->listWidget_dacView->currentItem()->text()+QString::fromStdString("*"));
         dacUnsaved =true;
     }
@@ -257,19 +254,30 @@ void library::printAllAmps()
 
 void library::on_listWidget_ampView_currentRowChanged(int currentRow)
 {
-    if (currentRow>=0){
-        ui->lineEdit_ampName->setText(QString::fromStdString(m_pCamp[currentRow].getName()));
-        ui->comboBox_sensUnit->setCurrentIndex(m_pCamp[currentRow].getSensivityUnit());
-        ui->doubleSpinBox_inputSensitivity->setValue(m_pCamp[currentRow].getSensitivity());
-        refreshModeOverview();
-        ui->listWidget_modeSelector->setCurrentRow(0);
-        ui->lineEdit_ampName->setEnabled(true);
-        ui->doubleSpinBox_inputSensitivity->setEnabled(true);
-    }else
-    {
-        ui->lineEdit_ampName->setEnabled(false);
-        ui->doubleSpinBox_inputSensitivity->setEnabled(false);
+    if (initAmps){
+        if (currentRow>=0){
+            ui->lineEdit_ampName->setText(QString::fromStdString(m_pCamp[currentRow].getName()));
+            ui->comboBox_sensUnit->setCurrentIndex(m_pCamp[currentRow].getSensivityUnit());
+            ui->doubleSpinBox_inputSensitivity->setValue(m_pCamp[currentRow].getSensitivity());
+            refreshModeOverview();
+            ui->listWidget_modeSelector->setCurrentRow(0);
+            ui->lineEdit_ampName->setEnabled(true);
+            ui->doubleSpinBox_inputSensitivity->setEnabled(true);
+            ui->comboBox_sensUnit->setEnabled(true);
+            ui->lineEdit_modeName->setEnabled(true);
+            ui->listWidget_modeSelector->setEnabled(true);
+            ui->spinBox_ratedImp->setEnabled(true);
+            ui->spinBox_ratedPower->setEnabled(true);
+
+        }else
+        {
+            ui->lineEdit_ampName->setEnabled(false);
+            ui->doubleSpinBox_inputSensitivity->setEnabled(false);
+        }
+    }else {
+        initAmps =true;
     }
+
 }
 
 
@@ -428,25 +436,29 @@ void library::on_pushButton_addSpeaker_clicked()
 
 void library::on_listWidget_speakerView_currentRowChanged(int currentRow)
 {
-    if (currentRow>=0){
-        ui->lineEdit_speakerName->setText(QString::fromStdString(m_pSpeaker[currentRow].getName()));
-        ui->spinBox_speakerImp->setValue(m_pSpeaker[currentRow].getImpedance());
-        ui->spinBox_speakerRMSPower->setValue(m_pSpeaker[currentRow].getRMSPower());
-        ui->spinBox_speakerPeakPower->setValue(m_pSpeaker[currentRow].getPeakPower());
-        ui->spinBox_speakerHPF->setValue(m_pSpeaker[currentRow].getHPF());
+    if (initSpeaker){
+        if (currentRow>=0){
+            ui->lineEdit_speakerName->setText(QString::fromStdString(m_pSpeaker[currentRow].getName()));
+            ui->spinBox_speakerImp->setValue(m_pSpeaker[currentRow].getImpedance());
+            ui->spinBox_speakerRMSPower->setValue(m_pSpeaker[currentRow].getRMSPower());
+            ui->spinBox_speakerPeakPower->setValue(m_pSpeaker[currentRow].getPeakPower());
+            ui->spinBox_speakerHPF->setValue(m_pSpeaker[currentRow].getHPF());
 
-        ui->lineEdit_speakerName->setEnabled(true);
-        //ui->spinBox_speakerImp->setEnabled(true);
-        //ui->spinBox_speakerRMSPower->setEnabled(true);
-        //ui->spinBox_speakerPeakPower->setEnabled(true);
-        //ui->spinBox_speakerHPF->setEnabled(true);
+            ui->lineEdit_speakerName->setEnabled(true);
+            ui->spinBox_speakerImp->setEnabled(true);
+            ui->spinBox_speakerRMSPower->setEnabled(true);
+            ui->spinBox_speakerPeakPower->setEnabled(true);
+            ui->spinBox_speakerHPF->setEnabled(true);
 
-    }else {
-        ui->lineEdit_speakerName->setEnabled(false);
-        //ui->spinBox_speakerImp->setEnabled(false);
-        //ui->spinBox_speakerRMSPower->setEnabled(false);
-        //ui->spinBox_speakerPeakPower->setEnabled(false);
-        //ui->spinBox_speakerHPF->setEnabled(false);
+        }else {
+            ui->lineEdit_speakerName->setEnabled(false);
+            //ui->spinBox_speakerImp->setEnabled(false);
+            //ui->spinBox_speakerRMSPower->setEnabled(false);
+            //ui->spinBox_speakerPeakPower->setEnabled(false);
+            //ui->spinBox_speakerHPF->setEnabled(false);
+        }
+    }else{
+        initSpeaker=true;
     }
 
 }
@@ -567,13 +579,19 @@ void library::on_pushButton_Apply_clicked()
 
 void library::on_listWidget_dacView_currentRowChanged(int currentRow)
 {
-    if (currentRow>=0){
-        ui->lineEdit_dacName->setText(QString::fromStdString(m_pDac[currentRow].name()));
-        ui->spinBox_dacOutputLevel->setValue(m_pDac[currentRow].outputLevel());
-        ui->lineEdit_dacName->setEnabled(true);
+    if (initDacs){
+        if (currentRow>=0){
+            ui->lineEdit_dacName->setText(QString::fromStdString(m_pDac[currentRow].name()));
+            ui->spinBox_dacOutputLevel->setValue(m_pDac[currentRow].outputLevel());
+            ui->lineEdit_dacName->setEnabled(true);
+            ui->spinBox_dacOutputLevel->setEnabled(true);
+        }else{
+            ui->lineEdit_dacName->setEnabled(false);
+        }
     }else{
-        ui->lineEdit_dacName->setEnabled(false);
+        initDacs=true;
     }
+
 }
 
 
diff --git a/source/library.h b/source/library.h
index e521a02..282ea65 100644
--- a/source/library.h
+++ b/source/library.h
@@ -128,6 +128,9 @@ private:
     bool speakerUnsaved;
     bool dacUnsaved;
 
+    bool initAmps;
+    bool initSpeaker;
+    bool initDacs;
 };
 
 #endif // LIBRARY_H
diff --git a/source/library.ui b/source/library.ui
index 22677ff..1b26e9f 100644
--- a/source/library.ui
+++ b/source/library.ui
@@ -106,6 +106,9 @@
            </item>
            <item row="2" column="1">
             <widget class="QComboBox" name="comboBox_sensUnit">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <item>
               <property name="text">
                <string>in Volt</string>
@@ -136,7 +139,11 @@
                </widget>
               </item>
               <item row="0" column="1">
-               <widget class="QLineEdit" name="lineEdit_modeName"/>
+               <widget class="QLineEdit" name="lineEdit_modeName">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+               </widget>
               </item>
               <item row="1" column="0">
                <widget class="QLabel" name="label_3">
@@ -147,6 +154,9 @@
               </item>
               <item row="1" column="1">
                <widget class="QSpinBox" name="spinBox_ratedPower">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
                 <property name="suffix">
                  <string> W</string>
                 </property>
@@ -167,6 +177,9 @@
               </item>
               <item row="2" column="1">
                <widget class="QSpinBox" name="spinBox_ratedImp">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
                 <property name="suffix">
                  <string> Ohm</string>
                 </property>
@@ -184,7 +197,11 @@
              </layout>
             </item>
             <item>
-             <widget class="QListWidget" name="listWidget_modeSelector"/>
+             <widget class="QListWidget" name="listWidget_modeSelector">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
             </item>
             <item>
              <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -281,7 +298,7 @@
          <item row="1" column="1">
           <widget class="QSpinBox" name="spinBox_speakerImp">
            <property name="enabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="suffix">
             <string> Ohm</string>
@@ -304,7 +321,7 @@
          <item row="2" column="1">
           <widget class="QSpinBox" name="spinBox_speakerRMSPower">
            <property name="enabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="suffix">
             <string> W</string>
@@ -327,7 +344,7 @@
          <item row="3" column="1">
           <widget class="QSpinBox" name="spinBox_speakerPeakPower">
            <property name="enabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="suffix">
             <string> W</string>
@@ -350,7 +367,7 @@
          <item row="4" column="1">
           <widget class="QSpinBox" name="spinBox_speakerHPF">
            <property name="enabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="suffix">
             <string> Hz</string>
@@ -429,6 +446,9 @@
          </item>
          <item row="1" column="1">
           <widget class="QDoubleSpinBox" name="spinBox_dacOutputLevel">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
            <property name="suffix">
             <string> dBU</string>
            </property>
diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
index 0787234..de6853e 100644
--- a/source/mainwindow.cpp
+++ b/source/mainwindow.cpp
@@ -312,6 +312,7 @@ void MainWindow::on_actionOpen_Library_triggered()
     loadLibrary();
     refreshLibraryAmps();
     refreshLibrarySpeaker();
+    refreshLibraryDacs();
 }