BUG MACOS

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index 38720c05fa171d1f1687f091a58fc50a80cdc41c..13a93481dc55c866945757aca37fef6aa73b0d69 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMPRWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/24 10:49:21 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/03/30 15:31:15 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -2474,7 +2474,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        ckBoxX->SetValue(false);
        ckBoxY->SetValue(false);
        ckBoxZ->SetValue(false);
-       _ckBoxXYZ->SetValue(true);
+       _ckBoxXYZ->SetValue(false);
        _ckBoxPlane->SetValue(false);
 
        _positionX->SetSize(400,20);
@@ -3574,7 +3574,6 @@ void wxVtkMPR3DView::Configure(){
        _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange();
 
 
-
        // vtkPointWidget
        _myCallback = vtkmyPWCallback_3DPointWidget::New();
        _myCallback->SetWxVtkMPR3DView(this);
@@ -3583,10 +3582,16 @@ void wxVtkMPR3DView::Configure(){
        _myCallback->SetVtkPointWidget(_pointWidget);
        _pointWidget->SetInteractor( GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor() ); 
        _pointWidget->SetInput( GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetImageData() );
+       
        _pointWidget->AllOff();
+       
        _pointWidget->PlaceWidget();
 //     _pointWidget->SetPosition( x,y,z ); 
-       _pointWidget->On();
+       
+//EED01 29Mars2009
+// MACOS probleme vtk-window out of wx-window  
+//     _pointWidget->On();
+       
        _pointWidget->AddObserver(vtkCommand::InteractionEvent,_myCallback);
 
 
@@ -3619,10 +3624,12 @@ void wxVtkMPR3DView::Configure(){
     contourMapper->SetScalarRange( imageData->GetScalarRange() );
        _contourPlaneActor = vtkActor::New();
        _contourPlaneActor->SetMapper(contourMapper);
+
        _contourPlaneActor->VisibilityOff();
 
        _planeWidget->SetInteractor( GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor() );
        _planeWidget->AddObserver(vtkCommand::InteractionEvent,_myCallback);
+
        _planeWidget->Off();
        _wxvtk3Dbaseview->GetRenderer()->AddActor( _contourPlaneActor );                        
 }
@@ -4017,7 +4024,10 @@ void wxVtkClipping3DView::Configure(){
        VisibleActor(3, false );
 
        _boxWidgetS1->HandlesOn ();
-       _boxWidgetS1->On();
+       
+//EED 29Mars2009       
+//     _boxWidgetS1->On();
+       
        _boxWidgetS1->Off();
 
        _boxWidgetS1->GetPlanes( this->GetVtkClipping3DDataViewer()->GetTissuePlanes(0) );
@@ -4037,7 +4047,10 @@ void wxVtkClipping3DView::Configure(){
        _boxWidgetVolume->AddObserver( vtkCommand::InteractionEvent              , _vtkclipping3Ddataviewer->GetObserverV() );
 
        _boxWidgetVolume->HandlesOn ();
-       _boxWidgetVolume->On();
+       
+//EED 29Mars2009       
+//     _boxWidgetVolume->On();
+       
        _boxWidgetVolume->Off();
 
 
@@ -5936,8 +5949,10 @@ void wxMPRWidget::ConfigureVTK(){
        {
                _wxvtk3Dbaseview_Clipping3D_BB->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( vtkinteractorstyle3Dview );
        }
-
-       RefreshView(true);
+       
+//EED 29Mars2009
+//     RefreshView(true);
+       
 }
 
 //----------------------------------------------------------------------------