From 17407fa9b94d963b60a6b0b7cd1cc57e1d2e8728 Mon Sep 17 00:00:00 2001 From: Tobias Triffterer <tobias@ep1.ruhr-uni-bochum.de> Date: Wed, 11 Aug 2021 03:47:32 +0200 Subject: [PATCH] =?UTF-8?q?Disable=20=E2=80=9CFit=20Histogram=E2=80=9D=20B?= =?UTF-8?q?utton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fitting the histogram is currently not implemented, but can be done directly in ROOT using the file saved from this application. --- l10n/fp311online-de.ts | 24 ++++++++++++------------ src/clientgui.cpp | 2 +- ui/clientgui.ui | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/l10n/fp311online-de.ts b/l10n/fp311online-de.ts index aead861..576c800 100644 --- a/l10n/fp311online-de.ts +++ b/l10n/fp311online-de.ts @@ -67,8 +67,8 @@ <location filename="../ui/clientgui.ui" line="114"/> <location filename="../ui/clientgui.ui" line="128"/> <location filename="../ui/clientgui.ui" line="135"/> - <location filename="../ui/clientgui.ui" line="239"/> - <location filename="../ui/clientgui.ui" line="273"/> + <location filename="../ui/clientgui.ui" line="242"/> + <location filename="../ui/clientgui.ui" line="276"/> <source>➤</source> <translation>➤</translation> </message> @@ -95,52 +95,52 @@ y Torr</translation> <translation>Datenanalyse:</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="218"/> + <location filename="../ui/clientgui.ui" line="221"/> <source>Fit Histogram</source> <translation>Histogramm fitten</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="225"/> + <location filename="../ui/clientgui.ui" line="228"/> <source>Save Data</source> <translation>Daten speichern</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="232"/> + <location filename="../ui/clientgui.ui" line="235"/> <source>Update Histogram</source> <translation>Histogramm aktualisieren</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="259"/> + <location filename="../ui/clientgui.ui" line="262"/> <source>Stop ADC</source> <translation>ADC stoppen</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="266"/> + <location filename="../ui/clientgui.ui" line="269"/> <source>Start ADC</source> <translation>ADC starten</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="280"/> + <location filename="../ui/clientgui.ui" line="283"/> <source>Clear Histogram</source> <translation>Histogramm löschen</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="333"/> + <location filename="../ui/clientgui.ui" line="336"/> <source>ADC Threshold:</source> <translation>ADC-Schwelle:</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="346"/> + <location filename="../ui/clientgui.ui" line="349"/> <source>%v</source> <translation>%v</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="353"/> + <location filename="../ui/clientgui.ui" line="356"/> <source>+1</source> <translation>+1</translation> </message> <message> - <location filename="../ui/clientgui.ui" line="360"/> + <location filename="../ui/clientgui.ui" line="363"/> <source>-1</source> <translation>-1</translation> </message> diff --git a/src/clientgui.cpp b/src/clientgui.cpp index 0c7b4d2..b925c5d 100644 --- a/src/clientgui.cpp +++ b/src/clientgui.cpp @@ -235,7 +235,7 @@ void ClientGui::displayExperimentState() _ui.cmdAdcThresholdDown->setEnabled(true); _ui.cmdUpdateHisto->setEnabled(true); _ui.cmdClearHisto->setEnabled(true); - _ui.cmdFitHisto->setEnabled(true); + _ui.cmdFitHisto->setEnabled(false); // Fitting the histogram is currently not possible _ui.cmdSaveData->setEnabled(true); _ui.cmdTargetOpen->setEnabled(true); _ui.cmdTargetClose->setEnabled(true); diff --git a/ui/clientgui.ui b/ui/clientgui.ui index 4a5db7a..f11f7c9 100644 --- a/ui/clientgui.ui +++ b/ui/clientgui.ui @@ -214,6 +214,9 @@ y Torr</string> <layout class="QGridLayout" name="glAnalysisButtons"> <item row="0" column="4"> <widget class="QPushButton" name="cmdFitHisto"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Fit Histogram</string> </property> -- GitLab