#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 eb70d3e92999533420fa33637be5cb1f2d839d45..a283606543dea92ca61c0af924dcf5c58c85455f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -165,6 +165,20 @@ bool LayerImageBase::GetActorPresent()
 void LayerImageBase::SetImage(vtkImageData* image)
 {
        _image = image;
+       double spc[3];
+       _image->GetSpacing(spc);
+       int ext[6];
+       _image->GetWholeExtent(ext);
+       int sx=ext[1]-ext[0]+1;
+       int sy=ext[3]-ext[2]+1;
+       int sz=ext[5]-ext[4]+1;
+       int ssx=(sx/2)*spc[0];
+       int ssy=(sy/2)*spc[1];
+       int ssz=(sz/2)*spc[2];
+       SetX( ssx );
+       SetY( ssy );
+       SetZ( ssz );
+       _image = image;
 }
 
 //----------------------------------------------------------------------------
@@ -173,10 +187,6 @@ void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
        if (_baseView==NULL)
    {
                _baseView = baseview;
-// Old EED 2014 11 13
-//     vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_baseView->GetInteractorStyleBaseView());
-//     isbv->AddInteractorStyleMaracas( new ColorLayerImageBasevtkInteractor(this) );
-
                ColorLayerObserver *colorlayerobserver = ColorLayerObserver::New();
                _baseView->GetVtkBaseData()->AddObserver( 1, colorlayerobserver );
                colorlayerobserver->SetLayerImageBase(this);
@@ -248,8 +258,11 @@ 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();
@@ -272,6 +285,7 @@ void LayerImageBase::onThreshold()
 
                if (!GetActorPresent())
                {
+printf("EED LayerImageBase::onThreshold 2 \n");
                        if (_thresholdTable==NULL)
                        {
                                //Lookup Table
@@ -313,6 +327,8 @@ void LayerImageBase::onThreshold()
                _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 );