X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkClipping3DView.cxx;h=3d1d5a9a7ef7eae2435410048de036bd2b8c5828;hb=c128e1b6226fcf4e036de57411dee1b7740c1627;hp=9a984c58bf26306e8fd105ccdbdd195024581c6d;hpb=e9163fc688996aa392f7211cf6e49d3962149246;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index 9a984c5..3d1d5a9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -5,6 +5,7 @@
 
 wxVtkClipping3DView::wxVtkClipping3DView(wxVtk3DBaseView* wxvtk3Dbaseview)
 {
+
 	_wxvtk3Dbaseview				=	wxvtk3Dbaseview;
 	_vtkclipping3Ddataviewer		=	NULL;
 	_wxvtkclipping3DviewCntrlPanel	=	NULL;
@@ -30,14 +31,13 @@ void wxVtkClipping3DView::SetVisibleBoxSurface(bool visible)
 	}
 }
 //-------------------------------------------------------------------
-void wxVtkClipping3DView::SetVisibleBoxVolume(bool visible)
+void wxVtkClipping3DView::VisibleVolumeBoxActor(bool visible)
 {
-	if (_boxWidgetVolume!=NULL){
-		if (visible==true){
-			_boxWidgetVolume->On();
-		} else {
-			_boxWidgetVolume->Off();
-		}
+	if (visible!=_vtkclipping3Ddataviewer->GetVisibleVolumeBox() ){
+        VisibleVolumeActor(!visible);
+        _vtkclipping3Ddataviewer->BoxActorChanged(visible);
+        _vtkclipping3Ddataviewer->SetVisibleVolumeBox(visible);
+        _vtkclipping3Ddataviewer->SetVisibleVolume(!visible);
 	}
 }
 //-------------------------------------------------------------------
@@ -112,6 +112,12 @@ void wxVtkClipping3DView::VisibleVolumeActor( bool visVolume){
 		}
 		_vtkclipping3Ddataviewer->SetVisibleVolume(visVolume);
 	}
+	else if(visVolume==false  && _vtkclipping3Ddataviewer->GetVisibleVolumeBox() == true)
+	{
+	    _vtkclipping3Ddataviewer->BoxActorChanged(false);
+        _vtkclipping3Ddataviewer->SetVisibleVolumeBox(false);
+	}
+
 }
 //-------------------------------------------------------------------
 wxVtk3DBaseView* wxVtkClipping3DView::GetWxvtk3Dbaseview()throw(char*)
@@ -144,7 +150,7 @@ void wxVtkClipping3DView::Configure(){
 	int i;
   	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
 	{
-		_boxWidgetS1->AddObserver( vtkCommand::InteractionEvent		 , _vtkclipping3Ddataviewer->GetObserverS(i) );
+		_boxWidgetS1->AddObserver( vtkCommand::InteractionEvent, _vtkclipping3Ddataviewer->GetObserverS(i) );
 	}
 
 
@@ -211,6 +217,13 @@ void wxVtkClipping3DView::Configure(){
   // clips out objects behind the plane. This way only what is drawn
   // between the planes is actually rendered.
   _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange();
+
+	cout<<"EED::JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetRenderer()::"<<this->GetWxvtk3Dbaseview()->GetRenderer()<<endl;
+	//cout<<"JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetWxVTKRenderWindowInteractor()::"<<this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()<<endl;
+
+	_vtkclipping3Ddataviewer->SetRenderer(this->GetWxvtk3Dbaseview()->GetRenderer());
+	_vtkclipping3Ddataviewer->SetInteractor(this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor());
+
 }
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetVtkClipping3DDataViewer(vtkClipping3DDataViewer *vtkclipping3Ddataviewer)
@@ -221,25 +234,31 @@ void wxVtkClipping3DView::SetVtkClipping3DDataViewer(vtkClipping3DDataViewer *vt
 void wxVtkClipping3DView::SetRayCasting(bool active)
 {
     _vtkclipping3Ddataviewer->SetRayCasting(active);
-    _vtkclipping3Ddataviewer->Configure();
+    _vtkclipping3Ddataviewer->updateVolume();
 }
 
 void wxVtkClipping3DView::SetMIPActive(bool active)
 {
     _vtkclipping3Ddataviewer->SetMIPActive(active);
-    _vtkclipping3Ddataviewer->Configure();
+    _vtkclipping3Ddataviewer->updateVolume();
 }
 
 void wxVtkClipping3DView::SetInterpolation(bool active)
 {
     _vtkclipping3Ddataviewer->SetInterpolation(active);
-    _vtkclipping3Ddataviewer->Configure();
+    _vtkclipping3Ddataviewer->updateVolume();
 }
 
 void wxVtkClipping3DView::SetShade(bool active)
 {
     _vtkclipping3Ddataviewer->SetShade(active);
-    _vtkclipping3Ddataviewer->Configure();
+    _vtkclipping3Ddataviewer->updateVolume();
+}
+
+void wxVtkClipping3DView::UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun)
+{
+    _vtkclipping3Ddataviewer->UpdateVolumeBox(gf, vf, ctfun);
 }
 
 
+