#2651 creaMaracasVisu Feature New Normal - Color Layer: Transparent Base, Refresh

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / ThresholdImageView / LayerImageBase.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index a283606543dea92ca61c0af924dcf5c58c85455f..f7d28feb9559e31fc364fc435bea5e149ac6de58 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -164,10 +164,10 @@ bool LayerImageBase::GetActorPresent()
 //----------------------------------------------------------------------------
 void LayerImageBase::SetImage(vtkImageData* image)
 {
-       _image = image;
        double spc[3];
-       _image->GetSpacing(spc);
        int ext[6];
+       _image = image;
+       _image->GetSpacing(spc);
        _image->GetWholeExtent(ext);
        int sx=ext[1]-ext[0]+1;
        int sy=ext[3]-ext[2]+1;
@@ -178,9 +178,29 @@ void LayerImageBase::SetImage(vtkImageData* image)
        SetX( ssx );
        SetY( ssy );
        SetZ( ssz );
-       _image = image;
+       _image->Update();
+   _image->GetScalarRange( _range );
 }
 
+void LayerImageBase::SetRangeForColorBar(std::vector<double> &range)
+{
+   _rangeForColorBar=range;
+}
+
+void LayerImageBase::GetRangeForColorBar(double &minRange, double &maxRange)
+{
+       if (_rangeForColorBar.size()==2)
+       {
+               minRange = _rangeForColorBar[0];        
+               maxRange = _rangeForColorBar[1];
+       } else {
+               minRange = _range[0];   
+               maxRange = _range[1];
+       }
+}
+
+
+
 //----------------------------------------------------------------------------
 void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 {
@@ -258,11 +278,8 @@ void LayerImageBase::CleanXYZ(double &x, double &y, double &z)
 //----------------------------------------------------------------------------
 void LayerImageBase::onThreshold()
 {
-printf("EED LayerImageBase::onThreshold Start \n");
-
        if ((_image!=NULL) && (_baseView!=NULL))
        {
-printf("EED LayerImageBase::onThreshold 1 \n");
                double spc[3];
                GetImage()-> GetSpacing(spc);
                double x=GetX();
@@ -285,7 +302,6 @@ printf("EED LayerImageBase::onThreshold 1 \n");
 
                if (!GetActorPresent())
                {
-printf("EED LayerImageBase::onThreshold 2 \n");
                        if (_thresholdTable==NULL)
                        {
                                //Lookup Table
@@ -327,8 +343,6 @@ printf("EED LayerImageBase::onThreshold 2 \n");
                _imageReslicer->SetInput( GetImage() );
                _imageReslicer->SetInformationInput( GetImage() );
 
-printf("EED LayerImageBase::onThreshold  directionViewer=%d\n", directionViewer );
-
                if (directionViewer==0)
                {
                        _imageReslicer->SetResliceAxesDirectionCosines( 0,0,1, 0,1,0,  -1,0,0 );