fix overlay problem

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 35e91c5315bdbd3c7166b22c153c83db6fd27597..01501622b85e983d75bd5a386ffcf65ef3cd362f 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -1285,7 +1285,7 @@ void vvMainWindow::DisplayChanged(QTreeWidgetItem *clicked_item, int column) {
                 current_slicer->SetActorVisibility(overlay_type,overlay_counts[overlay_type]-1,false);
             }
         }
-        //mSlicerManagers[i]->SetColorMap(-1);
+        mSlicerManagers[i]->SetColorMap();
     }
     mSlicerManagers[index]->GetSlicer(column-1)->Render();
 }

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 1151a08c88e4aac7bcc46847d78372b7251ea891..3f096644d374fa3ed04612f3fb8aa325e6b51ad9 100644 (file)
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -868,6 +868,10 @@ void vvSlicerManager::SetPreset(int preset)
     //    SetColorMap(-1);
     //}
 }
+void vvSlicerManager::SetColorMap()
+{
+    SetColorMap(mColorMap);
+}
 
 void vvSlicerManager::SetColorMap(int colormap)
 {
@@ -966,9 +970,9 @@ void vvSlicerManager::SetColorMap(int colormap)
         }
         else if (mSlicers[i]->GetOverlay())
         {
-            dynamic_cast<vvImageMapToWLColors*>(mSlicers[i]->GetWindowLevel())
-                ->SetWindowLevelMode(false);
-            mSlicers[i]->GetWindowLevel()->SetLookupTable(NULL);
+            //dynamic_cast<vvImageMapToWLColors*>(mSlicers[i]->GetWindowLevel())
+                //->SetWindowLevelMode(false);
+            mSlicers[i]->GetWindowLevel()->SetLookupTable(LUT);
         }
         else
         {

diff --git a/vv/vvSlicerManager.h b/vv/vvSlicerManager.h
index 9ab66417641d155c2185861a5a7caacf47f5e0b8..665153128fe928f5ba1b9667d25e7ad347c83231 100644 (file)
--- a/vv/vvSlicerManager.h
+++ b/vv/vvSlicerManager.h
@@ -134,6 +134,7 @@ public:
     void SetColorWindow(double s);
     void SetColorLevel(double s);
     void SetOpacity(int i, double factor);
+    void SetColorMap();
     void SetColorMap(int colormap);
     void SetPreset(int preset);
     void SetOverlayColor(int color) {