enhance graphs

6 files changed, 26 insertions, 21 deletions

diff --git a/ds9/library/crosshair.tcl b/ds9/library/crosshair.tcl
index 512e461..a63b751 100644
--- a/ds9/library/crosshair.tcl
+++ b/ds9/library/crosshair.tcl
@@ -43,7 +43,7 @@ proc CrosshairArrowKey {which x y} {
     UpdateColormapLevelMosaic $which $X $Y canvas
     UpdateInfoBox $which $X $Y canvas
     UpdatePixelTableDialog $which $X $Y canvas
-    UpdateGraph $which $X $Y canvas
+    UpdateGraphData $which $X $Y canvas
 }
 
 proc CrosshairTo {x y sys sky} {
diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl
index f88a3ff..8cc24b9 100644
--- a/ds9/library/frame.tcl
+++ b/ds9/library/frame.tcl
@@ -578,7 +578,7 @@ proc EnterFrame {which x y} {
     EnterInfoBox $which
     UpdateInfoBox $which $x $y canvas
     UpdatePixelTableDialog $which $x $y canvas
-    UpdateGraph $which $x $y canvas
+    UpdateGraphData $which $x $y canvas
     UpdateGraphAxis $which
     UpdateMagnifier $which $x $y
 
@@ -683,7 +683,7 @@ proc DoMotion {which x y cursor1 cursor2} {
 	    UpdateColormapLevelMosaic $which $x $y canvas
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	}
 	none -
 	colorbar -
@@ -696,7 +696,7 @@ proc DoMotion {which x y cursor1 cursor2} {
 	    UpdateColormapLevelMosaic $which $x $y canvas
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	}
 	crosshair {}
     }
@@ -752,7 +752,7 @@ proc Button1Frame {which x y} {
 	    UpdateColormapLevelMosaic $which $x $y canvas
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	    UpdateMagnifier $which $x $y
 	}
 	colorbar {
@@ -791,7 +791,7 @@ proc Button1Frame {which x y} {
 	    UpdateColormapLevelMosaic $which $x $y canvas
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	    UpdateMagnifier $which $x $y
 	}
 	examine {ExamineButton $which $x $y}
@@ -954,7 +954,7 @@ proc Motion1Frame {which x y} {
 
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	    UpdateMagnifier $which $x $y
 	}
 	crosshair {
@@ -964,7 +964,7 @@ proc Motion1Frame {which x y} {
 		UpdateColormapLevelMosaic $which $x $y canvas
 		UpdateInfoBox $which $x $y canvas
 		UpdatePixelTableDialog $which $x $y canvas
-		UpdateGraph $which $x $y canvas
+		UpdateGraphData $which $x $y canvas
 		UpdateMagnifier $which $x $y
 	    }
 	}
@@ -1005,7 +1005,7 @@ proc Motion1Frame {which x y} {
 
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	    UpdateMagnifier $which $x $y
 	}
 	analysis {
@@ -1014,7 +1014,7 @@ proc Motion1Frame {which x y} {
 	    UpdateColormapLevelMosaic $which $x $y canvas
 	    UpdateInfoBox $which $x $y canvas
 	    UpdatePixelTableDialog $which $x $y canvas
-	    UpdateGraph $which $x $y canvas
+	    UpdateGraphData $which $x $y canvas
 	    UpdateMagnifier $which $x $y
 	}
 	examine -
@@ -1051,7 +1051,7 @@ proc Release1Frame {which x y} {
 		UpdateColormapLevelMosaic $which $x $y canvas
 		UpdateInfoBox $which $x $y canvas
 		UpdatePixelTableDialog $which $x $y canvas
-		UpdateGraph $which $x $y canvas
+		UpdateGraphData $which $x $y canvas
 	    }
 	}
 	colorbar {
diff --git a/ds9/library/graph.tcl b/ds9/library/graph.tcl
index 9b37697..11e1fa1 100644
--- a/ds9/library/graph.tcl
+++ b/ds9/library/graph.tcl
@@ -241,12 +241,17 @@ proc ClearGraphData {} {
     }
 }
 
-proc UpdateGraph {which x y sys} {
+proc UpdateGraphData {which x y sys} {
     global ds9
     global view
     global graph
     global dgraph
 
+    global debug
+    if {$debug(tcl,update)} {
+	puts stderr "UpdateGraphData"
+    }
+
     # save for later
     set dgraph(frame) $which
     set dgraph(x) $x
@@ -521,7 +526,7 @@ proc GraphApplyDialog {} {
 	if {$dgraph(frame) != {}} {
 	    set ii [lsearch $ds9(active) $dgraph(frame)]
 	    if {$ii>=0} {
-		UpdateGraph $dgraph(frame) $dgraph(x) $dgraph(y) canvas
+		UpdateGraphData $dgraph(frame) $dgraph(x) $dgraph(y) canvas
 	    } else {
 		set dgraph(frame) {}
 	    }
diff --git a/ds9/library/ime.tcl b/ds9/library/ime.tcl
index 96deb0f..d9c8870 100644
--- a/ds9/library/ime.tcl
+++ b/ds9/library/ime.tcl
@@ -217,7 +217,7 @@ proc IMEKeyTask {which xx yy} {
     UpdateColormapLevelMosaic $which $xx $yy canvas
     UpdateInfoBox $which $xx $yy canvas
     UpdatePixelTableDialog $which $xx $yy canvas
-    UpdateGraph $which $xx $yy canvas
+    UpdateGraphData $which $xx $yy canvas
 }
 
 proc IMEButton {which xx yy} {
@@ -399,7 +399,7 @@ proc IMEArrowKey {which xx yy} {
     UpdateColormapLevelMosaic $which $XX $YY canvas
     UpdateInfoBox $which $XX $YY canvas
     UpdatePixelTableDialog $which $XX $YY canvas
-    UpdateGraph $which $XX $YY canvas
+    UpdateGraphData $which $XX $YY canvas
 }
 
 proc IMEHelp {} {
diff --git a/ds9/library/panner.tcl b/ds9/library/panner.tcl
index 9a6335f..9c05da5 100644
--- a/ds9/library/panner.tcl
+++ b/ds9/library/panner.tcl
@@ -137,7 +137,7 @@ proc EnterPanner {x y} {
 	EnterInfoBox $current(frame)
 	UpdateInfoBox $current(frame) $x $y panner
 	UpdatePixelTableDialog $current(frame) $x $y panner
-	UpdateGraph $current(frame) $x $y panner
+	UpdateGraphData $current(frame) $x $y panner
     }
 }
 
@@ -177,7 +177,7 @@ proc MotionPanner {x y} {
 	UpdateColormapLevelMosaic $current(frame) $x $y panner
 	UpdateInfoBox $current(frame) $x $y panner
 	UpdatePixelTableDialog $current(frame) $x $y panner
-	UpdateGraph $current(frame) $x $y panner
+	UpdateGraphData $current(frame) $x $y panner
     }
 }
 
@@ -206,7 +206,7 @@ proc Motion1Panner {x y} {
 	UpdateColormapLevelMosaic $current(frame) $x $y panner
 	UpdateInfoBox $current(frame) $x $y panner
 	UpdatePixelTableDialog $current(frame) $x $y panner
-	UpdateGraph $current(frame) $x $y panner
+	UpdateGraphData $current(frame) $x $y panner
     }
 }
 
@@ -226,7 +226,7 @@ proc Release1Panner {x y} {
 	UpdateColormapLevelMosaic $current(frame) $x $y panner
 	UpdateInfoBox $current(frame) $x $y panner
 	UpdatePixelTableDialog $current(frame) $x $y panner
-	UpdateGraph $current(frame) $x $y panner
+	UpdateGraphData $current(frame) $x $y panner
 
 	LockFrameCurrent
 	UpdateGraphAxis $current(frame)
@@ -246,7 +246,7 @@ proc Release2Panner {x y} {
 	UpdateColormapLevelMosaic $current(frame) $x $y panner
 	UpdateInfoBox $current(frame) $x $y panner
 	UpdatePixelTableDialog $current(frame) $x $y panner
-	UpdateGraph $current(frame) $x $y panner
+	UpdateGraphData $current(frame) $x $y panner
 
 	LockFrameCurrent
 	UpdateGraphAxis $current(frame)
diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
index a112fc9..66c4a83 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
@@ -168,7 +168,7 @@ proc UpdateMain {} {
 		# just in case we hae a mosaic
 		UpdateColormapLevelMosaic $current(frame) $x $y canvas
 		UpdatePixelTableDialog $current(frame) $x $y canvas
-		UpdateGraph $current(frame) $x $y canvas
+		UpdateGraphData $current(frame) $x $y canvas
 	    }
 	}
 	none -