Bug #1373

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index 0bd418b97977409f6bca5000cdc194fb7bc1fb46..b98d250d80c6e18926fe68cea4cb3ecc1dc66759 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -46,14 +46,9 @@ vtkMPRBaseData *wxVtkMPR2DView::GetVtkmprbasedata()
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Configure()
 {
-       printf("EED wxVtkMPR2DView::Configure");
-       
        wxVtk2DBaseView::Configure();
-
-
        int x1,x2,y1,y2,z1,z2;
        GetVtkmprbasedata()     -> GetDimensionExtention(&x1,&x2,&y1,&y2,&z1,&z2);
-
        double spc[3];
        vtkImageData* img =  GetVtkmprbasedata()->GetImageData();
        if(_interactorstylemprview==NULL)
@@ -81,9 +76,6 @@ void wxVtkMPR2DView::Configure()
                z2 = (int)(z2*spc[2]);
 
                _visibleAxis = true;
-
-
-
        }
 
        // Axe A
@@ -96,11 +88,8 @@ void wxVtkMPR2DView::Configure()
                _ptsA->SetNumberOfPoints(2);
                _ptsA->SetPoint(0, -1000        , -1000 , -1000 );
                _ptsA->SetPoint(1,  1000        ,  1000 ,  1000 );
-
                _pdA = vtkPolyData::New();
-
                _lineAMapper = vtkPolyDataMapper::New();
-
                _lineAMapper->SetInput(_pdA);
                _lineAMapper->ImmediateModeRenderingOn();
                _lineAActor->SetMapper(_lineAMapper);
@@ -123,12 +112,10 @@ void wxVtkMPR2DView::Configure()
                _lineBActor->GetProperty()->SetLineWidth(0.5);
                _lineBMapper                                    =       vtkPolyDataMapper::New();
                _lineBActor->SetMapper(_lineBMapper);
-
                _ptsB = vtkPoints::New();
                _ptsB->SetNumberOfPoints(2);
                _ptsB->SetPoint(0, -1000        , -1000 , -1000 );
                _ptsB->SetPoint(1,  1000        ,  1000 ,  1000 );
-
 //             _lineBActor->GetProperty()->BackfaceCullingOn();
        }
 
@@ -141,12 +128,8 @@ void wxVtkMPR2DView::Configure()
        _pdB->SetPoints( _ptsB );
        _pdB->SetLines( linesB );
        linesB->Delete();  //do not delete lines ??
-
-
        _lineBMapper->SetInput(_pdB);
        _lineBMapper->ImmediateModeRenderingOn();
-
-
        if(_imageViewer2XYZ){
                _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
                _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineBActor );
@@ -202,7 +185,6 @@ void wxVtkMPR2DView::Configure()
        //      _imageViewer2XYZ->GetVtkImageViewer2()->SetColorWindow (160);
        //      _imageViewer2XYZ->GetVtkImageViewer2()->SetColorLevel (800);
        }
-
 }
 
 void wxVtkMPR2DView::SetVisibleAxis(bool ok)
@@ -227,16 +209,7 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Refresh()
 {
-
-       printf("wxVtkMPR2DView::Refresh start\n");
-
        //wxVtk2DBaseView::Refresh();
-
-
-       //vtkImageViewer2 *IV2=_imageViewer2XYZ->GetVtkImageViewer2(); // JPRx
-       //vtkCamera *camera = IV2->GetRenderer()->GetActiveCamera(); // JPRx
-
-
        int x1 = 0,x2 = 0,y1 = 0,y2 = 0,z1 = 0,z2 = 0;
        int x = 0, y = 0, z = 0;
        int xx = 0, yy = 0, zz = 0;
@@ -245,10 +218,6 @@ void wxVtkMPR2DView::Refresh()
        
        double xx1,yy1,zz1,xx2,yy2,zz2;
        
-
-       //GetVtkmprbasedata()->GetDimensionExtention(&x1,&x2,&y1,&y2,&z1,&z2);
-
-
        vtkImageData* img = GetVtkmprbasedata()->GetImageData();
        if(img!=NULL){
                origin = img->GetOrigin();
@@ -346,13 +315,9 @@ void wxVtkMPR2DView::Refresh()
                        _backZ=zz;
                }
 
-//EED 24oct2010
-_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->Modified();
-
+//EED 01nov2012
+               UpdateColorWindowLevel();
                wxVtkBaseView::Refresh();
-               
-               printf("wxVtkMPR2DView::Refresh end\n");
-               
        }
 }
 //-------------------------------------------------------------------