Skip to content
Snippets Groups Projects
Commit a685eccc authored by Martin Killenberg's avatar Martin Killenberg
Browse files

implement humidity sweep in GUI

parent 5edc4170
No related branches found
No related tags found
No related merge requests found
...@@ -14,12 +14,20 @@ class TestStandMainWindow(QMainWindow): ...@@ -14,12 +14,20 @@ class TestStandMainWindow(QMainWindow):
self.qt_app = qt_app self.qt_app = qt_app
self.startButton.clicked.connect(lambda: self.do_measurement()) self.startButton.clicked.connect(lambda: self.do_measurement())
self.tempSweepButton.clicked.connect(lambda: self.set_temp_sweep_labels())
self.humSweepButton.clicked.connect(lambda: self.set_hum_sweep_labels())
def do_measurement(self): def set_temp_sweep_labels(self):
if self.humSweepButton.isChecked(): self.parametersGroupBox.setEnabled(True)
QtWidgets.QMessageBox.information(self, 'Information', 'Humidity sweep is not implemented yet!') self.startStopStepGroupBox.setTitle('Temperature [degC]')
return self.fixedParameterLabel.setText('Humidity [% r.h.]')
def set_hum_sweep_labels(self):
self.parametersGroupBox.setEnabled(True)
self.startStopStepGroupBox.setTitle('Humidity [% r.h.]')
self.fixedParameterLabel.setText('Temperature [degC]')
def do_measurement(self):
self.setEnabled(False) self.setEnabled(False)
self.qt_app.processEvents(); self.qt_app.processEvents();
...@@ -47,6 +55,20 @@ class TestStandMainWindow(QMainWindow): ...@@ -47,6 +55,20 @@ class TestStandMainWindow(QMainWindow):
': Temperature sweep ' + str(temperatures[0]) + '--' + ': Temperature sweep ' + str(temperatures[0]) + '--' +
str(temperatures[-1]) + ' degC @ '+ str(self.fixedParameter.value()) + ' % r.h.') str(temperatures[-1]) + ' degC @ '+ str(self.fixedParameter.value()) + ' % r.h.')
elif self.humSweepButton.isChecked():
humidities = meas.perform_sweep(self.startParameter.value(), self.stopParameter.value(),
self.stepParameter.value(), self.fixedParameter.value(),
self.soakingTime.value(), self.stableReads.value(),
'humidity')
hum_extensions = []
for h in humidities:
hum_extensions.append(str(self.fixedParameter.value())+'deg_'+str(h)+'rh')
analysis.plot_sweep([self.fixedParameter.value()]*len(humidities), humidities, output_basename,
'humidity')
prototype.plot_output(output_basename, hum_extensions, True, output_basename +
': Humidity sweep ' + str(humidities[0]) + '--' +
str(humidities[-1]) + ' % r.h. @ '+ str(self.fixedParameter.value()) + ' degC')
elif self.measurementFileButton.isChecked(): elif self.measurementFileButton.isChecked():
try: try:
n_measurements = meas.perform_measurements(self.measurementFile.text()) n_measurements = meas.perform_measurements(self.measurementFile.text())
......
...@@ -389,5 +389,21 @@ ...@@ -389,5 +389,21 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>measurementFileButton</sender>
<signal>toggled(bool)</signal>
<receiver>parametersGroupBox</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>51</x>
<y>117</y>
</hint>
<hint type="destinationlabel">
<x>70</x>
<y>175</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment