#3009 creaMaracasVisu Feature New Normal - Interpolate option in box ViewerNV

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index a53f035ec2421be2185950c90eba8b1759fb709a..84c3c609dd20fdad9e612e648d49aed7ff9dd065 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -42,30 +42,35 @@ wxVtkClipping3DView::wxVtkClipping3DView(wxVtk3DBaseView* wxvtk3Dbaseview)
 //-------------------------------------------------------------------
 wxVtkClipping3DView::~wxVtkClipping3DView()
 {
-       if (_boxWidgetVolume!=NULL)                              { _boxWidgetVolume     -> Delete();                                    }
-       if (_boxWidgetS1!=NULL)                                  { _boxWidgetS1         -> Delete();                                    }
+       if (_boxWidgetVolume!=NULL)                              { _boxWidgetVolume     -> Delete();                    }
+       if (_boxWidgetS1!=NULL)                                  { _boxWidgetS1         -> Delete();                    }
        if (_vtkclipping3Ddataviewer!=NULL)              { delete _vtkclipping3Ddataviewer;                     }
        if (_wxvtkclipping3DviewCntrlPanel!=NULL){ delete _wxvtkclipping3DviewCntrlPanel;       }
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetVisibleBoxSurface(bool visible)
 {
-       if (visible==true){
+       if (visible==true)
+       {
                _boxWidgetS1->On();
        } else {
                _boxWidgetS1->Off();
        }
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::VisibleVolumeBoxActor(bool visible)
 {
-       if (visible!=_vtkclipping3Ddataviewer->GetVisibleVolumeBox() ){
+       if (visible!=_vtkclipping3Ddataviewer->GetVisibleVolumeBox() )
+       {
         VisibleVolumeActor(!visible);
         _vtkclipping3Ddataviewer->BoxActorChanged(visible);
         _vtkclipping3Ddataviewer->SetVisibleVolumeBox(visible);
         _vtkclipping3Ddataviewer->SetVisibleVolume(!visible);
        }
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::Refresh()
 {
@@ -75,6 +80,7 @@ void wxVtkClipping3DView::Refresh()
                _wxvtkclipping3DviewCntrlPanel->Refresh();
        }
 }
+
 //-------------------------------------------------------------------
 wxPanel* wxVtkClipping3DView::CreateSurfControlPanel(wxWindow *parent)
 {
@@ -90,12 +96,12 @@ wxPanel* wxVtkClipping3DView::CreateVolControlPanel(wxWindow *parent)
        return _wxvtkclipping3DviewVolCntrlPanel;
 }
 
-
 //-------------------------------------------------------------------
 vtkClipping3DDataViewer* wxVtkClipping3DView::GetVtkClipping3DDataViewer()
 {
        return _vtkclipping3Ddataviewer;
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::VisibleActor(int idTissue, bool visTissue){
        if (visTissue!=_vtkclipping3Ddataviewer->GetVisibleTissue(idTissue)){
@@ -109,6 +115,7 @@ void wxVtkClipping3DView::VisibleActor(int idTissue, bool visTissue){
                _vtkclipping3Ddataviewer->SetVisibleTissue(idTissue,visTissue);
        }
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetRepSurfaceWireFrame(int idTissue , bool representationType )
 {
@@ -145,6 +152,7 @@ void wxVtkClipping3DView::VisibleVolumeActor( bool visVolume){
        }
 
 }
+
 //-------------------------------------------------------------------
 wxVtk3DBaseView* wxVtkClipping3DView::GetWxvtk3Dbaseview()throw(char*)
 {
@@ -153,6 +161,7 @@ wxVtk3DBaseView* wxVtkClipping3DView::GetWxvtk3Dbaseview()throw(char*)
        }
        return _wxvtk3Dbaseview;
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::Configure()
 {
@@ -172,7 +181,12 @@ void wxVtkClipping3DView::Configure()
 
 
        _boxWidgetS1->SetInput( polydata );
-       _boxWidgetS1->PlaceWidget();
+
+//EED 2016-08-19       
+       //_boxWidgetS1->PlaceWidget();
+       int ext[6];
+       this->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData()->GetExtent(ext);
+       _boxWidgetS1->PlaceWidget(ext[0],ext[1],ext[2],ext[3],ext[4],ext[5]);
 
        int i;
        for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
@@ -180,9 +194,6 @@ void wxVtkClipping3DView::Configure()
                _boxWidgetS1->AddObserver( vtkCommand::InteractionEvent, _vtkclipping3Ddataviewer->GetObserverS(i) );
        }
 
-
-
-
 //     _wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkclipping3Ddataviewer->GetTissueActor(0) );
 //     _wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkclipping3Ddataviewer->GetTissueActor(3));
 
@@ -195,7 +206,6 @@ void wxVtkClipping3DView::Configure()
 
 //EED 29Mars2009
 //     _boxWidgetS1->On();
-
        _boxWidgetS1->Off();
 
        _boxWidgetS1->GetPlanes( this->GetVtkClipping3DDataViewer()->GetTissuePlanes(0) );
@@ -208,24 +218,18 @@ void wxVtkClipping3DView::Configure()
        _boxWidgetVolume = vtkBoxWidget::New();
        _boxWidgetVolume->SetInteractor( _wxvtk3Dbaseview->GetWxVTKRenderWindowInteractor() );
        _boxWidgetVolume->SetPlaceFactor(1.25);
-
        _boxWidgetVolume->SetInput( this->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData() );
        _boxWidgetVolume->PlaceWidget();
-
-       _boxWidgetVolume->AddObserver( vtkCommand::InteractionEvent              , _vtkclipping3Ddataviewer->GetObserverV() );
-
+       _boxWidgetVolume->AddObserver( vtkCommand::InteractionEvent, _vtkclipping3Ddataviewer->GetObserverV() );
        _boxWidgetVolume->HandlesOn ();
 
 //EED 29Mars2009
 //     _boxWidgetVolume->On();
-
        _boxWidgetVolume->Off();
 
-
 //     vtkPlanes *vtkplanes=this->GetVtkClipping3DDataViewer()->GetVolumePlanes();
 //     _boxWidgetVolume->GetPlanes( vtkplanes );
 
-
 //EED 27/05/2013
 //  _wxvtk3Dbaseview->GetRenderer()->ResetCamera ();
 //  _wxvtk3Dbaseview->GetCamera()->Dolly(1.2);
@@ -250,8 +254,6 @@ void wxVtkClipping3DView::Configure()
 
        _vtkclipping3Ddataviewer->SetRenderer(this->GetWxvtk3Dbaseview()->GetRenderer());
        _vtkclipping3Ddataviewer->SetInteractor(this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor());
-
-
 }
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetVtkClipping3DDataViewer(vtkClipping3DDataViewer *vtkclipping3Ddataviewer)