X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkClipping3DView.cxx;h=a53f035ec2421be2185950c90eba8b1759fb709a;hb=47d49bceea4f93ff4f57c40596960d042171abb4;hp=db0a4698da361ab97bd7273ca366d691418df3aa;hpb=22b3a32e023370c44f812976adc4b45b88401c2f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index db0a469..a53f035 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "wxVtkClipping3DView.h"
 
 #include "wxVtkClipping3DViewCntrlPanel.h"
@@ -5,6 +30,7 @@
 
 wxVtkClipping3DView::wxVtkClipping3DView(wxVtk3DBaseView* wxvtk3Dbaseview)
 {
+
 	_wxvtk3Dbaseview				=	wxvtk3Dbaseview;
 	_vtkclipping3Ddataviewer		=	NULL;
 	_wxvtkclipping3DviewCntrlPanel	=	NULL;
@@ -14,7 +40,8 @@ wxVtkClipping3DView::wxVtkClipping3DView(wxVtk3DBaseView* wxvtk3Dbaseview)
 }
 
 //-------------------------------------------------------------------
-wxVtkClipping3DView::~wxVtkClipping3DView(){
+wxVtkClipping3DView::~wxVtkClipping3DView()
+{
 	if (_boxWidgetVolume!=NULL)				 { _boxWidgetVolume	-> Delete();					}
 	if (_boxWidgetS1!=NULL)					 { _boxWidgetS1		-> Delete();					}
 	if (_vtkclipping3Ddataviewer!=NULL)		 { delete _vtkclipping3Ddataviewer;			}
@@ -30,14 +57,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 +138,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*)
@@ -122,7 +154,8 @@ wxVtk3DBaseView* wxVtkClipping3DView::GetWxvtk3Dbaseview()throw(char*)
 	return _wxvtk3Dbaseview;
 }
 //-------------------------------------------------------------------
-void wxVtkClipping3DView::Configure(){
+void wxVtkClipping3DView::Configure()
+{
 	_wxvtk3Dbaseview->Configure();
 
 	// Actors are added to the renderer.
@@ -144,7 +177,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) );
 	}
 
 
@@ -193,11 +226,14 @@ void wxVtkClipping3DView::Configure(){
 //	_boxWidgetVolume->GetPlanes( vtkplanes );
 
 
+//EED 27/05/2013
+//  _wxvtk3Dbaseview->GetRenderer()->ResetCamera ();
+//  _wxvtk3Dbaseview->GetCamera()->Dolly(1.2);
+
   // An initial camera view is created.  The Dolly() method moves
   // the camera towards the FocalPoint, thereby enlarging the image.
-  _wxvtk3Dbaseview->GetRenderer()->SetActiveCamera(_wxvtk3Dbaseview->GetCamera());
-  _wxvtk3Dbaseview->GetRenderer()->ResetCamera ();
-  _wxvtk3Dbaseview->GetCamera()->Dolly(1.5);
+        _wxvtk3Dbaseview->ResetCamera();
+
 
   // Set a background color for the renderer and set the size of the
   // render window (expressed in pixels).
@@ -210,7 +246,12 @@ void wxVtkClipping3DView::Configure(){
   // near plane clips out objects in front of the plane; the far plane
   // clips out objects behind the plane. This way only what is drawn
   // between the planes is actually rendered.
-  _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange();
+//EEDUPS  _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange();
+
+	_vtkclipping3Ddataviewer->SetRenderer(this->GetWxvtk3Dbaseview()->GetRenderer());
+	_vtkclipping3Ddataviewer->SetInteractor(this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor());
+
+
 }
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetVtkClipping3DDataViewer(vtkClipping3DDataViewer *vtkclipping3Ddataviewer)
@@ -242,4 +283,10 @@ void wxVtkClipping3DView::SetShade(bool active)
     _vtkclipping3Ddataviewer->updateVolume();
 }
 
+void wxVtkClipping3DView::UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun)
+{
+    _vtkclipping3Ddataviewer->UpdateVolumeBox(gf, vf, ctfun);
+}
+
+