display 3d coordinates in infobox

1 files changed, 99 insertions, 127 deletions

diff --git a/ds9/library/info.tcl b/ds9/library/info.tcl
index 2ab718e..cc0bc01 100644
--- a/ds9/library/info.tcl
+++ b/ds9/library/info.tcl
@@ -140,7 +140,6 @@ proc CreateInfoPanel {} {
 }
 
 proc LayoutFrameInfoBox {which type} {
-    global ds9
     global view
 
     global debug
@@ -149,62 +148,35 @@ proc LayoutFrameInfoBox {which type} {
     }
 
     switch -- $view(layout) {
-	horizontal {LayoutFrameInfoBoxHorz $which $type}
-	vertical {LayoutFrameInfoBoxVert $which $type}
+	horizontal {
+	    LayoutFrameInfoBoxHorzValue $which $type
+	    LayoutFrameInfoBoxHorzWCS $which $type
+	    LayoutFrameInfoBoxHorzImage $which $type
+	}
+	vertical {
+	    LayoutFrameInfoBoxVertValue $which $type
+	    LayoutFrameInfoBoxVertWCS $which $type
+	    LayoutFrameInfoBoxVertImage $which $type
+	}
     }
 }
 
-proc LayoutFrameInfoBoxHorz {which type} {
+proc LayoutFrameInfoBoxHorzValue {which type} {
     global ds9
-    global view
-
-    global debug
-    if {$debug(tcl,events)} {
-	puts stderr "LayoutFrameInfoBoxHorz $which $type"
-    }
 
     switch -- $type {
-	base {
+	base -
+	3d {
 	    grid forget $ds9(info).valueRTitle $ds9(info).valueR \
 		$ds9(info).valueGTitle $ds9(info).valueG \
 		$ds9(info).valueBTitle $ds9(info).valueB
 
 	    grid $ds9(info).value -row $ds9(info,row,value) \
 		-column 2 -padx 2 -sticky w
-
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		if {$which != {} && $view(info,wcs$ll)} {
-		    if {[$which has wcs 3d wcs$ll]} {
-			grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll)\
-			    -column 5 -sticky w
-			grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll)\
-			    -column 6 -padx 2
-			incr row
-		    } else {
-			grid forget $ds9(info).wcsZLabel$ll
-			grid forget $ds9(info).wcsZValue$ll
-		    }
-		} else {
-		    grid forget $ds9(info).wcsZLabel$ll
-		    grid forget $ds9(info).wcsZValue$ll
-		}
-	    }
-
-	    if {$which != {} && $view(info,image)} {
-		if {[$which has fits cube]} {
-		    grid $ds9(info).imageZLabel \
-			-row $ds9(info,row,image) -column 5 -sticky w
-		    grid $ds9(info).imageZValue \
-			-row $ds9(info,row,image) -column 6 -padx 2
-		} else {
-		    grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
-		}
-	    } else {
-		grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
-	    }
 	}
 	rgb {
 	    grid forget $ds9(info).value
+
 	    grid $ds9(info).valueRTitle -row $ds9(info,row,value,red) \
 		-column 1 -sticky w
 	    grid $ds9(info).valueR -row $ds9(info,row,value,red) \
@@ -217,39 +189,58 @@ proc LayoutFrameInfoBoxHorz {which type} {
 		-column 5 -sticky w
 	    grid $ds9(info).valueB -row $ds9(info,row,value,blue) \
 		-column 6 -padx 2 -sticky w
+	}
+    }
+}
 
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		grid forget $ds9(info).wcsZLabel$ll
-		grid forget $ds9(info).wcsZValue$ll
+proc LayoutFrameInfoBoxHorzWCS {which type} {
+    global ds9
+    global view
+
+    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
+	if {$which != {} && $view(info,wcs$ll)} {
+	    if {[$which has wcs 3d wcs$ll]} {
+		grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll)\
+		    -column 5 -sticky w
+		grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll)\
+		    -column 6 -padx 2
+		incr row
+	    } else {
+		grid forget $ds9(info).wcsZLabel$ll \
+		    $ds9(info).wcsZValue$ll
 	    }
-	    grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
+	} else {
+	    grid forget $ds9(info).wcsZLabel$ll $ds9(info).wcsZValue$ll
 	}
-	3d {
-	    grid forget $ds9(info).valueRTitle $ds9(info).valueR \
-		$ds9(info).valueGTitle $ds9(info).valueG \
-		$ds9(info).valueBTitle $ds9(info).valueB
+    }
+}
 
