]> Creatis software - creaMaracasVisu.git/commitdiff
#3263 creaMaracasVisu Feature New Normal - ViewerNV sync ParallelScale Camera
authorEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Thu, 6 Jun 2019 09:42:34 +0000 (11:42 +0200)
committerEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Thu, 6 Jun 2019 09:42:34 +0000 (11:42 +0200)
1  2 
bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h

index 1d85ad87684167d3ace2e6ed7d1748fdd0b81827,0fc2242b4f08dce552bb5ecdcb128a5af1cb911f..46f8d7076f46bd6b20d3b10160081b595a14ac0a
@@@ -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;
index 934b0fe66745ff9982858fc61347fc6746ed6aa2,9b8cdc43fe22d2661060d8aaa526804993c078d9..73656fc52dcf1ab2597536e0e181e5f169d6e1c3
  #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..
index 774d66383e84f740de12ced2a54fcb472bc3c47b,9f5de8ad3c63ee107d81ba23cb9a432b48b64706..1ba779ef890db57b2a421fa1e0e44174dae30cc6
@@@ -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
  
index 1a494c76043f5225386ac034b07dfa23aa9df8e3,5fd366cd9ce03bc4f4bf3c44684e1707702fd12b..f63a57ae9f68f0aef62277d9b1eed7a3e9957e0d
@@@ -637,5 -598,13 +637,10 @@@ void LayerImageBase::GetImageScalarRang
        _range[1]=max;
  }
  
 -
 -
 -
+ vtkScalarsToColors* LayerImageBase::GetLookupTable()
+ {
+       return _thresholdTable;
+ }
  // EOF