diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-04-19 20:50:25 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-04-19 20:50:25 (GMT) |
| commit | 382abeffcc61ef20a0288c52b09142db3cf3585e (patch) | |
| tree | fc95bb1fe410ab06e7b814ef5e12eb4940b4cb99 /ds9 | |
| parent | 0b68ff6e5ae4dccbd9e2141ae65984b8271a5940 (diff) | |
| download | blt-382abeffcc61ef20a0288c52b09142db3cf3585e.zip blt-382abeffcc61ef20a0288c52b09142db3cf3585e.tar.gz blt-382abeffcc61ef20a0288c52b09142db3cf3585e.tar.bz2 | |
enhance graphs
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/library/graph.tcl | 48 | ||||
| -rw-r--r-- | ds9/library/manalysis.tcl | 17 |
2 files changed, 16 insertions, 49 deletions
diff --git a/ds9/library/graph.tcl b/ds9/library/graph.tcl index 65067f7..ab6a987 100644 --- a/ds9/library/graph.tcl +++ b/ds9/library/graph.tcl @@ -233,8 +233,10 @@ proc UpdateGraphYAxisHV {which what vectorY log thick method} { average {} } - $what yaxis configure -min $yMin -max $yMax -logscale $log -tickdefault 4 - $what y2axis configure -min $yMin -max $yMax -logscale $log -tickdefault 4 + $what yaxis configure -min $yMin -max $yMax \ + -logscale $log -tickdefault 4 + $what y2axis configure -min $yMin -max $yMax \ + -logscale $log -tickdefault 4 } else { $what yaxis configure -min $igraph(y,min) -max $igraph(y,max) \ -logscale $log -tickdefault 4 @@ -243,30 +245,6 @@ proc UpdateGraphYAxisHV {which what vectorY log thick method} { } } -proc ShowGraphData {which} { - global ds9 - global view - - if {$view(graph,horz)} { - ShowGraphDataHV $which $ds9(graph,horz) - } - if {$view(graph,vert)} { - ShowGraphDataHV $which $ds9(graph,vert) - } -} - -proc ShowGraphDataHV {which what} { - if {$which != {}} { - if {[$which has fits]} { - $what element configure line1 -hide no - } else { - $what element configure line1 -hide yes - } - } else { - $what element configure line1 -hide yes - } -} - proc ClearGraphData {} { global ds9 global view @@ -296,19 +274,15 @@ proc UpdateGraph {which x y sys} { } if {$view(graph,horz)} { - if {![catch {$which get horizontal cut graphHorzX graphHorzY $x $y $sys $graph(horz,thick) $graph(horz,method)}]} { - $ds9(graph,horz) element configure line1 -hide no - } else { - $ds9(graph,horz) element configure line1 -hide yes - } + $which get horizontal cut graphHorzX graphHorzY $x $y $sys \ + $graph(horz,thick) $graph(horz,method) + $ds9(graph,horz) element configure line1 -hide no } if {$view(graph,vert)} { - if {![catch {$which get vertical cut graphVertX graphVertY $x $y $sys $graph(vert,thick) $graph(vert,method)}]} { - $ds9(graph,vert) element configure line1 -hide no - } else { - $ds9(graph,vert) element configure line1 -hide yes - } + $which get vertical cut graphVertX graphVertY $x $y $sys \ + $graph(vert,thick) $graph(vert,method) + $ds9(graph,vert) element configure line1 -hide no } } @@ -365,11 +339,9 @@ proc MotionGraph {which x y horz} { set X [lindex $coord 0] set Y [lindex $coord 1] if {$horz} { - puts stderr "$x $X" UpdateInfoBox $current(frame) $x $Y canvas UpdatePixelTableDialog $current(frame) $x $Y canvas } else { - puts stderr "$y $Y" UpdateInfoBox $current(frame) $X $y canvas UpdatePixelTableDialog $current(frame) $X $y canvas } diff --git a/ds9/library/manalysis.tcl b/ds9/library/manalysis.tcl index d634b4a..94a8c9c 100644 --- a/ds9/library/manalysis.tcl +++ b/ds9/library/manalysis.tcl @@ -16,8 +16,14 @@ proc AnalysisMainMenu {} { # $ds9(mb).analysis add separator $ds9(mb).analysis add command -label "[msgcat::mc {Pixel Table}]..." \ -command PixelTableDialog + $ds9(mb).analysis add command -label "[msgcat::mc {Name Resolution}]..." \ + -command NRESDialog + $ds9(mb).analysis add separator $ds9(mb).analysis add command -label "[msgcat::mc {Mask Parameters}]..." \ -command MaskDialog + $ds9(mb).analysis add command -label "[msgcat::mc {Graph Parameters}]..." \ + -command GraphDialog + $ds9(mb).analysis add command -label "[msgcat::mc {Crosshair Parameters}]..." -command CrosshairDialog $ds9(mb).analysis add separator $ds9(mb).analysis add checkbutton -label [msgcat::mc {Contours}] \ -variable contour(view) -command UpdateContour @@ -40,17 +46,6 @@ proc AnalysisMainMenu {} { $ds9(mb).analysis add command -label "[msgcat::mc {Smooth Parameters}]..." \ -command SmoothDialog $ds9(mb).analysis add separator - $ds9(mb).analysis add command \ - -label "[msgcat::mc {Crosshair Parameters}]..." \ - -command CrosshairDialog - $ds9(mb).analysis add separator - $ds9(mb).analysis add command \ - -label "[msgcat::mc {Graph Parameters}]..." \ - -command GraphDialog - $ds9(mb).analysis add separator - $ds9(mb).analysis add command -label "[msgcat::mc {Name Resolution}]..." \ - -command NRESDialog - $ds9(mb).analysis add separator $ds9(mb).analysis add cascade -label [msgcat::mc {Image Servers}] \ -menu $ds9(mb).analysis.image $ds9(mb).analysis add cascade -label [msgcat::mc {Archives}] \ |