From 22d45f4535231e882a9de5b5c7183340c230ab6f Mon Sep 17 00:00:00 2001 From: Braden Date: Wed, 19 Feb 2025 10:08:42 -0700 Subject: [PATCH 1/3] Enabled button gray out --- opencsp/app/sofast/SofastGUI.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/opencsp/app/sofast/SofastGUI.py b/opencsp/app/sofast/SofastGUI.py index 696cd841..0418a669 100644 --- 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( @@ -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) From 6647cfefcb999b051030c3f57c0457af7f83f688 Mon Sep 17 00:00:00 2001 From: Braden Date: Wed, 19 Feb 2025 10:38:55 -0700 Subject: [PATCH 2/3] Renamed to Close Image Projection --- opencsp/app/sofast/SofastGUI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencsp/app/sofast/SofastGUI.py b/opencsp/app/sofast/SofastGUI.py index 0418a669..24511812 100644 --- a/opencsp/app/sofast/SofastGUI.py +++ b/opencsp/app/sofast/SofastGUI.py @@ -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.") From 312c370fcb3c00278900eecd7d2dcec87944408f Mon Sep 17 00:00:00 2001 From: Smith Date: Wed, 19 Feb 2025 11:24:42 -0700 Subject: [PATCH 3/3] Fixed small bugs in SOFAST GUI. --- opencsp/app/sofast/SofastGUI.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opencsp/app/sofast/SofastGUI.py b/opencsp/app/sofast/SofastGUI.py index 24511812..2f0dfea4 100644 --- a/opencsp/app/sofast/SofastGUI.py +++ b/opencsp/app/sofast/SofastGUI.py @@ -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)