#3263 creaMaracasVisu Feature New Normal - ViewerNV sync ParallelScale Camera

diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
index 1d85ad87684167d3ace2e6ed7d1748fdd0b81827..46f8d7076f46bd6b20d3b10160081b595a14ac0a 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
@@ -75,6 +75,7 @@ void ColorLayerImageView::Process()
 
     bbSetOutputNewImage( clivp->GetColorLayerImageViewManager()->GetImageChangeInformation(0) );
     bbSetOutputLookupTable( clivp->GetColorLayerImageViewManager()->GetLookupTable(0) );
+
 printf("EED ColorLayerImageView::Process A ptrLookupTable:%p\n",clivp->GetColorLayerImageViewManager()->GetLookupTable(0));
 printf("EED ColorLayerImageView::Process B ptrLookupTable:%p\n",bbGetOutputLookupTable() );
 

diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
index 934b0fe66745ff9982858fc61347fc6746ed6aa2..73656fc52dcf1ab2597536e0e181e5f169d6e1c3 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
@@ -33,6 +33,7 @@
 #include "bbtkWxBlackBox.h"
 
 #include "wxVtkBaseView.h"
+#include <vtkScalarsToColors.h>
 
 #include <vtkScalarsToColors.h>
 
@@ -102,7 +103,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLayerImageView,bbtk::WxBlackBox);
   BBTK_INPUT(ColorLayerImageView,ColorBarPosition,"default (10,105)",std::vector<int>,"");
 
   BBTK_OUTPUT(ColorLayerImageView,NewImage,"Image with correct Spacing",vtkImageData*,"");
-  BBTK_OUTPUT(ColorLayerImageView,LookupTable,"Image with correct Spacing",vtkScalarsToColors*,"");
+  BBTK_OUTPUT(ColorLayerImageView,LookupTable,"LookupTable",vtkScalarsToColors*,"");
 
 BBTK_END_DESCRIBE_BLACK_BOX(ColorLayerImageView);
 //=====

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
index 774d66383e84f740de12ced2a54fcb472bc3c47b..1ba779ef890db57b2a421fa1e0e44174dae30cc6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
@@ -457,7 +457,6 @@ void ColorLayerImageViewManager::GetSpcOriginalLayer(int id,double *spc)
        } // if 
 }
 
-//----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void ColorLayerImageViewManager::SetNewSpacingLayer(double *spc)
 {
@@ -472,6 +471,5 @@ void ColorLayerImageViewManager::SetNewSpacingLayer(double *spc)
 }
 
 
-
 // EOF
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 1a494c76043f5225386ac034b07dfa23aa9df8e3..f63a57ae9f68f0aef62277d9b1eed7a3e9957e0d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -637,5 +637,10 @@ void LayerImageBase::GetImageScalarRange()
        _range[1]=max;
 }
 
+vtkScalarsToColors* LayerImageBase::GetLookupTable()
+{
+       return _thresholdTable;
+}
+
 // EOF
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
index 52235c38fa18e764911bd0e43c870386f7da51e5..f5abbb6b61cc6add81fd915486288db483203e15 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -119,6 +119,7 @@ class LayerImageBase
                void GetDimensionBase(int *dim);
                void GetSpcOriginalLayer(double *spc);
                void GetSpcBase(double *spc);
+               vtkScalarsToColors* GetLookupTable();
 
   private:
                int                                                     _X;