Mocksim merge

parallax/accuracy_test.py

@@ -93,11 +93,11 @@ def __init__(self, model, parent=None):
         self.setMinimumWidth(300)
 
     def start_accuracy_test(self):
-        print('TODO: start_accuracy_test')
+        self.model.start_accuracy_test(self.get_params())
 
     def get_params(self):
         params = {}
-        params['stage'] = self.stage_dropdown.get_current_stage()
+        params['stage'] = self.stage_dropdown.current_stage()
         params['cal'] = self.model.calibrations[self.cal_dropdown.currentText()]
         params['npoints'] = int(self.npoints_edit.text())
         params['extent_um'] = float(self.extent_edit.text())
@@ -230,9 +230,9 @@ def __init__(self, params):
 
         self.ready_to_go = False
 
-    def register_corr_points(self, lcorr, rcorr):
-        xyz_recon = self.cal.triangulate(lcorr, rcorr)
-        self.results.append(self.last_stage_point + xyz_recon.tolist())
+    def register_corr_points(self, corr_pt):
+        xyz_recon = self.cal.triangulate(corr_pt)
+        self.results.append(self.last_stage_point + xyz_recon.coordinates.tolist())
 
     def carry_on(self):
         self.ready_to_go = True

parallax/calibration_worker.py

@@ -62,7 +62,7 @@ def run(self):
                         tip_pos = self.stage.get_tip_position()
                         pts = {}
                         for screen in Model.instance.main_window.screens():
-                            camera = screen.screen_widget.camera
+                            camera = screen.camera
                             pos = camera.camera_tr.map(tip_pos.coordinates)
                             pts[camera.name()] = pos[:2]
                         self.suggested_corr_points.emit(pts)

parallax/camera.py

@@ -18,13 +18,12 @@
 
 def list_cameras():
     cameras = []
+    cameras.extend([
+        MockCamera(camera_params={'pitch': 70, 'yaw': 120}),
+        MockCamera(camera_params={'pitch': 70, 'yaw': 150}),
+    ])
     if PySpin is not None:
         cameras.extend(PySpinCamera.list_cameras())
-    else:
-        cameras.extend([
-            MockCamera(camera_params={'pitch': 70, 'yaw': 120}),
-            MockCamera(camera_params={'pitch': 70, 'yaw': 150}),
-        ])
     return cameras
 
 

parallax/config.py

@@ -10,8 +10,8 @@
         "show_axes": True,
         "auto_select_corr_points": True,
     },
-    "calibration_path": "./calibrations",
-    "console_history_file": "./console_history",
+    "calibration_path": "./",
+    "console_history_file": "./",
     "console_edit_command": "code -g {fileName}:{lineNum}",
 }
 

parallax/control_panel.py

@@ -69,11 +69,11 @@ def __init__(self, model):
         self.dropdown.activated.connect(self.handle_stage_selection)
 
         self.settings_button = QPushButton()
-        self.settings_button.setIcon(QIcon('../img/gear.png'))
+        self.settings_button.setIcon(QIcon('./img/gear.png'))
         self.settings_button.clicked.connect(self.handle_settings)
 
         self.calibration_label = QLabel("")
-        self.cal_pt_btn = QPushButton('')
+        self.cal_pt_btn = QPushButton('Copy Calibration Point')
         self.cal_pt_btn.clicked.connect(self.copy_cal_pt)
 
         self.xcontrol = AxisControl('x')

parallax/geometry_panel.py

@@ -105,8 +105,7 @@ def cal_start_stop(self):
                 stage = dlg.get_stage()
                 res = dlg.get_resolution()
                 extent = dlg.get_extent()
-                name = dlg.get_name()
-                self.start_cal_thread(stage, res, extent, name)
+                self.start_cal_thread(stage, res, extent)
         elif self.cal_start_stop_button.text() == 'Stop':
             self.stop_cal_thread()
 
@@ -229,7 +228,7 @@ def show_rbt_tool(self):
         self.rbt_tool.show()
 
     def show_suggested_corr_points(self, pts):
-        screens = {screen.screen_widget.camera.name():screen for screen in self.model.main_window.screens()}
+        screens = {screen.camera.name():screen for screen in self.model.main_window.screens()}
         for cam_name, pt in pts.items():
             screens[cam_name].set_selected(pt)
-
+

parallax/main_window.py

@@ -230,5 +230,6 @@ def save_camera_frames(self):
 
     def update_corr(self):
         # send correspondence points to model
-        pts = [ctrl.screen_widget.get_selected() for ctrl in self.screens]
+        pts = [ctrl.get_selected() for ctrl in self.screens]
         self.model.set_correspondence_points(pts)
+

parallax/model.py

@@ -79,7 +79,6 @@ def list_calibrations(self):
         for cal in self.calibrations.values():
             calibrations.append({'calibration': cal, 'from_cs': cal.from_cs, 'to_cs': cal.to_cs, 'timestamp': cal.timestamp})
 
-        assert len(calibrations) > 0
         return calibrations
 
     def get_calibration(self, stage):
@@ -141,18 +140,29 @@ def add_transform(self, name, transform):
     def get_transform(self, name):
         return self.transforms[name]
 
+    def set_lcorr(self, xc, yc):
+        self.lcorr = [xc, yc] 
+
+    def clear_lcorr(self):
+        self.lcorr = False
+
+    def set_rcorr(self, xc, yc):
+        self.rcorr = [xc, yc] 
+
+    def clear_rcorr(self):
+        self.rcorr = False
+
     def handle_accutest_point_reached(self, i, npoints):
         self.msg_posted.emit('Accuracy test point %d (of %d) reached.' % (i+1,npoints))
         self.clear_lcorr()
         self.clear_rcorr()
         self.msg_posted.emit('Highlight correspondence points and press C to continue')
 
     def register_corr_points_accutest(self):
-        lcorr, rcorr = self.lcorr, self.rcorr
-        if (lcorr and rcorr):
-            self.accutest_worker.register_corr_points(lcorr, rcorr)
-            self.msg_posted.emit('Correspondence points registered: (%d,%d) and (%d,%d)' % \
-                                    (lcorr[0],lcorr[1], rcorr[0],rcorr[1]))
+        corr_pt = self.get_image_point()
+        if corr_pt is not None:
+            self.accutest_worker.register_corr_points(corr_pt)
+            self.msg_posted.emit('Correspondence points registered.')
             self.accutest_worker.carry_on()
         else:
             self.msg_posted.emit('Highlight correspondence points and press C to continue')

parallax/screen_widget.py

@@ -57,6 +57,8 @@ def __init__(self, filename=None, model=None, parent=None):
         self.detector_menu = self.parallax_menu.addMenu("Detectors")
         self.view_box.menu.insertMenu(self.view_box.menu.actions()[0], self.parallax_menu)
 
+        self.update_camera_menu()
+        self.update_focus_control_menu()
         self.update_filter_menu()
         self.update_detector_menu()