DKM-Tech
/
pa-calculator
3
3
Fork 0
Code Issues 2 Pull Requests Projects Releases 5 Wiki Activity

Minor Improvements

Browse Source
pull/4/head
Alexander Diamadis 5 years ago
parent 9f1fad5998
commit ea95d5787a
Signed by: alex
GPG Key ID: 6A1609EFA141FD70
5 changed files with 112 additions and 52 deletions
Show Stats Download Patch File Download Diff File

24
source/about.ui
Unescape Escape View File

@ -10,6 +10,24 @@
<height>307</height> <height>307</height>
</rect> </rect>
</property> </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"> <property name="windowTitle">
<string>About PA Calculator</string> <string>About PA Calculator</string>
</property> </property>
@ -33,7 +51,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>20</y>
<width>256</width> <width>256</width>
<height>256</height> <height>256</height>
</rect> </rect>
@ -59,7 +77,7 @@
<rect> <rect>
<x>290</x> <x>290</x>
<y>10</y> <y>10</y>
<width>231</width> <width>331</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
@ -79,7 +97,7 @@
<rect> <rect>
<x>290</x> <x>290</x>
<y>70</y> <y>70</y>
<width>271</width> <width>321</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>

104
source/library.cpp
Unescape Escape View File

@ -17,6 +17,9 @@ library::library(QWidget *parent) :
unsaved=false; unsaved=false;
speakerUnsaved=false; speakerUnsaved=false;
dacUnsaved=false; dacUnsaved=false;
initAmps=false;
initDacs=false;
initSpeaker=false;
} }
library::~library() library::~library()
@ -73,8 +76,6 @@ cdac *library::getDacs()
void library::open() void library::open()
{ {
ui->listWidget_ampView->setCurrentRow(0);
QSettings settings("DKM-Tech","Pa-Calculator"); QSettings settings("DKM-Tech","Pa-Calculator");
if (settings.value("library/path","")==""){ if (settings.value("library/path","")==""){
settings.setValue("library/path",QFileDialog::getSaveFileName(this,"Select Library Storage File","","Pa Calculator Library File (*.palib)")); 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() void library::refreshSpeakerView()
@ -175,7 +172,7 @@ int library::getCurrentDacIndex()
void library::ampEdited() 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("*")); ui->listWidget_ampView->currentItem()->setText(ui->listWidget_ampView->currentItem()->text()+QString::fromStdString("*"));
unsaved =true; unsaved =true;
} }
@ -183,7 +180,7 @@ void library::ampEdited()
void library::speakerEdited() 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("*")); ui->listWidget_speakerView->currentItem()->setText(ui->listWidget_speakerView->currentItem()->text()+QString::fromStdString("*"));
speakerUnsaved =true; speakerUnsaved =true;
} }
@ -191,7 +188,7 @@ void library::speakerEdited()
void library::dacEdited() 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("*")); ui->listWidget_dacView->currentItem()->setText(ui->listWidget_dacView->currentItem()->text()+QString::fromStdString("*"));
dacUnsaved =true; dacUnsaved =true;
} }
@ -257,19 +254,30 @@ void library::printAllAmps()
void library::on_listWidget_ampView_currentRowChanged(int currentRow) void library::on_listWidget_ampView_currentRowChanged(int currentRow)
{ {
if (currentRow>=0){ if (initAmps){
ui->lineEdit_ampName->setText(QString::fromStdString(m_pCamp[currentRow].getName())); if (currentRow>=0){
ui->comboBox_sensUnit->setCurrentIndex(m_pCamp[currentRow].getSensivityUnit()); ui->lineEdit_ampName->setText(QString::fromStdString(m_pCamp[currentRow].getName()));
ui->doubleSpinBox_inputSensitivity->setValue(m_pCamp[currentRow].getSensitivity()); ui->comboBox_sensUnit->setCurrentIndex(m_pCamp[currentRow].getSensivityUnit());
refreshModeOverview(); ui->doubleSpinBox_inputSensitivity->setValue(m_pCamp[currentRow].getSensitivity());
ui->listWidget_modeSelector->setCurrentRow(0); refreshModeOverview();
ui->lineEdit_ampName->setEnabled(true); ui->listWidget_modeSelector->setCurrentRow(0);
ui->doubleSpinBox_inputSensitivity->setEnabled(true); ui->lineEdit_ampName->setEnabled(true);
}else ui->doubleSpinBox_inputSensitivity->setEnabled(true);
{ ui->comboBox_sensUnit->setEnabled(true);
ui->lineEdit_ampName->setEnabled(false); ui->lineEdit_modeName->setEnabled(true);
ui->doubleSpinBox_inputSensitivity->setEnabled(false); 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) void library::on_listWidget_speakerView_currentRowChanged(int currentRow)
{ {
if (currentRow>=0){ if (initSpeaker){
ui->lineEdit_speakerName->setText(QString::fromStdString(m_pSpeaker[currentRow].getName())); if (currentRow>=0){
ui->spinBox_speakerImp->setValue(m_pSpeaker[currentRow].getImpedance()); ui->lineEdit_speakerName->setText(QString::fromStdString(m_pSpeaker[currentRow].getName()));
ui->spinBox_speakerRMSPower->setValue(m_pSpeaker[currentRow].getRMSPower()); ui->spinBox_speakerImp->setValue(m_pSpeaker[currentRow].getImpedance());
ui->spinBox_speakerPeakPower->setValue(m_pSpeaker[currentRow].getPeakPower()); ui->spinBox_speakerRMSPower->setValue(m_pSpeaker[currentRow].getRMSPower());
ui->spinBox_speakerHPF->setValue(m_pSpeaker[currentRow].getHPF()); ui->spinBox_speakerPeakPower->setValue(m_pSpeaker[currentRow].getPeakPower());
ui->spinBox_speakerHPF->setValue(m_pSpeaker[currentRow].getHPF());
ui->lineEdit_speakerName->setEnabled(true); ui->lineEdit_speakerName->setEnabled(true);
//ui->spinBox_speakerImp->setEnabled(true); ui->spinBox_speakerImp->setEnabled(true);
//ui->spinBox_speakerRMSPower->setEnabled(true); ui->spinBox_speakerRMSPower->setEnabled(true);
//ui->spinBox_speakerPeakPower->setEnabled(true); ui->spinBox_speakerPeakPower->setEnabled(true);
//ui->spinBox_speakerHPF->setEnabled(true); ui->spinBox_speakerHPF->setEnabled(true);
}else { }else {
ui->lineEdit_speakerName->setEnabled(false); ui->lineEdit_speakerName->setEnabled(false);
//ui->spinBox_speakerImp->setEnabled(false); //ui->spinBox_speakerImp->setEnabled(false);
//ui->spinBox_speakerRMSPower->setEnabled(false); //ui->spinBox_speakerRMSPower->setEnabled(false);
//ui->spinBox_speakerPeakPower->setEnabled(false); //ui->spinBox_speakerPeakPower->setEnabled(false);
//ui->spinBox_speakerHPF->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) void library::on_listWidget_dacView_currentRowChanged(int currentRow)
{ {
if (currentRow>=0){ if (initDacs){
ui->lineEdit_dacName->setText(QString::fromStdString(m_pDac[currentRow].name())); if (currentRow>=0){
ui->spinBox_dacOutputLevel->setValue(m_pDac[currentRow].outputLevel()); ui->lineEdit_dacName->setText(QString::fromStdString(m_pDac[currentRow].name()));
ui->lineEdit_dacName->setEnabled(true); 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{ }else{
ui->lineEdit_dacName->setEnabled(false); initDacs=true;
} }
} }

3
source/library.h
Unescape Escape View File

@ -128,6 +128,9 @@ private:
bool speakerUnsaved; bool speakerUnsaved;
bool dacUnsaved; bool dacUnsaved;
bool initAmps;
bool initSpeaker;
bool initDacs;
}; };
#endif // LIBRARY_H #endif // LIBRARY_H

32
source/library.ui
Unescape Escape View File

@ -106,6 +106,9 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="comboBox_sensUnit"> <widget class="QComboBox" name="comboBox_sensUnit">
<property name="enabled">
<bool>false</bool>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>in Volt</string> <string>in Volt</string>
@ -136,7 +139,11 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <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>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
@ -147,6 +154,9 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="spinBox_ratedPower"> <widget class="QSpinBox" name="spinBox_ratedPower">
<property name="enabled">
<bool>false</bool>
</property>
<property name="suffix"> <property name="suffix">
<string> W</string> <string> W</string>
</property> </property>
@ -167,6 +177,9 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinBox_ratedImp"> <widget class="QSpinBox" name="spinBox_ratedImp">
<property name="enabled">
<bool>false</bool>
</property>
<property name="suffix"> <property name="suffix">
<string> Ohm</string> <string> Ohm</string>
</property> </property>
@ -184,7 +197,11 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidget_modeSelector"/> <widget class="QListWidget" name="listWidget_modeSelector">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
@ -281,7 +298,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="spinBox_speakerImp"> <widget class="QSpinBox" name="spinBox_speakerImp">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="suffix"> <property name="suffix">
<string> Ohm</string> <string> Ohm</string>
@ -304,7 +321,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinBox_speakerRMSPower"> <widget class="QSpinBox" name="spinBox_speakerRMSPower">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="suffix"> <property name="suffix">
<string> W</string> <string> W</string>
@ -327,7 +344,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="spinBox_speakerPeakPower"> <widget class="QSpinBox" name="spinBox_speakerPeakPower">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="suffix"> <property name="suffix">
<string> W</string> <string> W</string>
@ -350,7 +367,7 @@
<item row="4" column="1"> <item row="4" column="1">
<widget class="QSpinBox" name="spinBox_speakerHPF"> <widget class="QSpinBox" name="spinBox_speakerHPF">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="suffix"> <property name="suffix">
<string> Hz</string> <string> Hz</string>
@ -429,6 +446,9 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QDoubleSpinBox" name="spinBox_dacOutputLevel"> <widget class="QDoubleSpinBox" name="spinBox_dacOutputLevel">
<property name="enabled">
<bool>false</bool>
</property>
<property name="suffix"> <property name="suffix">
<string> dBU</string> <string> dBU</string>
</property> </property>

1
source/mainwindow.cpp
Unescape Escape View File

@ -312,6 +312,7 @@ void MainWindow::on_actionOpen_Library_triggered()
loadLibrary(); loadLibrary();
refreshLibraryAmps(); refreshLibraryAmps();
refreshLibrarySpeaker(); refreshLibrarySpeaker();
refreshLibraryDacs();
} }

Write Preview
Loading…
Cancel
Save