Commit efc3778c authored by Martin Drechsler's avatar Martin Drechsler

Metadata now is saved. Only roi position remains to be saveable and logable

parent 139615d7
......@@ -285,6 +285,14 @@ class CameraGuiMainWindow(QMainWindow):
measure_params['end'] = self.measurementFrame.endValue.value()
measure_params['steps'] = self.measurementFrame.stepsNum.value()
measure_params['directory'] = self.measurementFrame.folderBrowser.toPlainText()
measure_params['comment'] = self.measurementFrame.comments.toPlainText()
measure_params['spinboxes_dict'] = dict()
for l in LaserControlLayout._registry:
for sb_name, sb in l.spinboxes.items():
measure_params['spinboxes_dict'][sb_name] = sb.value()
self.signalWithMeasurementParameters.emit(measure_params)
###############################################################################
......
......@@ -62,7 +62,9 @@ class Storage(object):
with open(self.get_current_metadata_filename(), 'a') as f:
f.write('\n' + str(key) + ' ' + str(value))
f.flush()
with open(self.get_current_metadata_filename(), 'a') as f:
f.write('\n')
f.flush()
pass
def get_date_string(self):
......
......@@ -9,7 +9,7 @@ from pyqtgraph.Qt import QtCore, QtGui
import pyqtgraph.parametertree.parameterTypes as pTypes
from pyqtgraph.parametertree import Parameter, ParameterTree
from PyQt5.QtCore import QSettings
from PyQt5.QtWidgets import QAction, QFileDialog, QInputDialog, QWidget
from PyQt5.QtWidgets import QFileDialog
......@@ -105,11 +105,12 @@ class CameraParameterTree(ParameterTree):
settings.beginGroup('Camera')
for parameter in self.p.child('Basic acq parameters').children():
saved_value = settings.value(parameter.name())
if not parameter.readonly():
if parameter.type() == 'str' or parameter.type() == 'list':
parameter.setValue(saved_value)
if parameter.type() == 'float':
parameter.setValue(float(saved_value))
if saved_value:
if not parameter.readonly():
if parameter.type() == 'str' or parameter.type() == 'list':
parameter.setValue(saved_value)
if parameter.type() == 'float':
parameter.setValue(float(saved_value))
settings.endGroup()
def save_to(self):
......
......@@ -140,7 +140,7 @@ class CameraWorker(QtCore.QObject):
self.storage.set_directory(measure_params['directory'])
self.storage.create_data_file('Time', measure_params['signal_to_scan'], 'Roi data')
self.storage.append_metadata_to_current_file(measure_params['spinboxes_dict'], self.cam.GetMetaData(), measure_params)
self.cam.TriggerMode.setString('Software')
self.cam.helper.imageAquiredSignal.disconnect(self.new_image_acquired)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment