From: Eduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Thu, 6 Jun 2019 09:42:34 +0000 (+0200)
Subject: #3263 creaMaracasVisu Feature New Normal  -  ViewerNV sync ParallelScale Camera
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e263b7ace0f53d647a731553a3f67700838ad146;p=creaMaracasVisu.git

#3263 creaMaracasVisu Feature New Normal  -  ViewerNV sync ParallelScale Camera
---

e263b7ace0f53d647a731553a3f67700838ad146
diff --cc bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
index 1d85ad8,0fc2242..46f8d70
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
@@@ -75,9 -75,7 +75,10 @@@ 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() );
 +
    	 if (firsttime==true)
  	 {
  		firsttime=false;
diff --cc bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
index 934b0fe,9b8cdc4..73656fc
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
@@@ -33,10 -33,8 +33,11 @@@
  #include "bbtkWxBlackBox.h"
  
  #include "wxVtkBaseView.h"
+ #include <vtkScalarsToColors.h>
  
 +#include <vtkScalarsToColors.h>
 +
 +
  namespace bbcreaMaracasVisu
  {
  
@@@ -102,8 -100,9 +103,8 @@@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLaye
    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);
  //=====
  // Don't edit this file. This file is generated from xml description..
diff --cc lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
index 774d663,9f5de8a..1ba779e
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
@@@ -471,7 -457,16 +470,6 @@@ void ColorLayerImageViewManager::SetNew
    } // for 
  }
  
 -//----------------------------------------------------------------------------
 -vtkScalarsToColors* ColorLayerImageViewManager::GetLookupTable(int id)
 -{
 -	vtkScalarsToColors* lookuptable;
 -	if (_colorLayerImageViewLst[id]!=NULL)
 -	{
 -  	   lookuptable = _colorLayerImageViewLst[id]->GetLookupTable( );
 -	} // if 
 -	return lookuptable;
 -}
  
- 
  // EOF
  
diff --cc lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 1a494c7,5fd366c..f63a57a
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@@ -637,5 -598,13 +637,10 @@@ void LayerImageBase::GetImageScalarRang
  	_range[1]=max;
  }
  
+ vtkScalarsToColors* LayerImageBase::GetLookupTable()
+ {
+ 	return _thresholdTable;
+ }
+ 
 -
 -
 -
  // EOF