From 86dd0bbcc0ea3a68eee464557e1de53def0192d9 Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 21 Aug 2017 16:24:53 -0400 Subject: clean up code --- ds9/library/analysis.tcl | 1 - ds9/library/array.tcl | 1 - ds9/library/command.tcl | 1 - ds9/library/envi.tcl | 1 - ds9/library/fits.tcl | 1 - ds9/library/hvsup.tcl | 1 - ds9/library/iis.tcl | 1 - ds9/library/imgsvr.tcl | 1 - ds9/library/import.tcl | 1 - ds9/library/load.tcl | 3 --- ds9/library/macosx.tcl | 2 -- ds9/library/mecube.tcl | 1 - ds9/library/mosaicimageiraf.tcl | 1 - ds9/library/mosaicimagewcs.tcl | 1 - ds9/library/mosaicimagewfpc2.tcl | 1 - ds9/library/mosaiciraf.tcl | 1 - ds9/library/mosaicwcs.tcl | 1 - ds9/library/multiframe.tcl | 1 - ds9/library/nrrd.tcl | 1 - ds9/library/open.tcl | 1 - ds9/library/photo.tcl | 1 - ds9/library/rgbarray.tcl | 1 - ds9/library/rgbcube.tcl | 1 - ds9/library/rgbimage.tcl | 1 - ds9/library/sfits.tcl | 1 - ds9/library/shm.tcl | 1 - ds9/library/smosaiciraf.tcl | 1 - ds9/library/smosaicwcs.tcl | 1 - ds9/library/srgbcube.tcl | 1 - ds9/library/url.tcl | 2 -- 30 files changed, 34 deletions(-) diff --git a/ds9/library/analysis.tcl b/ds9/library/analysis.tcl index 011d393..794927a 100644 --- a/ds9/library/analysis.tcl +++ b/ds9/library/analysis.tcl @@ -702,7 +702,6 @@ proc AnalysisPipe {which i cmd sync} { set loadParam(file,name) \ "[string tolower [lindex $ianalysis($which,$i,item) 0]].fits" - StartLoad ProcessLoad FinishLoad diff --git a/ds9/library/array.tcl b/ds9/library/array.tcl index 59eba0a..8b4a3c5 100644 --- a/ds9/library/array.tcl +++ b/ds9/library/array.tcl @@ -101,7 +101,6 @@ proc ProcessArrayCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![ImportArraySocket $sock $param $layer]} { diff --git a/ds9/library/command.tcl b/ds9/library/command.tcl index 89f8cf7..12143af 100644 --- a/ds9/library/command.tcl +++ b/ds9/library/command.tcl @@ -461,7 +461,6 @@ proc ProcessCommand {argv argc} { } if {$load == 0} { - StartLoad incr load } diff --git a/ds9/library/envi.tcl b/ds9/library/envi.tcl index 8951e11..93dd800 100644 --- a/ds9/library/envi.tcl +++ b/ds9/library/envi.tcl @@ -55,7 +55,6 @@ proc ProcessENVICmd {varname iname sock fn} { } } - StartLoad if {$sock != {}} { # xpa if {0} { diff --git a/ds9/library/fits.tcl b/ds9/library/fits.tcl index f606c17..267fdb8 100644 --- a/ds9/library/fits.tcl +++ b/ds9/library/fits.tcl @@ -129,7 +129,6 @@ proc ProcessFitsCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadFitsSocket $sock $param $layer $mode]} { diff --git a/ds9/library/hvsup.tcl b/ds9/library/hvsup.tcl index ca0f0bf..e8c16e2 100644 --- a/ds9/library/hvsup.tcl +++ b/ds9/library/hvsup.tcl @@ -1235,7 +1235,6 @@ proc HVParseFITS {varname} { current {} } - StartLoad global loadParam set loadParam(load,type) allocgz set loadParam(load,layer) {} diff --git a/ds9/library/iis.tcl b/ds9/library/iis.tcl index 6fe1603..d9d338c 100644 --- a/ds9/library/iis.tcl +++ b/ds9/library/iis.tcl @@ -260,7 +260,6 @@ proc IISLoadFrame {which} { ([Frame$which get fits width] != $iis(width)) || \ ([Frame$which get fits height] != $iis(height))} { - StartLoad Frame$which iis new $iis(width) $iis(height) FinishLoad } else { diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl index c7ed0ef..095ef09 100644 --- a/ds9/library/imgsvr.tcl +++ b/ds9/library/imgsvr.tcl @@ -431,7 +431,6 @@ proc IMGSVRParse {varname} { current {} } - StartLoad # alloc it because we are going to delete it after load set loadParam(load,type) allocgz set loadParam(load,layer) {} diff --git a/ds9/library/import.tcl b/ds9/library/import.tcl index 3d69969..5c9a016 100644 --- a/ds9/library/import.tcl +++ b/ds9/library/import.tcl @@ -11,7 +11,6 @@ proc Import {fn format layer mode fn2} { return } - StartLoad switch -- $format { array {ImportArrayFile $fn $layer} rgbarray { diff --git a/ds9/library/load.tcl b/ds9/library/load.tcl index 4af725e..13f9099 100644 --- a/ds9/library/load.tcl +++ b/ds9/library/load.tcl @@ -252,9 +252,6 @@ proc ProcessLoadSaveParams {varname} { } } -proc StartLoad {} { -} - proc FinishLoadPre {} { global loadParam global current diff --git a/ds9/library/macosx.tcl b/ds9/library/macosx.tcl index 7573385..0a78ad7 100644 --- a/ds9/library/macosx.tcl +++ b/ds9/library/macosx.tcl @@ -8,7 +8,6 @@ proc MacOSXOpenDocEvent {fc} { global ds9 if {$ds9(event,opendoc) != {}} { - StartLoad foreach f $ds9(event,opendoc) { MultiLoad LoadFitsFile $f {} {} @@ -26,7 +25,6 @@ proc MacOSXPrintDocEvent {bye} { foreach f $ds9(event,printdoc) { RealizeDS9 - StartLoad MultiLoad LoadFitsFile $f {} {} diff --git a/ds9/library/mecube.tcl b/ds9/library/mecube.tcl index d83434f..138cb24 100644 --- a/ds9/library/mecube.tcl +++ b/ds9/library/mecube.tcl @@ -97,7 +97,6 @@ proc ProcessMECubeCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMECubeSocket $sock $param]} { diff --git a/ds9/library/mosaicimageiraf.tcl b/ds9/library/mosaicimageiraf.tcl index 5226d3e..2bcd5a5 100644 --- a/ds9/library/mosaicimageiraf.tcl +++ b/ds9/library/mosaicimageiraf.tcl @@ -68,7 +68,6 @@ proc ProcessMosaicImageIRAFCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMosaicImageIRAFSocket $sock $param $layer]} { diff --git a/ds9/library/mosaicimagewcs.tcl b/ds9/library/mosaicimagewcs.tcl index 4a1e803..9553baf 100644 --- a/ds9/library/mosaicimagewcs.tcl +++ b/ds9/library/mosaicimagewcs.tcl @@ -103,7 +103,6 @@ proc ProcessMosaicImageWCSCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMosaicImageWCSSocket $sock $param $layer $opt]} { diff --git a/ds9/library/mosaicimagewfpc2.tcl b/ds9/library/mosaicimagewfpc2.tcl index 7d1a854..a2d0dae 100644 --- a/ds9/library/mosaicimagewfpc2.tcl +++ b/ds9/library/mosaicimagewfpc2.tcl @@ -72,7 +72,6 @@ proc ProcessMosaicImageWFPC2Cmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMosaicImageWFPC2Socket $sock $param]} { diff --git a/ds9/library/mosaiciraf.tcl b/ds9/library/mosaiciraf.tcl index de9d4b0..1917a86 100644 --- a/ds9/library/mosaiciraf.tcl +++ b/ds9/library/mosaiciraf.tcl @@ -68,7 +68,6 @@ proc ProcessMosaicIRAFCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMosaicIRAFSocket $sock $param $layer]} { diff --git a/ds9/library/mosaicwcs.tcl b/ds9/library/mosaicwcs.tcl index 23a1d04..621da38 100644 --- a/ds9/library/mosaicwcs.tcl +++ b/ds9/library/mosaicwcs.tcl @@ -111,7 +111,6 @@ proc ProcessMosaicWCSCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadMosaicWCSSocket $sock $param $layer $opt]} { diff --git a/ds9/library/multiframe.tcl b/ds9/library/multiframe.tcl index 63e658f..a9171c9 100644 --- a/ds9/library/multiframe.tcl +++ b/ds9/library/multiframe.tcl @@ -151,7 +151,6 @@ proc ProcessMultiFrameCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa global tcl_platform diff --git a/ds9/library/nrrd.tcl b/ds9/library/nrrd.tcl index babba0f..5215de6 100644 --- a/ds9/library/nrrd.tcl +++ b/ds9/library/nrrd.tcl @@ -105,7 +105,6 @@ proc ProcessNRRDCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![ImportNRRDSocket $sock $param $layer]} { diff --git a/ds9/library/open.tcl b/ds9/library/open.tcl index fb83bd0..7ad417d 100644 --- a/ds9/library/open.tcl +++ b/ds9/library/open.tcl @@ -9,7 +9,6 @@ proc Open {fn format layer mode sys} { return } - StartLoad switch -- $format { fits {LoadFitsFile $fn $layer $mode} mosaicimagewcs {LoadMosaicImageWCSFile $fn $layer $sys} diff --git a/ds9/library/photo.tcl b/ds9/library/photo.tcl index ab79cf4..34d3549 100644 --- a/ds9/library/photo.tcl +++ b/ds9/library/photo.tcl @@ -224,7 +224,6 @@ proc ProcessPhotoCmd {varname iname ch fn} { } set param [lindex $var $i] - StartLoad if {$ch != {}} { # xpa global tcl_platform diff --git a/ds9/library/rgbarray.tcl b/ds9/library/rgbarray.tcl index 655a5f0..14c36a7 100644 --- a/ds9/library/rgbarray.tcl +++ b/ds9/library/rgbarray.tcl @@ -146,7 +146,6 @@ proc ProcessRGBArrayCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![ImportRGBArraySocket $sock $param]} { diff --git a/ds9/library/rgbcube.tcl b/ds9/library/rgbcube.tcl index 0a67989..f25cdb2 100644 --- a/ds9/library/rgbcube.tcl +++ b/ds9/library/rgbcube.tcl @@ -127,7 +127,6 @@ proc ProcessRGBCubeCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadRGBCubeSocket $sock $param]} { diff --git a/ds9/library/rgbimage.tcl b/ds9/library/rgbimage.tcl index 4970e40..dea4bd9 100644 --- a/ds9/library/rgbimage.tcl +++ b/ds9/library/rgbimage.tcl @@ -145,7 +145,6 @@ proc ProcessRGBImageCmd {varname iname sock fn} { } set param [lindex $var $i] - StartLoad if {$sock != {}} { # xpa if {![LoadRGBImageSocket $sock $param]} { diff --git a/ds9/library/sfits.tcl b/ds9/library/sfits.tcl index 97a7585..476da7c 100644 --- a/ds9/library/sfits.tcl +++ b/ds9/library/sfits.tcl @@ -42,7 +42,6 @@ proc ProcessSFitsCmd {varname iname sock fn} { } } - StartLoad if {$sock != {}} { # xpa if {0} { diff --git a/ds9/library/shm.tcl b/ds9/library/shm.tcl index d96014b..ffaf6a7 100644 --- a/ds9/library/shm.tcl +++ b/ds9/library/shm.tcl @@ -12,7 +12,6 @@ proc ProcessShmCmd {varname iname ml} { global current global ds9 - StartLoad set done 0 while {!$done} { diff --git a/ds9/library/smosaiciraf.tcl b/ds9/library/smosaiciraf.tcl index b25ab78..37dba9a 100644 --- a/ds9/library/smosaiciraf.tcl +++ b/ds9/library/smosaiciraf.tcl @@ -48,7 +48,6 @@ proc ProcessSMosaicIRAFCmd {varname iname sock fn layer} { set opt wcs } - StartLoad if {$sock != {}} { # xpa if {0} { diff --git a/ds9/library/smosaicwcs.tcl b/ds9/library/smosaicwcs.tcl index 5bff2f4..782a185 100644 --- a/ds9/library/smosaicwcs.tcl +++ b/ds9/library/smosaicwcs.tcl @@ -48,7 +48,6 @@ proc ProcessSMosaicWCSCmd {varname iname sock fn} { set opt wcs } - StartLoad if {$sock != {}} { # xpa if {0} { diff --git a/ds9/library/srgbcube.tcl b/ds9/library/srgbcube.tcl index 0971070..80c80d7 100644 --- a/ds9/library/srgbcube.tcl +++ b/ds9/library/srgbcube.tcl @@ -48,7 +48,6 @@ proc ProcessSRGBCubeCmd {varname iname sock fn} { } } - StartLoad if {$sock != {}} { # xpa if {0} { diff --git a/ds9/library/url.tcl b/ds9/library/url.tcl index 3e55754..1fd17db 100644 --- a/ds9/library/url.tcl +++ b/ds9/library/url.tcl @@ -70,7 +70,6 @@ proc OpenURLFits {{layer {}} {mode {}}} { set url $fitsurl if {[EntryDialog [msgcat::mc {URL}] [msgcat::mc {Enter URL}] 80 url]} { - StartLoad LoadURLFits $url $layer $mode FinishLoad @@ -272,7 +271,6 @@ proc LoadURLFitsHTTP {url layer mode} { } # alloc it because we are going to delete it after load - StartLoad global loadParam set loadParam(file,type) fits -- cgit v0.12