simplify crop code

5 files changed, 21 insertions, 19 deletions

diff --git a/ds9/library/analysis.tcl b/ds9/library/analysis.tcl
index 1230af4..a3ee4cf 100644
--- a/ds9/library/analysis.tcl
+++ b/ds9/library/analysis.tcl
@@ -1557,7 +1557,7 @@ proc ParseZMacro {cmdname frame} {
     set exp1 {\$z\(([^)]*)\)}
     if {[regexp $exp1 $cmd foo pp]} {
         set sys $pp
-        set coord [$frame get fits slice coordinates $sl $sys]
+        set coord [$frame get fits slice coordinates $sl $sys fk5]
         regsub -all $exp1 $cmd "$coord" cmd
         return
     }
diff --git a/ds9/library/crop.tcl b/ds9/library/crop.tcl
index 3082a4a..a5c81a1 100644
--- a/ds9/library/crop.tcl
+++ b/ds9/library/crop.tcl
@@ -168,7 +168,8 @@ proc CropApplyDialog {} {
 	    $dcrop(w) $dcrop(h) $crop(dcoord) $crop(dformat)
 
 	if {[$current(frame) has fits cube]} {
-	    $current(frame) crop 3d $dcrop(zmin) $dcrop(zmax) $crop(rcoord)
+	    $current(frame) crop 3d \
+		$dcrop(zmin) $dcrop(zmax) $crop(rcoord) $crop(sky)
 	}
 	UpdateCrop $current(frame)
     }
