roi spinboxes now load roi position and size

cameraGui.py

@@ -161,6 +161,8 @@ class CameraGuiMainWindow(QMainWindow):
                 current_binning=self.cameraParamFrame.paramTree.p.child('Basic acq parameters')
             .child('Pixel Binning').value() ))
             
+            roi.sigRegionChanged.connect(self.cameraParamFrame.updateRoiSpinBoxes)
+            
     
     def camera_button_pressed(self):
 
@@ -305,11 +307,11 @@ class CameraGuiMainWindow(QMainWindow):
         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 roi in self.rois:
+            measure_params['Roi Pos'] = roi.pos()
+            measure_params['Roi Size'] = roi.size()
+            
 
-        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)

measurement.py

@@ -39,7 +39,7 @@ class MeasurementFrame(QtWidgets.QFrame, Ui_Frame):
 
 
         self.treeModel.insertRow(0)            
-        self.treeModel.setData(self.treeModel.index(0, 0), r'dV')
+        self.treeModel.setData(self.treeModel.index(0, 0), r'dV (mv)')
         self.treeModel.setData(self.treeModel.index(0, 1), '?')
     
         self.saveMeasureButton.setEnabled(False)
@@ -71,7 +71,7 @@ class MeasurementFrame(QtWidgets.QFrame, Ui_Frame):
 
     def update_tree(self):
         try:
-            self.treeModel.setData(self.treeModel.index(0, 1), (self.endValue.value()-self.startValue.value())/self.stepsNum.value() )
+            self.treeModel.setData(self.treeModel.index(0, 1), (self.endValue.value()-self.startValue.value())/(self.stepsNum.value()-1) *1000)
         except:
             self.treeModel.setData(self.treeModel.index(0, 1), '?')
 

subclasses/cameraParameterFrame.py

@@ -7,7 +7,7 @@ Created on Sat May 11 11:22:27 2019
 """
 
 from PyQt5 import QtWidgets
-from PyQt5 import QtGui
+from PyQt5 import QtCore
 from subclasses.cameraParameterTree import CameraParameterTree
 import pyqtgraph as pg
 
@@ -49,10 +49,10 @@ class CameraParameterFrame(QtWidgets.QFrame):
                 'Roi X Size'), 6, 0)
         self.grid.addWidget(QtWidgets.QLabel(
                 'Roi Y Size'), 6, 1)
-        self.RoiXPosSb = pg.SpinBox()
-        self.RoiYPosSb = pg.SpinBox()
-        self.grid.addWidget(self.RoiXPosSb, 7, 0)
-        self.grid.addWidget(self.RoiYPosSb, 7, 1)
+        self.RoiXSizeSb = pg.SpinBox()
+        self.RoiYSizeSb = pg.SpinBox()
+        self.grid.addWidget(self.RoiXSizeSb, 7, 0)
+        self.grid.addWidget(self.RoiYSizeSb, 7, 1)
         
         self.roiLayout = QtWidgets.QHBoxLayout()
         self.saveRoiButton = QtWidgets.QPushButton('Save Roi')
@@ -73,6 +73,13 @@ class CameraParameterFrame(QtWidgets.QFrame):
         self.saveToButton.clicked.connect(self.paramTree.save_to)
         self.loadFromButton.clicked.connect(self.paramTree.load_from)
         
+    @QtCore.pyqtSlot(object)
+    def updateRoiSpinBoxes(self, roi):
+        self.RoiXPosSb.setValue(roi.pos()[0])
+        self.RoiYPosSb.setValue(roi.pos()[1])
+        self.RoiXSizeSb.setValue(roi.size()[0])
+        self.RoiYSizeSb.setValue(roi.size()[1])
+    
     
 if __name__ == '__main__':
     import sys

subclasses/pyqtgraph_subclasses.py

@@ -5,7 +5,6 @@ Some sub-classes from pyqtgraph.
 
 from pyqtgraph import ROI
 from PyQt5.QtCore import QSettings, pyqtSlot
-from PyQt5.QtWidgets import QFileDialog
 
 
 class CustomRectangularROI(ROI):

zylaCameraWorker.py

@@ -188,6 +188,7 @@ class CameraWorker(QtCore.QObject):
     
     def abort_measurement(self):
         self.scan_array_gen.close()
+        self.simple_scan_measurement_end()
         print('Measurement aborted')
     
     @QtCore.pyqtSlot(str)