From 5107563981652fa2ecc858640c579e41b8429163 Mon Sep 17 00:00:00 2001 From: Tong Zhang Date: Mon, 22 Aug 2022 09:05:06 -0400 Subject: [PATCH 1/3] Change label X(Y)RMS to FWHM_X(Y) for 2D display. --- SpecTk/Display2D.tcl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SpecTk/Display2D.tcl b/SpecTk/Display2D.tcl index 2419378..4dea1a3 100644 --- a/SpecTk/Display2D.tcl +++ b/SpecTk/Display2D.tcl @@ -380,7 +380,7 @@ itcl::body Display2D::ZoomLeftClick {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -518,7 +518,7 @@ itcl::body Display2D::ExpandMinus {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -729,7 +729,7 @@ itcl::body Display2D::ButtonPress {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -786,7 +786,7 @@ itcl::body Display2D::Click {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -926,7 +926,7 @@ itcl::body Display2D::UpdateROIResults {wave} { global spectk if {[$graph marker exist roidisplay]} {$graph marker delete roidisplay} set str [$wave GetMember name] - append str [format "\n%-8s%-8s%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio XRMS YRMS] + append str [format "\n%-8s%-8s%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio FWHM_X FWHM_Y] set r [$wave GetMember calc(All)] append str [format "\n%-8s%- 8.7g%- 8.5g%- 8.5g%- 8.5g%- 8.5g%- 8.5g" \ All [lindex $r 0] [lindex $r 1] [lindex $r 2] [lindex $r 3] [lindex $r 4] [lindex $r 5]] From 517824c9233adbdd057e8426759495831a94b432 Mon Sep 17 00:00:00 2001 From: Tong Zhang Date: Wed, 24 Aug 2022 09:26:45 -0400 Subject: [PATCH 2/3] Rename label RMS to FWHM --- SpecTk/Display1D.tcl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SpecTk/Display1D.tcl b/SpecTk/Display1D.tcl index c8c04eb..ca410df 100644 --- a/SpecTk/Display1D.tcl +++ b/SpecTk/Display1D.tcl @@ -369,7 +369,7 @@ itcl::body Display1D::ZoomLeftClick {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -502,7 +502,7 @@ itcl::body Display1D::ExpandLeftClick {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -689,7 +689,7 @@ itcl::body Display1D::ButtonPress {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -723,7 +723,7 @@ itcl::body Display1D::InspectLeftClick {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -777,7 +777,7 @@ itcl::body Display1D::EditClick {xscreen yscreen mode} { set xmax [lindex [$graph axis limits x] 1] set ymin [lindex [$graph axis limits y] 0] set ymax [lindex [$graph axis limits y] 1] -# this selects the display instead of performing the bindingﾕs action +# this selects the display instead of performing the bindingﾃ不 action if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} { $page SelectDisplay $id $mode return @@ -944,7 +944,7 @@ itcl::body Display1D::UpdateROIResults {wave} { global spectk if {[$graph marker exist roidisplay]} {$graph marker delete roidisplay} set str [format " %s" [$wave GetMember name]] - append str [format "\n%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio RMS] + append str [format "\n%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio FWHM] set r [$wave GetMember calc(All)] append str [format "\n%-8s%- 8.7g%- 8.5g%- 8.5g%- 8.5g" \ All [lindex $r 0] [lindex $r 1] [lindex $r 2] [lindex $r 3]] From c47d32f01f2c24be61e394bb6f97a09239e6ef4a Mon Sep 17 00:00:00 2001 From: Tong Zhang Date: Wed, 24 Aug 2022 09:37:09 -0400 Subject: [PATCH 3/3] Rename RMS to FWHM, align ROI results --- SpecTk/ROIDialog.tcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SpecTk/ROIDialog.tcl b/SpecTk/ROIDialog.tcl index 2d7d27f..34cd151 100644 --- a/SpecTk/ROIDialog.tcl +++ b/SpecTk/ROIDialog.tcl @@ -197,13 +197,13 @@ proc ROIDialogCalculateDisplay {display} { $wave CalculateAll set r [$wave GetMember calc(All)] if {[$display isa Display1D]} { - $w.text insert end "ROI Sum Ratio RMS\n" "blue" + $w.text insert end "ROI Sum Ratio FWHM\n" "blue" $w.text insert end "All" "red" " [lindex $r 0] [lindex $r 1] [lindex $r 2] [lindex $r 3]\n" "black" } if {[$display isa Display2D]} { - $w.text insert end "ROI Sum Ratio RMS\n" "blue" + $w.text insert end "ROI Sum Ratio FWHM\n" "blue" $w.text insert end "All" "red" " [lindex $r 0] [lindex $r 1] [lindex $r 2] [lindex $r 4]\n" "black" - $w.text insert end " [lindex $r 3] [lindex $r 5]\n" "black" + $w.text insert end " [lindex $r 3] [lindex $r 5]\n" "black" } foreach roi [$wave FindROIs] { $wave CalculateROI $roi @@ -213,7 +213,7 @@ proc ROIDialogCalculateDisplay {display} { } if {[$display isa Display2D]} { $w.text insert end "[$roi GetMember name]" "red" " [lindex $r 0] [lindex $r 1] [lindex $r 2] [lindex $r 4]\n" "black" - $w.text insert end " [lindex $r 3] [lindex $r 5]\n" "black" + $w.text insert end " [lindex $r 3] [lindex $r 5]\n" "black" } } $w.text insert end "\n"