diff --git a/Desktop Interface/Labrador.pro.user b/Desktop Interface/Labrador.pro.user index 144ec73a..803d1dfe 100644 --- a/Desktop Interface/Labrador.pro.user +++ b/Desktop Interface/Labrador.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/Desktop Interface/bin/Labrador.exe b/Desktop Interface/bin/Labrador.exe index 33a68b4e..4b23d457 100644 Binary files a/Desktop Interface/bin/Labrador.exe and b/Desktop Interface/bin/Labrador.exe differ diff --git a/Desktop Interface/mainwindow.ui b/Desktop Interface/mainwindow.ui index ca658703..2b20088a 100644 --- a/Desktop Interface/mainwindow.ui +++ b/Desktop Interface/mainwindow.ui @@ -800,7 +800,7 @@ - Amplitude + Amplitude (Peak-Peak) @@ -820,7 +820,7 @@ - DC Offset + Offset @@ -910,7 +910,7 @@ true - Amplitude + Amplitude (Peak-Peak) @@ -936,7 +936,7 @@ true - DC Offset + Offset @@ -1068,7 +1068,7 @@ - Bus Sniffer CH1 + Logic Analyzer CH1 true @@ -1148,7 +1148,7 @@ false - Bus Sniffer CH2 + Logic Analyzer CH2 true @@ -1405,7 +1405,7 @@ - Bus Sniffer + Logic Analyzer diff --git a/Desktop Interface/release/main.obj b/Desktop Interface/release/main.obj index aea34bd7..77dd6efe 100644 Binary files a/Desktop Interface/release/main.obj and b/Desktop Interface/release/main.obj differ diff --git a/Desktop Interface/release/mainwindow.obj b/Desktop Interface/release/mainwindow.obj index 72baa90e..7826ccdf 100644 Binary files a/Desktop Interface/release/mainwindow.obj and b/Desktop Interface/release/mainwindow.obj differ diff --git a/Desktop Interface/release/moc_mainwindow.obj b/Desktop Interface/release/moc_mainwindow.obj index bb5f01cc..32881448 100644 Binary files a/Desktop Interface/release/moc_mainwindow.obj and b/Desktop Interface/release/moc_mainwindow.obj differ diff --git a/Desktop Interface/ui_mainwindow.h b/Desktop Interface/ui_mainwindow.h index cf90ea3a..5855a346 100644 --- a/Desktop Interface/ui_mainwindow.h +++ b/Desktop Interface/ui_mainwindow.h @@ -1594,16 +1594,16 @@ public: signalGenGroup_CH1->setTitle(QApplication::translate("MainWindow", "Signal Gen CH1", 0)); waveformLabel_CH1->setText(QApplication::translate("MainWindow", "Waveform", 0)); frequencyLabel_CH1->setText(QApplication::translate("MainWindow", "Frequency", 0)); - amplitudeLabel_CH1->setText(QApplication::translate("MainWindow", "Amplitude", 0)); + amplitudeLabel_CH1->setText(QApplication::translate("MainWindow", "Amplitude (Peak-Peak)", 0)); amplitudeValue_CH1->setSuffix(QApplication::translate("MainWindow", "V", 0)); - dcOffsetLabel_CH1->setText(QApplication::translate("MainWindow", "DC Offset", 0)); + dcOffsetLabel_CH1->setText(QApplication::translate("MainWindow", "Offset", 0)); dcOffsetValue_CH1->setSuffix(QApplication::translate("MainWindow", "V", 0)); signalGenGroup_CH2->setTitle(QApplication::translate("MainWindow", "Signal Gen CH2", 0)); waveformLabel_CH2->setText(QApplication::translate("MainWindow", "Waveform", 0)); frequencyLabel_CH2->setText(QApplication::translate("MainWindow", "Frequency", 0)); - amplitudeLabel_CH2->setText(QApplication::translate("MainWindow", "Amplitude", 0)); + amplitudeLabel_CH2->setText(QApplication::translate("MainWindow", "Amplitude (Peak-Peak)", 0)); amplitudeValue_CH2->setSuffix(QApplication::translate("MainWindow", "V", 0)); - dcOffsetLabel_CH2->setText(QApplication::translate("MainWindow", "DC Offset", 0)); + dcOffsetLabel_CH2->setText(QApplication::translate("MainWindow", "Offset", 0)); dcOffsetValue_CH2->setSuffix(QApplication::translate("MainWindow", "V", 0)); controller_iso->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS ISO DRIVER", 0)); psuGroup->setTitle(QApplication::translate("MainWindow", "PSU", 0));