new mask

5 files changed, 7 insertions, 15 deletions

diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index 808ada8..817107c 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -378,7 +378,6 @@ public:
   virtual int isFrame3d() {return 0;}
   virtual int isFrameRGB() {return 0;}
 
-  virtual void loadDone(int, LayerType);
   virtual void loadDone(int);
 
   void markerAnalysisHistogram(Marker*, double**, double**, const BBox&, int);
diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C
index 792f660..7e576dc 100644
--- a/tksao/frame/basecommand.C
+++ b/tksao/frame/basecommand.C
@@ -40,7 +40,7 @@ void Base::axesOrderCmd(int order)
     //      delete grid;
     //    grid = NULL;
 
-    loadDone(1,IMG);
+    loadDone(1);
   }
 }
 
diff --git a/tksao/frame/baseload.C b/tksao/frame/baseload.C
index 3316659..a9e02de 100644
--- a/tksao/frame/baseload.C
+++ b/tksao/frame/baseload.C
@@ -654,11 +654,6 @@ void Base::loadMosaicImageWFPC2VarCmd(const char* ch, const char* fn)
 
 // ***
 
-void Base::loadDone(int rr, LayerType ll)
-{
-  loadDone(rr);
-}
-
 void Base::loadDone(int rr)
 {
   if (rr) {
diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C
index 1bbaeed..12583ef 100644
--- a/tksao/frame/framergb.C
+++ b/tksao/frame/framergb.C
@@ -659,17 +659,15 @@ void FrameRGB::loadRGBFinish()
   update(MATRIX);
 }
 
-void FrameRGB::loadDone(int rr, LayerType ll)
+void FrameRGB::loadDone(int rr)
 {
   if (rr) {
-    if (ll == IMG) {
-      if (!keyContextSet) {
-	keyContext = currentContext;
-	keyContextSet =1;
-      }
+    if (!keyContextSet) {
+      keyContext = currentContext;
+      keyContextSet =1;
     }
 
-    Base::loadDone(rr, ll);
+    Base::loadDone(rr);
   }
 }
 
diff --git a/tksao/frame/framergb.h b/tksao/frame/framergb.h
index 19819a9..1637f40 100644
--- a/tksao/frame/framergb.h
+++ b/tksao/frame/framergb.h
@@ -59,7 +59,7 @@ class FrameRGB : public FrameBase {
  protected:
   int isFrameRGB() {return 1;}
 
-  void loadDone(int, LayerType);
+  void loadDone(int);
 
   unsigned char* fillImage(int, int, Coord::InternalSystem);
   void updateColorCells(unsigned char*, int);