#2961 creaMaracasVisu Feature New Normal - new SliderMinMax-flexible complexbox

[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 a86251cddaa68abde26eba60a6d3a7b2560c367e..d7e3e7284cfb40319a7f7f6176bcbccf876ae29a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -152,7 +152,14 @@ int LayerImageBase::GetZ()  // virtual
 vtkImageData* LayerImageBase::GetImage()
 {
 //     return _image;
-       return _imageChangeInformation->GetOutput();
+       vtkImageData *result;
+       if (_image==NULL)
+       {
+               result = NULL;
+       } else {
+               result = _imageChangeInformation->GetOutput();
+       }
+       return result;
 }
 
 //----------------------------------------------------------------------------
@@ -166,7 +173,23 @@ bool LayerImageBase::GetActorPresent()
 void LayerImageBase::SetImage(vtkImageData* image)
 {
        int     ext[6];
+       double  spcBase[3];
        int     dimensionOriginalLayer[3];
+       int     dimBase[6];
+
+       ext[0]=0;
+       ext[1]=0;
+       ext[2]=0;
+       ext[3]=0;
+       ext[4]=0;
+       ext[5]=0;
+       spcBase[0]=0;
+       spcBase[1]=0;
+       spcBase[2]=0;
+       spcBase[3]=0;
+       spcBase[4]=0;
+       spcBase[5]=0;
+
        _image = image;
        _image->GetWholeExtent(ext);
        dimensionOriginalLayer[0] = ext[1]-ext[0]+1;
@@ -181,13 +204,11 @@ void LayerImageBase::SetImage(vtkImageData* image)
                vtkImageData    *imagebase              =       GetwxVtkBaseView()->GetVtkBaseData()->GetImageData();
                if (imagebase!=NULL) 
                {       
-                       int dimBase[6];
                        imagebase->GetWholeExtent(ext);
                        dimBase[0]=ext[1]-ext[0]+1;                             
                        dimBase[1]=ext[3]-ext[2]+1;                             
                        dimBase[2]=ext[5]-ext[4]+1;                             
                        SetDimensionBase(dimBase);
-                       double  spcBase[3];
                        imagebase->GetSpacing(spcBase);
                        SetSpcBase(spcBase);
                        SetX( dimBase[0]*spcBase[0]/2 );
@@ -311,7 +332,6 @@ void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
                ColorLayerObserver *colorlayerobserver = ColorLayerObserver::New();
                _baseView->GetVtkBaseData()->AddObserver( 1, colorlayerobserver );
                colorlayerobserver->SetLayerImageBase(this);
-
        } // if _baseView
 }
 
@@ -340,42 +360,34 @@ vtkLookupTable* LayerImageBase::GetThresholdTable()
 //----------------------------------------------------------------------------
 void LayerImageBase::CleanXYZ(double &x, double &y, double &z)
 {
-
        if (x<0)
        {
                x=0;
        }
-
        if (y<0)
        {
                y=0;
        }
-
        if (z<0)
        {
                z=0;
        }
-
        double maxSize;
-
        maxSize=_dimOriginalLayer[0]*_newSpcLayer[0];
        if ( x > maxSize  )
        {
                x=maxSize;
        }
-
        maxSize=_dimOriginalLayer[1]*_newSpcLayer[1];
        if ( y > maxSize  )
        {
                y = maxSize;
        }
-
        maxSize=_dimOriginalLayer[2]*_newSpcLayer[2];
        if ( z > maxSize  )
        {
                z = maxSize;
        }
-
        
 /*
 
@@ -402,26 +414,16 @@ void LayerImageBase::onThreshold()
 {
        if ((_image!=NULL) && (_baseView!=NULL))
        {
-double spc[3];
-GetImage()-> GetSpacing(spc);
-printf("EED  LayerImageBase::onThreshold  A img-spc %f  %f  %f\n", spc[0],spc[1],spc[2]);
                double x=GetX();
                double y=GetY();
                double z=GetZ();
 
-//             x = x*spc[0];
-//             y = y*spc[1];
-//             z = z*spc[2];
-
-               
                x = x*_spcBase[0];
                y = y*_spcBase[1];
                z = z*_spcBase[2];
 
-
                CleanXYZ(x,y,z);
 
-
                vtkCamera *camera = _baseView->GetRenderer()->GetActiveCamera();
                int directionViewer=0;
                if (camera->GetParallelProjection()==1)
@@ -430,7 +432,6 @@ printf("EED  LayerImageBase::onThreshold  A img-spc %f  %f  %f\n", spc[0],spc[1]
                        directionViewer =  wxvtk2dbasevie->GetDirection();
                } // ParallelProjection
 
-
                if (!GetActorPresent())
                {
                        if (_thresholdTable==NULL)
@@ -507,8 +508,8 @@ printf("EED  LayerImageBase::onThreshold  A img-spc %f  %f  %f\n", spc[0],spc[1]
                _thresholdMapper->SetLookupTable( _thresholdTable );
                _thresholdActor->SetInput( _thresholdMapper->GetOutput() );
                
-//             _scalarbarActor->SetLookupTable( _thresholdTable );
-               _scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
+               _scalarbarActor->SetLookupTable( _thresholdTable );
+//             _scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
                _scalarbarActor->SetTitle("Value");
                _scalarbarActor->SetNumberOfLabels(4);
                int fontsize = _scalarbarActor->GetLabelTextProperty()->GetFontSize();
@@ -516,9 +517,6 @@ printf("EED  LayerImageBase::onThreshold  A img-spc %f  %f  %f\n", spc[0],spc[1]
 
 //             _scalarbarActor->SetTextPad(4);  ??
 
-GetImage()-> GetSpacing(spc);
-printf("EED  LayerImageBase::onThreshold  B img-spc %f  %f  %f\n", spc[0],spc[1],spc[2]);
-
 
                } // _image
 }