new mask

1 files changed, 18 insertions, 30 deletions

diff --git a/tksao/frame/baseload.C b/tksao/frame/baseload.C
index bf40130..2e9fffd 100644
--- a/tksao/frame/baseload.C
+++ b/tksao/frame/baseload.C
@@ -114,24 +114,21 @@ void Base::loadArrChannelCmd(const char* ch, const char* fn, LayerType ll)
 {
   unloadFits();
   FitsImage* img = new FitsImageArrChannel(currentContext, interp,
-					   ch, fn, 
-					   FitsFile::NOFLUSH, 1);
+					   ch, fn, FitsFile::NOFLUSH, 1);
   loadDone(currentContext->load(CHANNEL, fn, img));
 }
 
 void Base::loadArrMMapCmd(const char* fn, LayerType ll)
 {
   unloadFits();
-  FitsImage* img = new FitsImageArrMMap(currentContext, interp,
-					fn, 1);
+  FitsImage* img = new FitsImageArrMMap(currentContext, interp, fn, 1);
   loadDone(currentContext->load(MMAP, fn, img));
 }
 
 void Base::loadArrMMapIncrCmd(const char* fn, LayerType ll)
 {
   unloadFits();
-  FitsImage* img = new FitsImageArrMMapIncr(currentContext, interp,
-					    fn, 1);
+  FitsImage* img = new FitsImageArrMMapIncr(currentContext, interp, fn, 1);
   loadDone(currentContext->load(MMAPINCR, fn, img));
 }
 
@@ -163,8 +160,7 @@ void Base::loadArrSocketGZCmd(int s, const char* fn, LayerType ll)
 void Base::loadArrVarCmd(const char* ch, const char* fn, LayerType ll)
 {
   unloadFits();
-  FitsImage* img = new FitsImageArrVar(currentContext, interp,
-				       ch, fn, 1);
+  FitsImage* img = new FitsImageArrVar(currentContext, interp, ch, fn, 1);
   loadDone(currentContext->load(VAR, fn, img));
 }
 
@@ -181,57 +177,49 @@ void Base::loadENVISMMapCmd(const char* hdr, const char* fn)
 
 void Base::loadNRRDAllocCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageNRRDAlloc(currentContext, interp, 
 					  ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->load(ALLOC, fn, img), ll);
+  loadDone(currentContext->load(ALLOC, fn, img));
 }
 
 void Base::loadNRRDChannelCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageNRRDChannel(currentContext, interp, 
-					    ch, fn, 
-					   FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->load(CHANNEL, fn, img), ll);
+					    ch, fn, FitsFile::NOFLUSH, 1);
+  loadDone(currentContext->load(CHANNEL, fn, img));
 }
 
 void Base::loadNRRDMMapCmd(const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageNRRDMMap(currentContext, interp, fn, 1);
-  loadDone(currentContext->load(MMAP, fn, img), ll);
+  loadDone(currentContext->load(MMAP, fn, img));
 }
 
 void Base::loadNRRDShareCmd(ShmType stype, int id, const char* fn, 
 			   LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageNRRDShare(currentContext, interp, 
 					  stype, id, fn, 1);
-  loadDone(currentContext->load(SHARE, fn, img), ll);
+  loadDone(currentContext->load(SHARE, fn, img));
 }
 
 void Base::loadNRRDSocketCmd(int s, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageNRRDSocket(currentContext, interp, 
 					   s, fn, FitsFile::FLUSH, 1);
-  loadDone(currentContext->load(SOCKET, fn, img), ll);
+  loadDone(currentContext->load(SOCKET, fn, img));
 }
 
 void Base::loadNRRDVarCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
-  FitsImage* img = new FitsImageNRRDVar(currentContext, interp, 
-					ch, fn, 1);
-  loadDone(currentContext->load(VAR, fn, img), ll);
+  unloadFits();
+  FitsImage* img = new FitsImageNRRDVar(currentContext, interp, ch, fn, 1);
+  loadDone(currentContext->load(VAR, fn, img));
 }
 
 // *** Photo ***