-	    grid $ds9(info).value -row $ds9(info,row,value) \
-		-column 2 -padx 2 -sticky w
+proc LayoutFrameInfoBoxHorzImage {which type} {
+    global ds9
+    global view
 
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		if {$view(info,wcs$ll)} {
-		    grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll) \
-			-column 5 -sticky w
-		    grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll) \
-			-column 6 -padx 2
-		    incr row
+    switch $type {
+	base -
+	rgb {
+	    if {$which != {} && $view(info,image)} {
+		if {[$which has fits cube]} {
+		    grid $ds9(info).imageZLabel \
+			-row $ds9(info,row,image) -column 5 -sticky w
+		    grid $ds9(info).imageZValue \
+			-row $ds9(info,row,image) -column 6 -padx 2
 		} else {
-		    grid forget $ds9(info).wcsZLabel$ll
-		    grid forget $ds9(info).wcsZValue$ll
+		    grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 		}
+	    } else {
+		grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 	    }
-
+	}
+	3d {
 	    if {$view(info,image)} {
-		grid $ds9(info).imageZLabel -row $ds9(info,row,image) \
-		    -column 5 -sticky w
-		grid $ds9(info).imageZValue -row $ds9(info,row,image) \
-		    -column 6 -padx 2
+		grid $ds9(info).imageZLabel \
+		    -row $ds9(info,row,image) -column 5 -sticky w
+		grid $ds9(info).imageZValue \
+		    -row $ds9(info,row,image) -column 6 -padx 2
 	    } else {
 		grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 	    }
@@ -257,59 +248,22 @@ proc LayoutFrameInfoBoxHorz {which type} {
     }
 }
 
-proc LayoutFrameInfoBoxVert {which type} {
+proc LayoutFrameInfoBoxVertValue {which type} {
     global ds9
-    global view
-
-    global debug
-    if {$debug(tcl,events)} {
-	puts stderr "LayoutFrameInfoBoxVert $which $type"
-    }
 
     switch -- $type {
-	base {
+	base -
+	3d {
 	    grid forget $ds9(info).valueRTitle $ds9(info).valueR \
 		$ds9(info).valueGTitle $ds9(info).valueG \
 		$ds9(info).valueBTitle $ds9(info).valueB
 
 	    grid $ds9(info).value -row $ds9(info,row,value) \
 		-column 1 -padx 2 -sticky w
-
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		if {$which != {} && $view(info,wcs$ll)} {
-		    if {[$which has wcs 3d wcs$ll]} {
-			grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll)\
-			    -column 0 -sticky w
-			grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll)\
-			    -column 1 -padx 2
-			incr row
-		    } else {
-			grid forget $ds9(info).wcsZLabel$ll
-			grid forget $ds9(info).wcsZValue$ll
-		    }
-		} else {
-		    grid forget $ds9(info).wcsZLabel$ll
-		    grid forget $ds9(info).wcsZValue$ll
-		}
-	    }
-
-	    if {$which != {} && $view(info,image)} {
-		if {[$which has fits cube]} {
-		    grid $ds9(info).imageZLabel -row $ds9(info,row,image) \
-			-column 0 -sticky w
-		    grid $ds9(info).imageZValue -row $ds9(info,row,image) \
-			-column 1 -padx 2
-		} else {
-		    grid forget $ds9(info).imageZLabel \
-			$ds9(info).imageZValue
-		}
-	    } else {
-		grid forget $ds9(info).imageZLabel \
-		    $ds9(info).imageZValue
-	    }
 	}
 	rgb {
 	    grid forget $ds9(info).value
+
 	    grid $ds9(info).valueRTitle -row $ds9(info,row,value,red) \
 		-column 0 -sticky w
 	    grid $ds9(info).valueR -row $ds9(info,row,value,red) \
@@ -322,41 +276,59 @@ proc LayoutFrameInfoBoxVert {which type} {
 		-column 0 -sticky w
 	    grid $ds9(info).valueB -row $ds9(info,row,value,blue) \
 		-column 1 -padx 2 -sticky w
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		grid forget $ds9(info).wcsZLabel$ll
-		grid forget $ds9(info).wcsZValue$ll
+	}
+    }
+}
+
+proc LayoutFrameInfoBoxVertWCS {which type} {
+    global ds9
+    global view
+
+    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
+	if {$which != {} && $view(info,wcs$ll)} {
+	    if {[$which has wcs 3d wcs$ll]} {
+		grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll)\
+		    -column 0 -sticky w
+		grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll)\
+		    -column 1 -padx 2
+		incr row
+	    } else {
+		grid forget $ds9(info).wcsZLabel$ll $ds9(info).wcsZValue$ll
 	    }
-	    grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
+	} else {
+	    grid forget $ds9(info).wcsZLabel$ll $ds9(info).wcsZValue$ll
 	}
-	3d {
-	    grid forget $ds9(info).valueRTitle $ds9(info).valueR \
-		$ds9(info).valueGTitle $ds9(info).valueG \
-		$ds9(info).valueBTitle $ds9(info).valueB
+    }
+}
 
-	    grid $ds9(info).value -row $ds9(info,row,value) \
-		-column 1 -padx 2 -sticky w
+proc LayoutFrameInfoBoxVertImage {which type} {
+    global ds9
+    global view
 
-	    foreach ll {{} a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-		if {$view(info,wcs$ll)} {
-		    grid $ds9(info).wcsZLabel$ll -row $ds9(info,row,wcs$ll) \
+    switch $type {
+	base -
+	rgb {
+	    if {$which != {} && $view(info,image)} {
+		if {[$which has fits cube]} {
+		    grid $ds9(info).imageZLabel -row $ds9(info,row,image) \
 			-column 0 -sticky w
-		    grid $ds9(info).wcsZValue$ll -row $ds9(info,row,wcs$ll) \
+		    grid $ds9(info).imageZValue -row $ds9(info,row,image) \
 			-column 1 -padx 2
-		    incr row
 		} else {
-		    grid forget $ds9(info).wcsZLabel$ll
-		    grid forget $ds9(info).wcsZValue$ll
+		    grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 		}
+	    } else {
+		grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 	    }
-
+	}
+	3d {
 	    if {$view(info,image)} {
 		grid $ds9(info).imageZLabel -row $ds9(info,row,image) \
 		    -column 0 -sticky w
 		grid $ds9(info).imageZValue -row $ds9(info,row,image) \
 		    -column 1 -padx 2
 	    } else {
-		grid forget $ds9(info).imageZLabel \
-		    $ds9(info).imageZValue
+		grid forget $ds9(info).imageZLabel $ds9(info).imageZValue
 	    }
 	}
     }