From e762abb602e3b3e6a2c8b72346b20b98f44569b4 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 11 Jul 2018 14:25:36 -0400 Subject: fix plot pointer/zoom mode --- ds9/library/backup.tcl | 7 -- ds9/library/debug.tcl | 5 -- ds9/library/ds9.tcl | 1 - ds9/library/frame.tcl | 63 ++------------- ds9/library/info.tcl | 3 +- ds9/library/manalysis.tcl | 185 -------------------------------------------- ds9/library/medit.tcl | 18 ----- ds9/library/plotbar.tcl | 8 +- ds9/library/plotdialog.tcl | 12 +-- ds9/library/plotline.tcl | 8 +- ds9/library/plotscatter.tcl | 8 +- ds9/library/prefs.tcl | 6 -- ds9/library/util.tcl | 14 +--- 13 files changed, 33 insertions(+), 305 deletions(-) diff --git a/ds9/library/backup.tcl b/ds9/library/backup.tcl index 8390834..51bf479 100644 --- a/ds9/library/backup.tcl +++ b/ds9/library/backup.tcl @@ -658,13 +658,6 @@ proc BackupGUI {ch} { # Analysis - global ime - puts $ch "global ime" - puts $ch "array set ime \{ [array get ime] \}" - global pime - puts $ch "global pime" - puts $ch "array set pime \{ [array get pime] \}" - global graph puts $ch "global graph" puts $ch "array set graph \{ [array get graph] \}" diff --git a/ds9/library/debug.tcl b/ds9/library/debug.tcl index 4ee3892..a432045 100644 --- a/ds9/library/debug.tcl +++ b/ds9/library/debug.tcl @@ -16,7 +16,6 @@ proc DebugDef {} { set debug(tcl,hv) 0 set debug(tcl,cat) 0 set debug(tcl,sia) 0 - set debug(tcl,ime) 0 set debug(tcl,samp) 0 set debug(tcl,grid) 0 set debug(tcl,restore) 0 @@ -83,8 +82,6 @@ proc DebugMenu {} { -variable debug(tcl,cat) $ds9(mb).debug.tcl add checkbutton -label {SIA} \ -variable debug(tcl,sia) - $ds9(mb).debug.tcl add checkbutton -label {IME} \ - -variable debug(tcl,ime) $ds9(mb).debug.tcl add checkbutton -label {SAMP} \ -variable debug(tcl,samp) $ds9(mb).debug.tcl add checkbutton -label {Grid} \ @@ -186,7 +183,6 @@ proc ProcessDebugTclCmd {varname iname} { hv {set debug(tcl,hv) 1} cat {set debug(tcl,cat) 1} sia {set debug(tcl,sia) 1} - ime {set debug(tcl,ime) 1} samp {set debug(tcl,samp) 1} grid {set debug(tcl,grid) 1} restore {set debug(tcl,restore) 1} @@ -269,7 +265,6 @@ proc ProcessDebugCmd {varname iname} { hv - cat - sia - - ime - samp - grid - restore - diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 9b3a755..4b13abb 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -361,7 +361,6 @@ HTTPDef HVDef IExamDef IISDef -IMEDef MagnifierDef MarkerDef MaskDef diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl index 9b2d5a5..d4d004f 100644 --- a/ds9/library/frame.tcl +++ b/ds9/library/frame.tcl @@ -238,8 +238,7 @@ proc CreateNameNumberFrame {which type} { } switch $current(mode) { - crosshair - - analysis { + crosshair { $ds9(next) crosshair on } } @@ -565,8 +564,7 @@ proc EnterFrame {which x y} { $ds9(canvas) focus $which switch -- $current(mode) { - crosshair - - analysis { + crosshair { set coord [$which get crosshair canvas] set x [lindex $coord 0] set y [lindex $coord 1] @@ -621,8 +619,7 @@ proc LeaveFrame {which} { $ds9(canvas) focus {} switch -- $current(mode) { - crosshair - - analysis {} + crosshair {} none - pointer - @@ -685,8 +682,7 @@ proc DoMotion {which x y cursor1 cursor2} { switch -- $current(mode) { pointer - region - - catalog - - analysis { + catalog { if {$which == $current(frame)} { MarkerCursor $which $x $y $cursor1 $cursor2 } @@ -797,17 +793,6 @@ proc Button1Frame {which x y} { } UpdateMagnifier $which $x $y } - analysis { - IMEButton $which $x $y - - UpdateColormapLevelMosaic $which $x $y canvas - UpdateInfoBox $which $x $y canvas - UpdatePixelTableDialog $which $x $y canvas - UpdateGraphLayout $which - UpdateGraphAxis $which - UpdateGraphData $which $x $y canvas - UpdateMagnifier $which $x $y - } examine {ExamineButton $which $x $y} iexam {IExamButton $which $x $y} } @@ -849,10 +834,6 @@ proc ShiftButton1Frame {which x y} { } UpdateMagnifier $which $x $y } - analysis { - IMEShift $which $x $y - UpdateMagnifier $which $x $y - } examine - iexam {} } @@ -896,7 +877,6 @@ proc ControlButton1Frame {which x y} { Crop3dButton $which $x $y 1 UpdateMagnifier $which $x $y } - analysis {} examine - iexam {} } @@ -937,7 +917,6 @@ proc ControlShiftButton1Frame {which x y} { zoom - rotate - crop - - analysis {} examine - iexam {} } @@ -1022,15 +1001,6 @@ proc Motion1Frame {which x y} { UpdateGraphData $which $x $y canvas UpdateMagnifier $which $x $y } - analysis { - IMEMotion $which $x $y - - UpdateColormapLevelMosaic $which $x $y canvas - UpdateInfoBox $which $x $y canvas - UpdatePixelTableDialog $which $x $y canvas - UpdateGraphData $which $x $y canvas - UpdateMagnifier $which $x $y - } examine - iexam {} } @@ -1100,10 +1070,7 @@ proc Release1Frame {which x y} { CATRelease $which $x $y } } - none {} - analysis { - IMERelease $which $x $y - } + none - examine - iexam {} } @@ -1141,11 +1108,7 @@ proc Double1Frame {which x y} { zoom - rotate - crop - - catalog {} - analysis { - IMEDouble $which $x $y - UpdateMagnifier $which $x $y - } + catalog - examine - iexam {} } @@ -1170,7 +1133,6 @@ proc DoubleRelease1Frame {which x y} { rotate - crop - catalog - - analysis - examine - iexam {} } @@ -1448,19 +1410,6 @@ proc KeyFrame {which K A xx yy} { } CATKey $which $K } - analysis { - switch -- $K { - plus {CubeNext} - minus {CubePrev} - - Up {IMEArrowKey $which 0 -1} - Down {IMEArrowKey $which 0 1} - Left {IMEArrowKey $which -1 0} - Right {IMEArrowKey $which 1 0} - - default {IMEKey $which $K $xx $yy} - } - } iexam {IExamKey $which $K $xx $yy} colorbar - zoom - diff --git a/ds9/library/info.tcl b/ds9/library/info.tcl index 0457c9d..7fc1125 100644 --- a/ds9/library/info.tcl +++ b/ds9/library/info.tcl @@ -488,8 +488,7 @@ proc RefreshInfoBox {which} { if {$which != {}} { switch -- $current(mode) { - crosshair - - analysis { + crosshair { set coord [$which get crosshair canvas] set x [lindex $coord 0] set y [lindex $coord 1] diff --git a/ds9/library/manalysis.tcl b/ds9/library/manalysis.tcl index c227862..df282c0 100644 --- a/ds9/library/manalysis.tcl +++ b/ds9/library/manalysis.tcl @@ -10,10 +10,6 @@ proc AnalysisMainMenu {} { # WARNING: this is a variable length menu. # Be sure to update ds9(menu,size,analysis) menu $ds9(mb).analysis -# IME -# $ds9(mb).analysis add cascade -label [msgcat::mc {Task}] -# -menu $ds9(mb).analysis.task -# $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}]..." \ @@ -79,39 +75,6 @@ proc AnalysisMainMenu {} { -label [msgcat::mc {Clear Analysis Commands}] \ -command ClearAnalysisMenu - menu $ds9(mb).analysis.task - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Statistics}] \ - -variable ime(task) -value stats -command IMEChangeTask - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Histogram}] \ - -variable ime(task) -value hist -command IMEChangeTask - $ds9(mb).analysis.task add radiobutton \ - -label [msgcat::mc {Radial Profile}] \ - -variable ime(task) -value radial -command IMEChangeTask - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Plot 2D}] \ - -variable ime(task) -value plot2d -command IMEChangeTask - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Plot 3D}] \ - -variable ime(task) -value plot3d -command IMEChangeTask - $ds9(mb).analysis.task add separator - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Circle}] \ - -variable ime(shape) -value circle -command IMEChangeShape - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Ellipse}] \ - -variable ime(shape) -value ellipse -command IMEChangeShape - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Box}] \ - -variable ime(shape) -value box -command IMEChangeShape - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Polygon}] \ - -variable ime(shape) -value polygon -command IMEChangeShape - $ds9(mb).analysis.task add separator - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Point}] \ - -variable ime(shape) -value point -command IMEChangeShape - $ds9(mb).analysis.task add separator - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Annulus}] \ - -variable ime(shape) -value annulus -command IMEChangeShape - $ds9(mb).analysis.task add radiobutton \ - -label [msgcat::mc {Ellipse Annulus}] \ - -variable ime(shape) -value ellipseannulus -command IMEChangeShape - $ds9(mb).analysis.task add radiobutton -label [msgcat::mc {Box Annulus}] \ - -variable ime(shape) -value boxannulus -command IMEChangeShape - menu $ds9(mb).analysis.block $ds9(mb).analysis.block add command -label [msgcat::mc {Block In}] \ -command {Block .5 .5} @@ -203,10 +166,6 @@ proc PrefsDialogAnalysisMenu {w} { set m $f.menu.menu menu $m -# IME -# $m add cascade -label [msgcat::mc {Task}] -# -menu $m.task -# $m add separator $m add checkbutton -label [msgcat::mc {Contours}] \ -variable pcontour(view) $m add checkbutton -label [msgcat::mc {Coordinate Grid}] \ @@ -217,18 +176,6 @@ proc PrefsDialogAnalysisMenu {w} { $m add checkbutton -label [msgcat::mc {Smooth}] \ -variable psmooth(view) - menu $m.task - $m.task add radiobutton -label [msgcat::mc {Statistics}] \ - -variable pime(task) -value stats - $m.task add radiobutton -label [msgcat::mc {Histogram}] \ - -variable pime(task) -value hist - $m.task add radiobutton -label [msgcat::mc {Radial Profile}] \ - -variable pime(task) -value radial - $m.task add radiobutton -label [msgcat::mc {Plot 2D}] \ - -variable pime(task) -value plot2d - $m.task add radiobutton -label [msgcat::mc {Plot 3D}] \ - -variable pime(task) -value plot3d - menu $m.block $m.block add radiobutton -label "[msgcat::mc {Block}] 1" \ -variable pblock(factor) -value {1 1} @@ -265,14 +212,6 @@ proc ButtonsAnalysisDef {} { analysis,b16 0 analysis,b32 0 } - -# IME -# analysis,none 1 -# analysis,stats 1 -# analysis,hist 1 -# analysis,radial 1 -# analysis,plot2d 1 -# analysis,plot3d 1 } proc CreateButtonsAnalysis {} { @@ -281,23 +220,6 @@ proc CreateButtonsAnalysis {} { ttk::frame $ds9(buttons).analysis -# IME -# RadioButton $ds9(buttons).analysis.stats -# [string tolower [msgcat::mc {Stats}]] -# ime(task) stats IMEChangeTask -# RadioButton $ds9(buttons).analysis.hist -# [string tolower [msgcat::mc {Histogram}]] -# ime(task) hist IMEChangeTask -# RadioButton $ds9(buttons).analysis.radial -# [string tolower [msgcat::mc {Radial}]] -# ime(task) radial IMEChangeTask -# RadioButton $ds9(buttons).analysis.plot2d -# [string tolower [msgcat::mc {Plot 2D}]] -# ime(task) plot2d IMEChangeTask -# RadioButton $ds9(buttons).analysis.plot3d -# [string tolower [msgcat::mc {Plot 3D}]] -# ime(task) plot3d IMEChangeTask - CheckButton $ds9(buttons).analysis.contours \ [string tolower [msgcat::mc {Contours}]] \ contour(view) UpdateContour @@ -350,13 +272,6 @@ proc CreateButtonsAnalysis {} { $ds9(buttons).analysis.smooth pbuttons(analysis,smooth) " - -# IME -# $ds9(buttons).analysis.stats pbuttons(analysis,stats) -# $ds9(buttons).analysis.hist pbuttons(analysis,hist) -# $ds9(buttons).analysis.radial pbuttons(analysis,radial) -# $ds9(buttons).analysis.plot2d pbuttons(analysis,plot2d) -# $ds9(buttons).analysis.plot3d pbuttons(analysis,plot3d) } proc PrefsDialogButtonbarAnalysis {f} { @@ -368,23 +283,6 @@ proc PrefsDialogButtonbarAnalysis {f} { set m $f.menu menu $m -# IME -# $m add checkbutton -label [msgcat::mc {Statistics}] -# -variable pbuttons(analysis,stats) -# -command {UpdateButtons buttons(analysis)} -# $m add checkbutton -label [msgcat::mc {Histogram}] -# -variable pbuttons(analysis,hist) -# -command {UpdateButtons buttons(analysis)} -# $m add checkbutton -label [msgcat::mc {Radial Profile}] -# -variable pbuttons(analysis,radial) -# -command {UpdateButtons buttons(analysis)} -# $m add checkbutton -label [msgcat::mc {Plot 2D}] -# -variable pbuttons(analysis,plot2d) -# -command {UpdateButtons buttons(analysis)} -# $m add checkbutton -label [msgcat::mc {Plot 3D}] -# -variable pbuttons(analysis,plot3d) -# -command {UpdateButtons buttons(analysis)} -# $m add separator $m add checkbutton -label [msgcat::mc {Contours}] \ -variable pbuttons(analysis,contours) \ -command {UpdateButtons buttons(analysis)} @@ -507,86 +405,3 @@ proc PrefsDialogAnalysis {} { pack $w.analysis.file $w.analysis.log -side top -fill both -expand true } - -# Support - -proc UpdateTaskMenu {} { - global ds9 - global ime - - switch $ime(task) { - stats - - hist { - $ds9(mb).analysis.task entryconfig [msgcat::mc {Circle}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Polygon}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Point}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box Annulus}] \ - -state disabled - } - radial { - $ds9(mb).analysis.task entryconfig [msgcat::mc {Circle}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Polygon}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Point}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Annulus}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse Annulus}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box Annulus}] \ - -state normal - } - plot2d { - $ds9(mb).analysis.task entryconfig [msgcat::mc {Circle}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Polygon}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Point}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box Annulus}] \ - -state disabled - } - plot3d { - $ds9(mb).analysis.task entryconfig [msgcat::mc {Circle}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Polygon}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Point}] \ - -state normal - $ds9(mb).analysis.task entryconfig [msgcat::mc {Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Ellipse Annulus}] \ - -state disabled - $ds9(mb).analysis.task entryconfig [msgcat::mc {Box Annulus}] \ - -state disabled - } - } -} diff --git a/ds9/library/medit.tcl b/ds9/library/medit.tcl index e569ff0..04bff4f 100644 --- a/ds9/library/medit.tcl +++ b/ds9/library/medit.tcl @@ -39,9 +39,6 @@ proc EditMainMenu {} { -variable current(mode) -value crop -command ChangeMode $ds9(mb).edit add radiobutton -label [msgcat::mc {Catalog}] \ -variable current(mode) -value catalog -command ChangeMode -# IME -# $ds9(mb).edit add radiobutton -label [msgcat::mc {Analysis}] -# -variable current(mode) -value analysis -command ChangeMode $ds9(mb).edit add radiobutton -label [msgcat::mc {Examine}] \ -variable current(mode) -value examine -command ChangeMode @@ -92,9 +89,6 @@ proc PrefsDialogEditMenu {w} { -variable pcurrent(mode) -value crop $m add radiobutton -label [msgcat::mc {Catalog}] \ -variable pcurrent(mode) -value catalog -# IME -# $m add radiobutton -label [msgcat::mc {Analysis}] -# -variable pcurrent(mode) -value analysis $m add radiobutton -label [msgcat::mc {Examine}] \ -variable pcurrent(mode) -value examine @@ -123,8 +117,6 @@ proc ButtonsEditDef {} { edit,examine 1 edit,prefs 0 } -# IME -# edit,analysis 1 } proc CreateButtonsEdit {} { @@ -170,10 +162,6 @@ proc CreateButtonsEdit {} { RadioButton $ds9(buttons).edit.catalog \ [string tolower [msgcat::mc {Cat}]] \ current(mode) catalog ChangeMode -# IME -# RadioButton $ds9(buttons).edit.analysis -# [string tolower [msgcat::mc {Analysis}]] -# current(mode) analysis ChangeMode RadioButton $ds9(buttons).edit.examine \ [string tolower [msgcat::mc {Exam}]] \ current(mode) examine ChangeMode @@ -198,8 +186,6 @@ proc CreateButtonsEdit {} { $ds9(buttons).edit.examine pbuttons(edit,examine) $ds9(buttons).edit.prefs pbuttons(edit,prefs) " -# IME -# $ds9(buttons).edit.analysis pbuttons(edit,analysis) } proc PrefsDialogButtonbarEdit {f} { @@ -239,9 +225,6 @@ proc PrefsDialogButtonbarEdit {f} { -variable pbuttons(edit,crop) -command {UpdateButtons buttons(edit)} $m add checkbutton -label [msgcat::mc {Catalog}] \ -variable pbuttons(edit,catalog) -command {UpdateButtons buttons(edit)} -# IME -# $m add checkbutton -label [msgcat::mc {Analysis}] -# -variable pbuttons(edit,analysis) -command {UpdateButtons buttons(edit)} $m add checkbutton -label [msgcat::mc {Examine}] \ -variable pbuttons(edit,examine) -command {UpdateButtons buttons(edit)} $m add separator @@ -313,7 +296,6 @@ proc UpdateEditMenu {} { rotate - crop - catalog - - analysis - examine - iexam {$ds9(mb).edit entryconfig [msgcat::mc {Undo}] -state disabled} } diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl index 9dd265a..0c9619a 100644 --- a/ds9/library/plotbar.tcl +++ b/ds9/library/plotbar.tcl @@ -153,7 +153,13 @@ proc PlotDialogBar {varname} { $var(graph) yaxis configure -grid yes pack $var(graph) -expand yes -fill both - PlotChangeMode $varname + + # set up zoom stack, assuming mode is zoom + switch $ds9(wm) { + x11 - + win32 {Blt_ZoomStack $var(graph) -mode release} + aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"} + } } proc PlotBarUpdateGraph {varname} { diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl index a1e7237..730889d 100644 --- a/ds9/library/plotdialog.tcl +++ b/ds9/library/plotdialog.tcl @@ -199,20 +199,14 @@ proc PlotChangeMode {varname} { global ds9 - blt::RemoveBindTag $var(graph) zoom-$var(graph) - bind $var(graph) <1> {} - switch $var(mode) { pointer { + blt::RemoveBindTag $var(graph) zoom-$var(graph) bind $var(graph) <1> [list PlotButton $varname %x %y] } zoom { - blt::ZoomStack::Reset $var(graph) - switch $ds9(wm) { - x11 - - win32 {Blt_ZoomStack $var(graph) -mode release} - aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"} - } + bind $var(graph) <1> {} + blt::AddBindTag $var(graph) zoom-$var(graph) } } } diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl index c8104ee..773ea6a 100644 --- a/ds9/library/plotline.tcl +++ b/ds9/library/plotline.tcl @@ -213,7 +213,13 @@ proc PlotDialogLine {varname} { ] pack $var(graph) -expand yes -fill both - PlotChangeMode $varname + + # set up zoom stack, assuming mode is zoom + switch $ds9(wm) { + x11 - + win32 {Blt_ZoomStack $var(graph) -mode release} + aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"} + } } proc PlotLineUpdateElement {varname} { diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl index a8410d0..d634060 100644 --- a/ds9/library/plotscatter.tcl +++ b/ds9/library/plotscatter.tcl @@ -157,7 +157,13 @@ proc PlotDialogScatter {varname} { ] pack $var(graph) -expand yes -fill both - PlotChangeMode $varname + + # set up zoom stack, assuming mode is zoom + switch $ds9(wm) { + x11 - + win32 {Blt_ZoomStack $var(graph) -mode release} + aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"} + } } proc PlotScatterUpdateElement {varname} { diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl index 9d44f3f..d9a95e3 100644 --- a/ds9/library/prefs.tcl +++ b/ds9/library/prefs.tcl @@ -282,12 +282,6 @@ proc SavePrefs {} { # Analysis - global ime - global pime - puts $ch "global pime" - puts $ch "array set pime \{ [array get pime] \}" - puts $ch {array set ime [array get pime]} - global graph global pgraph puts $ch "global graph" diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index b6420d5..acdd5fc 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -90,7 +90,6 @@ proc UpdateDS9 {} { UpdateWCSMenu UpdateAnalysisMenu - UpdateTaskMenu UpdateMaskMenu UpdateContourMenu UpdateGridMenu @@ -139,8 +138,7 @@ proc UpdateMain {} { RefreshInfoBox $current(frame) UpdateColormapLevel switch -- $current(mode) { - crosshair - - analysis { + crosshair { if {$current(frame) != {}} { set coord [$current(frame) get crosshair canvas] set x [lindex $coord 0] @@ -977,13 +975,6 @@ proc ChangeMode {} { pan {SetCursor fleur} rotate {SetCursor exchange} crop {SetCursor {}} - analysis { - foreach ff $ds9(frames) { - $ff crosshair on - } - SetCursor crosshair - IMEChangeShape - } examine {SetCursor target} iexam {} } @@ -1497,8 +1488,7 @@ proc CursorCmd {x y} { pan {PanCanvas $x $y} zoom - rotate - - crop {} - analysis {IMEArrowKey $current(frame) $x $y} + crop - examine - iexam {} } -- cgit v0.12