@@ -233,7 +234,7 @@ proc UpdateCropDialog {} {
 	    set dcrop(h) [lindex $rr 3]
 
 	    if {[$current(frame) has fits cube]} {
-		set ss [$current(frame) get crop 3d $crop(rcoord)]
+		set ss [$current(frame) get crop 3d $crop(rcoord) $crop(sky)]
 		set dcrop(zmin) [lindex $ss 0]
 		set dcrop(zmax) [lindex $ss 1]
 
@@ -311,7 +312,7 @@ proc MatchCrop {which sys} {
 		    set r(y) [lindex $rr 1]
 		    set r(w) [lindex $rr 2]
 		    set r(h) [lindex $rr 3]
-		    set qq [$which get crop 3d $ss]
+		    set qq [$which get crop 3d $ss fk5]
 
 		    foreach ff $ds9(frames) {
 			if {$ff != $which} {
diff --git a/ds9/library/cube.tcl b/ds9/library/cube.tcl
index 38af29c..4b46706 100644
--- a/ds9/library/cube.tcl
+++ b/ds9/library/cube.tcl
@@ -38,7 +38,7 @@ proc MatchCube {which sys} {
     
     foreach ff $ds9(frames) {
 	if {$ff != $which} {
-	    RGBEvalLock rgb(lock,slice) $ff "$ff update fits slice $wss $sys"
+	    RGBEvalLock rgb(lock,slice) $ff "$ff update fits slice $wss $sys fk5"
 	}
     }
 }
@@ -262,7 +262,7 @@ proc CubeApply {} {
     }
     
     set dcube(image) $ss
-    set dcube(wcs) [$current(frame) get fits slice coordinates $dcube(image) $cube(system) $cube(sky)]
+    set dcube(wcs) [$current(frame) get fits slice coordinates $ss $cube(system) $cube(sky)]
     RGBEvalLockCurrent rgb(lock,slice) "$current(frame) update fits slice $ss"
 
     UpdateCube
@@ -294,7 +294,7 @@ proc CubeApplyWCS {} {
     }
     
     set dcube(image) $ss
-    set dcube(wcs) [$current(frame) get fits slice coordinates $dcube(image) $cube(system) $cube(sky)]
+    set dcube(wcs) [$current(frame) get fits slice coordinates $ss $cube(system) $cube(sky)]
     RGBEvalLockCurrent rgb(lock,slice) "$current(frame) update fits slice $ss"
 
     UpdateCube
@@ -799,7 +799,7 @@ proc CubeCmd {ss} {
     }
 
     set dcube(image) $ss
-    set dcube(wcs) [$current(frame) get fits slice coordinates $dcube(image) $cube(system) $cube(sky)]
+    set dcube(wcs) [$current(frame) get fits slice coordinates $ss $cube(system) $cube(sky)]
     RGBEvalLockCurrent rgb(lock,slice) "$current(frame) update fits slice $ss"
 
     UpdateCube
@@ -827,7 +827,7 @@ proc CubeCmdCoord {ss sys sky} {
     }
     
     set dcube(image) $ss
-    set dcube(wcs) [$current(frame) get fits slice coordinates $dcube(image) $cube(system) $cube(sky)]
+    set dcube(wcs) [$current(frame) get fits slice coordinates $ss $cube(system) $cube(sky)]
     RGBEvalLockCurrent rgb(lock,slice) "$current(frame) update fits slice $ss"
 
     UpdateCube
diff --git a/ds9/library/examine.tcl b/ds9/library/examine.tcl
index 06ba9f5..0e9be13 100644
--- a/ds9/library/examine.tcl
+++ b/ds9/library/examine.tcl
@@ -36,7 +36,7 @@ proc ExamineButtonBase {which x y} {
 
     # find filename/slice
     set fn [$which get fits file name full canvas $x $y]
-    set slice($ii) [$which get fits slice]
+    set slice [$which get fits slice]
     
     # so the new frame will have all of the parent frame when created
     set ds9(next) $which
@@ -71,7 +71,7 @@ proc ExamineButtonBase {which x y} {
     RealizeDS9
 
     # set slice
-    $current(frame) update fits slice $slice($ii)
+    $current(frame) update fits slice $slice
 
     # zoom to about
     if {[$current(frame) has fits bin]} {
@@ -115,7 +115,7 @@ proc ExamineButtonRGB {which x y} {
 	$which rgb channel $cc
 	set fn($cc) [$which get fits file name full canvas $x $y]
 
-	set slice($cc,$ii) [$which get fits slice]
+	set slice($cc) [$which get fits slice]
     }
 
     # so the new frame will have all of the parent frame when created
@@ -159,7 +159,7 @@ proc ExamineButtonRGB {which x y} {
     # set slice
     foreach cc {red green blue} {
 	$current(frame) rgb channel $cc
-	$current(frame) update fits slice $slice($cc,$ii)
+	$current(frame) update fits slice $slice($cc)
     }
 
     # zoom to about
@@ -204,7 +204,7 @@ proc ExamineButton3D {which x y} {
 
     # find filename/slice
     set fn [$which get fits file name full canvas $x $y]
-    set slice($ii) [$which get fits slice]
+    set slice [$which get fits slice]
     
     # and 3d info
     set rr [$current(frame) get 3d view]
@@ -245,7 +245,7 @@ proc ExamineButton3D {which x y} {
     RealizeDS9
 
     # set slice
-    $current(frame) update fits slice $slice($ii)
+    $current(frame) update fits slice $slice
 
     # zoom to about
     if {[$current(frame) has fits bin]} {
diff --git a/ds9/library/markeranalysisplot3d.tcl b/ds9/library/markeranalysisplot3d.tcl
index a1b937c..1fef063 100644
--- a/ds9/library/markeranalysisplot3d.tcl
+++ b/ds9/library/markeranalysisplot3d.tcl
@@ -175,7 +175,7 @@ proc MarkerAnalysisPlot3dCB {frame id} {
     $frame get marker $id analysis plot3d $xdata $ydata \
 	$vvar(system) $vvar(sky) $vvar(method)
 
-    set vvar(slice) [$frame get fits slice 2 $vvar(system) $vvar(sky)]
+    set vvar(slice) [$frame get fits slice coordinates $vvar(system) $vvar(sky)]
     MarkerAnalysisPlot3dMarker $vvarname
 
     if {!$ping} {
@@ -197,7 +197,7 @@ proc MarkerAnalysisPlot3dMotion {vvarname xx yy} {
     }
 
     set vvar(slice) [lindex [$vvar(graph) invtransform $xx $yy] 0]
-    $vvar(frame) update fits slice $vvar(slice) $vvar(system)
+    $vvar(frame) update fits slice $vvar(slice) $vvar(system) $vvar(sky)
 
     MarkerAnalysisPlot3dMarker $vvarname
 
@@ -215,7 +215,7 @@ proc MarkerAnalysisPlot3dMarker {vvarname} {
     upvar #0 $vvarname vvar
     global $vvarname
 
-    set ss [$vvar(frame) get crop 3d $vvar(system)]
+    set ss [$vvar(frame) get crop 3d $vvar(system) $vvar(sky)]
     set min [lindex $ss 0]
     set max [lindex $ss 1]
     set delta [expr ($max-$min)*.0001]
@@ -241,7 +241,8 @@ proc MarkerAnalysisPlot3dSliceCB {frame id} {
     # this routine will be called, so check first
 
     if {[info exists ${vvarname}(system)]} {
-	set vvar(slice) [$frame get fits slice 2 $vvar(system) $vvar(sky)]
+	set vvar(slice) \
+	    [$frame get fits slice coordinates $vvar(system) $vvar(sky)]
 	MarkerAnalysisPlot3dMarker $vvarname
     }
 }