cleanup ProcessCmd code

1 files changed, 12 insertions, 564 deletions

diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl
index 5ecd893..8f2a384 100644
--- a/ds9/library/marker.tcl
+++ b/ds9/library/marker.tcl
@@ -1396,571 +1396,19 @@ proc ProcessRegionsCmd {varname iname sock fn} {
     # we need to be realized
     ProcessRealizeDS9
 
-    global debug
-    if {$debug(tcl,parser)} {
-	global parse
-	set parse(sock) $sock
-	set parse(fn) $fn
-
-	set marker(load,format) $marker(format)
-	set marker(load,system) $marker(system)
-	set marker(load,sky) $marker(sky)
-	set marker(tag) {}
-	
-	region::YY_FLUSH_BUFFER
-	region::yy_scan_string [lrange $var $i end]
-	region::yyparse
-	incr i [expr $region::yycnt-1]
-    } else {
-
-    global ds9
-    global current
-    global pmarker
-
-    switch -- [string tolower [lindex $var $i]] {
-	epsilon {
-	    incr i
-	    set pmarker(epsilon) [lindex $var $i]
-	    MarkerEpsilon
-	}
-	show {
-	    incr i
-	    set marker(show) [FromYesNo [lindex $var $i]]
-	    MarkerShow
-	}
-	showtext {
-	    incr i
-	    set marker(show,text) [FromYesNo [lindex $var $i]]
-	    MarkerShowText
-	}
-	getinfo {MarkerInfo}
-	centroid {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		auto {
-		    incr i
-		    set marker(centroid,auto) [FromYesNo [lindex $var $i]]
-		    MarkerCentroidAuto
-		}
-		radius {
-		    incr i
-		    set marker(centroid,radius) [lindex $var $i]
-		    MarkerCentroidRadius
-		}
-		iteration {
-		    incr i
-		    set marker(centroid,iteration) [lindex $var $i]
-		    MarkerCentroidIteration
-		}
-		default {
-		    incr i -1
-		    MarkerCentroid
-		}
-	    }
-	}
-	autocentroid {
-	    # backward compatibilty
-	    incr i
-	    set marker(centroid,auto) [FromYesNo [lindex $var $i]]
-	    MarkerCentroidAuto
-	}
-	movefront {MarkerFront}
-	moveback {MarkerBack}
-	move {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		front {MarkerFront}
-		back {MarkerBack}
-	    }
-	}
-
-	selectall {MarkerSelectAll}
-	selectnone {MarkerUnselectAll}
-	select {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		group {
-		    # backward compatibility, use group <> select
-		    incr i
-		    if {$current(frame) != {}} {
-			if {[$current(frame) has fits]} {
-			    $current(frame) marker "\{[lindex $var $i]\}" select
-			}
-		    }
-		}
-		all {MarkerSelectAll}
-		none {MarkerUnselectAll}
-		invert {MarkerSelectInvert}
-	    }
-	}
-
-	deleteall {MarkerDeleteAll}
-	delete {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		select {MarkerDeleteSelect}
-		all {MarkerDeleteAll}
-	    }
-	}
-
-	format {
-	    incr i
-	    set marker(format) [string tolower [lindex $var $i]]
-	}
-	coord -
-	system {
-	    # for backward compatibility
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		fk4 -
-		b1950 -
-		fk5 -
-		j2000 -
-		icrs -
-		galactic -
-		ecliptic {
-		    incr i
-		    set marker(system) wcs
-		    set marker(sky) [string tolower [lindex $var $i]]
-		}
-		
-		default {set marker(system) [string tolower [lindex $var $i]]}
-	    }
-	}
-	sky {
-	    incr i
-	    set marker(sky) [string tolower [lindex $var $i]]
-	}
-	coordformat -
-	skyformat {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		deg -
-		degree -
-		degrees {set marker(skyformat) degrees}
-		default {
-		    set marker(skyformat) [string tolower [lindex $var $i]]
-		}
-	    }
-	}
-	strip {
-	    incr i
-	    set marker(strip) [FromYesNo [lindex $var $i]]
-	}
-	delim {
-	    incr i
-	    if {[lindex $var $i] != "nl"} {
-		set marker(strip) 1
-	    } else {
-		set marker(strip) 0
-	    }
-	}
-	shape {
-	    incr i
-	    set marker(shape) [string tolower [lindex $var $i]]
-	}
-	color {
-	    incr i
-	    set marker(color) [string tolower [lindex $var $i]]
-	    MarkerColor
-	}
-	width {
-	    incr i
-	    set marker(width) [lindex $var $i]
-	    MarkerWidth
-	}
-
-	fixed {
-	    incr i
-	    set marker(fixed) [FromYesNo [lindex $var $i]]
-	    MarkerProp fixed
-	}
-	edit {
-	    incr i
-	    set marker(edit) [FromYesNo [lindex $var $i]]
-	    MarkerProp edit
-	}
-	rotate {
-	    incr i
-	    set marker(rotate) [FromYesNo [lindex $var $i]]
-	    MarkerProp rotate
-	}
-	delete {
-	    incr i
-	    set marker(delete) [FromYesNo [lindex $var $i]]
-	    MarkerProp delete
-	}
-	include {
-	    set marker(include) 1
-	    MarkerProp include
-	}
-	exclude {
-	    set marker(include) 0
-	    MarkerProp include
-	}
-	source {
-	    set marker(source) 1
-	    MarkerProp source
-	}
-	background {
-	    set marker(source) 0
-	    MarkerProp source
-	}
-
-	tag -
-	tags -
-	group -
-	groups {
-	    incr i
-
-	    if {[string tolower [lindex $var $i]] == {new}} {
-		if {$current(frame) != {}} {
-		    if {[$current(frame) has fits]} {
-			set name [$current(frame) get marker tag default name]
-			$current(frame) marker tag "\{$name\}"
-			UpdateGroupDialog
-		    }
-		}
-	    } else {
-		set tag "\{[lindex $var $i]\}"
-		incr i
-		switch -- [string tolower [lindex $var $i]] {
-		    new {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker tag $tag
-				UpdateGroupDialog
-			    }
-			}
-		    }
-		    update {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker tag update $tag
-				UpdateGroupDialog
-			    }
-			}
-		    }
-		    delete {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag delete
-				UpdateGroupDialog
-			    }
-			}
-		    }
-		    select {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag select
-			    }
-			}
-		    }
-		    color {
-			incr i
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag color \
-				    [string tolower [lindex $var $i]]
-			    }
-			}
-		    }
-		    copy {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag copy
-			    }
-			}
-		    }
-		    cut {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag cut
-			    }
-			}
-		    }
-		    font {
-			incr i
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag font \
-				    "\{[lindex $var $i]\}"
-			    }
-			}
-		    }
-		    move {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag move \
-				    [lindex $var [expr $i+1]] \
-				    [lindex $var [expr $i+2]]
-			    }
-			}
-			incr i 2
-		    }
-		    movefront {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag move front
-			    }
-			}
-		    }
-		    moveback {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag move back
-			    }
-			}
-		    }
-		    property {
-			if {$current(frame) != {}} {
-			    if {[$current(frame) has fits]} {
-				$current(frame) marker $tag property \
-				    [lindex $var [expr $i+1]] \
-				    [lindex $var [expr $i+2]]
-			    }
-			}
-			incr i 2
-		    }
-		}
-	    }
-	}
-
-	copy {MarkerCopy}
-	cut {MarkerCut}
-	paste {
-	    set marker(paste,system) [string tolower [lindex $var [expr $i+1]]] 
-	    switch -- $marker(paste,system) {
-		image -
-		physical -
-		detector -
-		amplifier -
-		wcs -
-		wcsa -
-		wcsb -
-		wcsc -
-		wcsd -
-		wcse -
-		wcsf -
-		wcsg -
-		wcsh -
-		wcsi -
-		wcsj -
-		wcsk -
-		wcsl -
-		wcsm -
-		wcsn -
-		wcso -
-		wcsp -
-		wcsq -
-		wcsr -
-		wcss -
-		wcst -
-		wcsu -
-		wcsv -
-		wcsw -
-		wcsx -
-		wcsy -
-		wcsz {}
-		default {set marker(paste,system) wcs}
-	    }		
-
-#	    backward compatibility
-	    if {[string range [lindex $var [expr $i+2]] 0 0] == {-}} {
-		incr i 1
-	    } else {
-		incr i 2
-	    }
-
-	    MarkerPaste
-	}
-	undo {MarkerUndo}
-
-	composite {CompositeCreate}
-	desolve -
-	dissove {CompositeDelete}
-
-	template {
-	    incr i
-	    set ff [lindex $var $i]
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		at {
-		    incr i
-		    set ra [lindex $var $i]
-		    incr i
-		    set dec [lindex $var $i]
-		    incr i
-		    set sys [string tolower [lindex $var $i]]
-		    incr i
-		    set sky [string tolower [lindex $var $i]]
-		    switch -- $sys {
-			fk4 -
-			fk5 -
-			icrs -
-			galatic -
-			ecliptic {
-			    set sky $sys
-			    set sys wcs
-			    incr i -1
-			}
-		    }
-		    LoadTemplateMarkerAt $ff $ra $dec $sys $sky
-		    FileLast templatefbox $ff
-		}
-		default {
-		    LoadTemplateMarker $ff
-		    FileLast templatefbox $ff
-		    incr i -1
-		}
-	    }
-	}
-	savetemplate {
-	    incr i
-	    set ff [lindex $var $i]
-	    if {$ff != {}} {
-		if {$current(frame) != {}} {
-		    if {[$current(frame) has fits]} {
-			$current(frame) marker save template "\{$ff\}"
-		    }
-		}
-		FileLast templatefbox $ff
-	    }
-	}
-
-	command {
-	    incr i
-	    if {$current(frame) != {}} {
-		if {[$current(frame) has fits]} {
-		    $current(frame) marker command $marker(format) \
-			"\{[lindex $var $i]\}"
-		}
-	    }
-	    UpdateGroupDialog
-	}
-
-	list {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		close {SimpleTextDestroy markertxt}
-		default {
-		    if {$current(frame) != {}} {
-			if {[$current(frame) has fits]} {
-			    SimpleTextDialog markertxt [msgcat::mc {Region}] \
-				80 20 insert top \
-				[$current(frame) marker list $marker(format) \
-				     $marker(system) $marker(sky) \
-				     $marker(skyformat) $marker(strip)]
-			}
-		    }
-		    incr i -1
-		}
-	    }
-	}
-	save {
-	    incr i
-	    set ff [lindex $var $i]
-	    if {$ff == {}} {
-		return
-	    }
-	    if {$current(frame) != {}} {
-		if {[$current(frame) has fits]} {
-		    $current(frame) marker save "\{$ff\}" \
-			$marker(format) $marker(system) $marker(sky) \
-			$marker(skyformat) $marker(strip)
-		}
-	    }
-	    FileLast markerfbox $ff
-	}
-
-	file -
-	load {
-	    incr i
-	    switch -- [string tolower [lindex $var $i]] {
-		all {
-		    incr i
-		    set frames $ds9(frames)
-		}
-		default {
-		    set frames $current(frame)
-		}
-	    }
-	    MarkerLoadFrames [lindex $var $i] $frames \
-		$marker(format) $marker(system) $marker(sky)
-	}
-	default {
-	    set format $marker(format)
-	    set sys $marker(system)
-	    set sky $marker(sky)
-
-	    while {[string range [lindex $var $i] 0 0] == "-"} {
-		switch -- [string tolower [lindex $var $i]] {
-		    -format {
-			incr i
-			set format [lindex $var $i]
-		    }
-		    -sys -
-		    -coord -
-		    -system {
-			incr i
-			# for backward compatibility
-			switch -- [lindex $var $i] {
-			    fk4 -
-			    fk5 -
-			    icrs -
-			    galactic -
-			    ecliptic {
-				set sys wcs
-				set sky [lindex $var $i]
-			    }
-			    default {
-				set sys [lindex $var $i]
-			    }
-			}
-		    }
-		    -sky {
-			incr i
-			set sky [lindex $var $i]
-		    }
-		    default {
-			Error "Illegal option: [lindex $var $i]"
-			return
-		    }
-		}
-		incr i
-	    }
+    global parse
+    set parse(sock) $sock
+    set parse(fn) $fn
 
-	    if {$sock != {}} {
-		# xpa path
-		if {[lindex $var $i] != {}} {
-		    MarkerLoadFrames [lindex $var $i] $current(frame) \
-			$format $sys $sky
-		} else {
-		    # fits regions files not supported  
-		    if {$current(frame) != {}} {
-			if {[$current(frame) has fits]} {
-			    $current(frame) marker load $format $sock $sys $sky
-			}
-		    }
-		    UpdateGroupDialog
-		}
-	    } elseif {$fn != {}} {
-		# samp path
-		if {[lindex $var $i] != {}} {
-		    MarkerLoadFrames [lindex $var $i] $current(frame) \
-			$format $sys $sky
-		} else {
-		    MarkerLoadFrames $fn $current(frame) \
-			$format $sys $sky
-		}
-	    } else {
-		# this will open a fits regions file
-		MarkerLoadFrames [lindex $var $i] $current(frame) \
-		    $format $sys $sky
-	    }
-	}
-    }
-}
+    set marker(load,format) $marker(format)
+    set marker(load,system) $marker(system)
+    set marker(load,sky) $marker(sky)
+    set marker(tag) {}
+    
+    region::YY_FLUSH_BUFFER
+    region::yy_scan_string [lrange $var $i end]
+    region::yyparse
+    incr i [expr $region::yycnt-1]
 }
 
 proc MarkerCmdSet {which value {cmd {}}} {