Skip to content

Change label X(Y)RMS to FWHM_X(Y) for 1D,2D,ROI display. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhangt58 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Change label X(Y)RMS to FWHM_X(Y) for 1D,2D,ROI display. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5107563
Change label X(Y)RMS to FWHM_X(Y) for 2D display.
zhangt58 Aug 22, 2022
517824c
Rename label RMS to FWHM
zhangt58 Aug 24, 2022
c47d32f
Rename RMS to FWHM, align ROI results
zhangt58 Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions SpecTk/Display1D.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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 <X> RMS]
append str [format "\n%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio <X> 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]]
Expand Down
10 changes: 5 additions & 5 deletions SpecTk/Display2D.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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Õs action
if {$x < $xmin || $x > $xmax || $y < $ymin || $y > $ymax} {
$page SelectDisplay $id $mode
return
Expand Down Expand Up @@ -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 <X> <Y> XRMS YRMS]
append str [format "\n%-8s%-8s%-8s%-8s%-8s%-8s%-8s" ROI Sum Ratio <X> <Y> 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]]
Expand Down
8 changes: 4 additions & 4 deletions SpecTk/ROIDialog.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <X> RMS\n" "blue"
$w.text insert end "ROI Sum Ratio <X> 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 <X/Y> RMS\n" "blue"
$w.text insert end "ROI Sum Ratio <X/Y> 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
Expand All @@ -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"
Expand Down