Merge pull request #241 from braden6521/sofast_gui_ui

Sofast gui UI
sandialabs · Feb 19, 2025 · f0fc72f · f0fc72f
2 parents 4f4f863 + 312c370
commit f0fc72f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/opencsp/app/sofast/SofastGUI.py b/opencsp/app/sofast/SofastGUI.py
@@ -187,11 +187,11 @@ def _create_layout(self) -> None:
 
         # =============== First Column - Projection controls ===============
         r = 0
-        self.btn_show_cal_image = tkinter.Button(
+        self.btn_show_cal_image_fiducial = tkinter.Button(
             label_frame_projector, text="Show Cal Fiducial Image", command=self.show_calibration_fiducial_image
         )
-        self.btn_show_cal_image.grid(row=r, column=0, pady=2, padx=2, sticky="nesw")
-        tkt.TkToolTip(self.btn_show_cal_image, "Shows calibration fiducial image on projection window.")
+        self.btn_show_cal_image_fiducial.grid(row=r, column=0, pady=2, padx=2, sticky="nesw")
+        tkt.TkToolTip(self.btn_show_cal_image_fiducial, "Shows calibration fiducial image on projection window.")
         r += 1
 
         self.btn_show_cal_image = tkinter.Button(
@@ -214,7 +214,7 @@ def _create_layout(self) -> None:
         r += 1
 
         self.btn_close_projection = tkinter.Button(
-            label_frame_projector, text="Close Display Window", command=self.close_projection_window
+            label_frame_projector, text="Close Image Projection", command=self.close_projection_window
         )
         self.btn_close_projection.grid(row=r, column=0, pady=2, padx=2, sticky="nesw")
         tkt.TkToolTip(self.btn_close_projection, "Close only projection window.")
@@ -266,14 +266,6 @@ def _create_layout(self) -> None:
 
         # =============== First Column - System run controls ===============
         r = 0
-        # Run sofast capture
-        self.btn_run_measurement = tkinter.Button(
-            label_frame_run, text="Run Data Capture", command=self.run_measurement
-        )
-        self.btn_run_measurement.grid(row=r, column=0, pady=2, padx=2, sticky="nesw")
-        tkt.TkToolTip(self.btn_run_measurement, "Runs SOFAST data capture. Mask then fringes are captured.")
-        r += 1
-
         # Perform projector-camera brightness calibration
         self.btn_gray_levels_cal = tkinter.Button(
             label_frame_run, text="Run Response Calibration", command=self.run_gray_levels_cal
@@ -306,6 +298,14 @@ def _create_layout(self) -> None:
         )
         r += 1
 
+        # Run sofast capture
+        self.btn_run_measurement = tkinter.Button(
+            label_frame_run, text="Run Data Capture", command=self.run_measurement
+        )
+        self.btn_run_measurement.grid(row=r, column=0, pady=2, padx=2, sticky="nesw")
+        tkt.TkToolTip(self.btn_run_measurement, "Runs SOFAST data capture. Mask then fringes are captured.")
+        r += 1
+
         # =============== First Column - Close button ===============
         # Close window button
         self.btn_close = tkinter.Button(self.root, text="Close All", command=self.close)
@@ -462,6 +462,7 @@ def _enable_btns(self) -> None:
         self.btn_view_gray_levels_cal.config(state=state_system)
 
         # Turn projector buttons on/off
+        self.btn_show_cal_image_fiducial.config(state=state_projection)
         self.btn_show_cal_image.config(state=state_projection)
         self.btn_show_axes.config(state=state_projection)
         self.btn_show_crosshairs.config(state=state_projection)