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

Put measurements into separate output directory

parent ce9c4c4d
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/python3 #!/usr/bin/python3
import os.path
from PyQt5.QtWidgets import QMainWindow, QApplication, QPushButton, QTextEdit from PyQt5.QtWidgets import QMainWindow, QApplication, QPushButton, QTextEdit
from PyQt5 import uic, QtCore, QtGui, QtWidgets from PyQt5 import uic, QtCore, QtGui, QtWidgets
import sys import sys
...@@ -17,6 +19,8 @@ class TestStandMainWindow(QMainWindow): ...@@ -17,6 +19,8 @@ class TestStandMainWindow(QMainWindow):
self.tempSweepButton.clicked.connect(lambda: self.set_temp_sweep_labels()) self.tempSweepButton.clicked.connect(lambda: self.set_temp_sweep_labels())
self.humSweepButton.clicked.connect(lambda: self.set_hum_sweep_labels()) self.humSweepButton.clicked.connect(lambda: self.set_hum_sweep_labels())
self.start_dir = os.getcwd()
def set_temp_sweep_labels(self): def set_temp_sweep_labels(self):
self.parametersGroupBox.setEnabled(True) self.parametersGroupBox.setEnabled(True)
self.startStopStepGroupBox.setTitle('Temperature [degC]') self.startStopStepGroupBox.setTitle('Temperature [degC]')
...@@ -27,10 +31,33 @@ class TestStandMainWindow(QMainWindow): ...@@ -27,10 +31,33 @@ class TestStandMainWindow(QMainWindow):
self.startStopStepGroupBox.setTitle('Humidity [% r.h.]') self.startStopStepGroupBox.setTitle('Humidity [% r.h.]')
self.fixedParameterLabel.setText('Temperature [degC]') self.fixedParameterLabel.setText('Temperature [degC]')
def check_and_change_dir(self, data_folder):
if os.path.exists(data_folder):
if os.path.isdir(data_folder):
button_reply = QtWidgets.QMessageBox.question(self, 'Warning: \''+data_folder+'\' already exists',
'Overwrite data in \''+data_folder+'\'?',
QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
QtWidgets.QMessageBox.No)
if not button_reply == QtWidgets.QMessageBox.Yes:
return False
else:
QtWidgets.QMessageBox.critical(self, 'Error', '\''+data_folder + '\' exists but is not a directory!')
return False
else:
try:
os.makedirs(data_folder)
except:
QtWidgets.QMessageBox.critical(self, 'Error', 'Cannot create folder \''+data_folder + '\'!')
return False
os.chdir(data_folder)
print('changed dir')
return True
def do_measurement(self): def do_measurement(self):
self.setEnabled(False) self.setEnabled(False)
self.qt_app.processEvents(); self.qt_app.processEvents();
os.chdir(self.start_dir)
with open('test_stand_parameter.json', 'r') as f: with open('test_stand_parameter.json', 'r') as f:
config_data = json.load(f) config_data = json.load(f)
...@@ -38,6 +65,11 @@ class TestStandMainWindow(QMainWindow): ...@@ -38,6 +65,11 @@ class TestStandMainWindow(QMainWindow):
output_basename = time.strftime("%Y_%m_%d-%H_%M_%S") + "_results" output_basename = time.strftime("%Y_%m_%d-%H_%M_%S") + "_results"
else: else:
output_basename = self.baseName.text() output_basename = self.baseName.text()
if not self.check_and_change_dir(config_data['data_folder']+'/'+output_basename):
self.setEnabled(True)
return
meas = prototype.Measurements(config_data['chamber_ip'], config_data['vna_ip'], output_basename, meas = prototype.Measurements(config_data['chamber_ip'], config_data['vna_ip'], output_basename,
False, config_data) False, config_data)
try: try:
......
{"delta_temp": 0.1, "delta_hum": 1, "delta_mag": 0.1 , "delta_phase": 0.02, "sleep_time": 10.0, "frequency": 1300000000, "vna_config_file": "climate-lab.znxml","chamber_ip":"localhost", "vna_ip":"localhost"} {"delta_temp": 0.1, "delta_hum": 1, "delta_mag": 0.1 , "delta_phase": 0.02, "sleep_time": 10.0, "frequency": 1300000000, "vna_config_file": "climate-lab.znxml","chamber_ip":"localhost", "vna_ip":"localhost", "data_folder":"measurements"}
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