1 files changed, 4 insertions, 226 deletions
diff --git a/ds9/library/contour.tcl b/ds9/library/contour.tcl
index d55e3c9..2e23cee 100644
--- a/ds9/library/contour.tcl
+++ b/ds9/library/contour.tcl
@@ -1054,232 +1054,10 @@ proc ProcessContourCmd {varname iname} {
     # we need to be realized
     ProcessRealizeDS9
 
-    global debug
-    if {$debug(tcl,parser)} {
-	contour::YY_FLUSH_BUFFER
-	contour::yy_scan_string [lrange $var $i end]
-	contour::yyparse
-	incr i [expr $contour::yycnt-1]
-    } else {
-
-    global contour
-    global current
-    switch -- [string tolower [lindex $var $i]] {
-	open {ContourDialog}
-	close {ContourDestroyDialog}
-	clear {ContourOffDialog}
-	load {
-	    incr i
-	    set fn [lindex $var $i]
-	    if {$fn != {}} {
-		if {[file extension $fn] == {.con}} {
-		    # backward compatibility
-		    incr i
-		    set sys [lindex $var $i]
-		    incr i
-		    set sky [lindex $var $i]
-		    incr i
-		    set color [lindex $var $i]
-		    incr i
-		    set width [lindex $var $i]
-		    incr i
-		    set dash [lindex $var $i]
-		    incr i [ProcessContourFix sys sky color width dash]
-		    $current(frame) contour load $color $width $dash \
-			"\{$fn\}" $sys $sky
-		} else {
-		    incr i
-		    set color [lindex $var $i]
-		    if {$color == {} || [string range $color 0 0] == "-"} {
-			$current(frame) contour load "\{$fn\}"
-			incr i -1
-		    } else {
-			incr i
-			set width [lindex $var $i]
-			incr i
-			set dash [FromYesNo [lindex $var $i]]
-			$current(frame) contour load "\{$fn\}" \
-			    $color $width $dash
-		    }
-		}
-	    }
-	    FileLast contourlfbox $fn
-	    UpdateContourDialog
-	}
-	save {
-	    incr i
-	    set fn [lindex $var $i]
-	    incr i
-	    set sys [lindex $var $i]
-	    incr i
-	    set sky [lindex $var $i]
-	    # Backward compatibility
-	    incr i
-	    set color {}
-	    incr i
-	    set width {}
-	    incr i
-	    set dash {}
-	    incr i [ProcessContourFix sys sky color width dash]
-	    if {$fn != {}} {
-		$current(frame) contour save "\{$fn\}" $sys $sky
-	    }
-	    FileLast contoursfbox $fn
-	}
-	convert {Contour2Polygons}
-	loadlevels {
-	    ContourDialog
-	    incr i
-	    ContourLoadLevelsNow [lindex $var $i]
-	    UpdateContour
-	}
-	savelevels {
-	    ContourDialog
-	    incr i
-	    ContourSaveLevelsNow [lindex $var $i]
-	}
-	copy {ContourCCopyDialog}
-	paste {
-	    incr i
-	    set sys [lindex $var $i]
-	    incr i
-	    set sky [lindex $var $i]
-	    incr i
-	    # backward compatibility
-	    set color [lindex $var $i]
-	    incr i
-	    set width [lindex $var $i]
-	    incr i
-	    set dash [lindex $var $i]
-	    incr i [ProcessContourFix sys sky color width dash]
-	    if {$current(frame) != {} && $contour(copy) != {}} {
-		set cc [$contour(copy) get contour $sys $sky]
-		$current(frame) contour paste cc $color $width $dash
-	    }
-	}
-	color {
-	    ContourDialog
-	    incr i
-	    set contour(color) [lindex $var $i]
-	    UpdateContour
-	}
-	width {
-	    ContourDialog
- 	    incr i
-	    set contour(width) [lindex $var $i]
-	    UpdateContour
-	}
-	dash {
-	    ContourDialog
-	    incr i
-	    set contour(dash) [FromYesNo [lindex $var $i]]
-	    UpdateContour
-	}
-	smooth {
-	    ContourDialog
-	    incr i
-	    set contour(smooth) [lindex $var $i]
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	method {
-	    ContourDialog
-	    incr i
-	    set contour(method) [lindex $var $i]
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	nlevels {
-	    ContourDialog
-	    incr i
-	    set contour(numlevel) [lindex $var $i]
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	scale {
-	    set contour(init,scale) 1
-	    ContourDialog
-	    incr i
-	    set contour(scale) [string tolower [lindex $var $i]]
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	log {
-	    set contour(init,scale) 1
-	    ContourDialog
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		exp {
-		    incr i
-		    set contour(log) [string tolower [lindex $var $i]]
-		}
-		default {
-		    incr i -1
-		    set contour(log) [string tolower [lindex $var $i]]
-		}
-	    }
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	mode {
-	    set contour(init,mode) 1
-	    ContourDialog
-	    incr i
-	    set contour(mode) [lindex $var $i]
-	    ContourModeDialog
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	scope {
-	    set contour(init,scope) 1
-	    ContourDialog
-	    incr i
-	    set contour(scope) [lindex $var $i]
-	    ContourModeDialog
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	limits {
-	    set contour(init,limits) 1
-	    ContourDialog
-	    incr i
-	    set contour(min) [lindex $var $i]
-	    incr i
-	    set contour(max) [lindex $var $i]
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	levels {
-	    ContourDialog
-	    global dcontour
-	    $dcontour(txt) delete 1.0 end
-	    incr i
-	    $dcontour(txt) insert end [lindex $var $i]
-	    UpdateContour
-	}
-	generate {
-	    ContourDialog
-	    ContourGenerateDialog
-	    UpdateContour
-	}
-	yes -
-	true -
-	on -
-	1 -
-	no -
-	false -
-	off -
-	0 {
-	    set contour(view) [FromYesNo [lindex $var $i]]
-	    UpdateContour
-	}
-	default {
-	    set contour(view) 1
-	    UpdateContour
-	    incr i -1
-	}
-    }
-}
+    contour::YY_FLUSH_BUFFER
+    contour::yy_scan_string [lrange $var $i end]
+    contour::yyparse
+    incr i [expr $contour::yycnt-1]
 }
 
 proc ContourCmdLoad {fn} {