X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxManualTree_MPRWidget.cxx;h=73e238e94eda97041ba2e32741dd5c954f8ece46;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=d27baa5a5052d1793b0b54d7fc034416f84dddf5;hpb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
index d27baa5..73e238e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: wxManualTree_MPRWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/30 20:55:40 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2012/11/15 14:14:35 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -37,12 +62,11 @@ END_EVENT_TABLE( );
 
 
 wxManualTree_MPRWidget::wxManualTree_MPRWidget( wxWindow* parent,
-                          marImageData *marimageData ,double voxelSize)
+                          marImageData *marimageData )
 : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
 {
 
-	_voxelSize							= voxelSize;
-	_marimageData							= marimageData;
+	_marimageData						= marimageData;
 
 	_wxvtk3Dbaseview_Clipping3D_C		= NULL;
 	_wxvtkmpr3Dview_C					= NULL;
@@ -51,7 +75,7 @@ wxManualTree_MPRWidget::wxManualTree_MPRWidget( wxWindow* parent,
     wxSplitterWindow	*pnlSplitter	= new wxSplitterWindow( this , -1);
 	
 	int ww,hh;
-	_MPRWidget2					= new wxMPRWidget2(pnlSplitter,_marimageData,voxelSize);
+	_MPRWidget2					= new wxMPRWidget2(pnlSplitter,_marimageData);
 	wxPanel *	contour3DView	= Create3DViewContour( pnlSplitter , _MPRWidget2->GetVtkMPRBaseData());
 	this->GetSize(&ww,&hh);
 
@@ -82,7 +106,7 @@ wxPanel* wxManualTree_MPRWidget::Create3DViewContour( wxWindow *parent, vtkMPRBa
 	wxPanel *panel=new wxPanel(parent,-1);
 
 	wxSplitterWindow	*panelClipping3D	= new wxSplitterWindow( panel , -1);
-	_wxvtk3Dbaseview_Clipping3D_C = new wxVtk3DBaseView( panelClipping3D );
+	_wxvtk3Dbaseview_Clipping3D_C = new wxVtk3DBaseView( panelClipping3D, vtkmprbasedata );
 
 	_wxvtkclipping3Dview_C = new wxVtkClipping3DView(_wxvtk3Dbaseview_Clipping3D_C);
 	vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); 
@@ -100,7 +124,7 @@ wxPanel* wxManualTree_MPRWidget::Create3DViewContour( wxWindow *parent, vtkMPRBa
 
 	wxPanel		*panelControl			= new wxPanel(panelClipping3D,-1);	
 	wxPanel		*controlPanelMPR3D		= _wxvtkmpr3Dview_C->CreateControlPanel(panelControl, false);
-	wxPanel		*controlPanelClipping3D	= _wxvtkclipping3Dview_C->CreateControlPanel(panelControl);
+	wxPanel		*controlPanelClipping3D	= _wxvtkclipping3Dview_C->CreateSurfControlPanel(panelControl);
 
 //	wxBoxSizer  *sizerCtrol             = new wxBoxSizer(wxVERTICAL);
 	wxFlexGridSizer  *sizerCtrol             = new wxFlexGridSizer(1);
@@ -152,7 +176,6 @@ void wxManualTree_MPRWidget::ConfigureContour()
 	_mViewContour_2->SetModel( _mContourModel_2 );
 	_mViewContour_2->SetWxVtkBaseView( wxvtkbaseview );
 	_mViewContour_2->SetRange( 1 );
-	_mViewContour_2->SetMesureScale( _voxelSize	);
 
 //EED 3 oct 2006
 	_mViewContour_2->SetSpacing(spc);
@@ -166,7 +189,6 @@ void wxManualTree_MPRWidget::ConfigureContour()
 	_mViewContour_0->SetModel( _mContourModel_2 );
 	_mViewContour_0->SetWxVtkBaseView( wxvtkbaseview );
 	_mViewContour_0->SetRange( 1 );
-	_mViewContour_0->SetMesureScale( _voxelSize	);
 
 //EED 3 oct 2006
 	_mViewContour_0->SetSpacing(spc);
@@ -180,7 +202,6 @@ void wxManualTree_MPRWidget::ConfigureContour()
 	_mViewContour_1->SetModel( _mContourModel_2 );
 	_mViewContour_1->SetWxVtkBaseView( wxvtkbaseview );
 	_mViewContour_1->SetRange( 1 );
-	_mViewContour_1->SetMesureScale( _voxelSize	);
 
 //EED 3 oct 2006
 	_mViewContour_1->SetSpacing(spc);
@@ -195,7 +216,6 @@ void wxManualTree_MPRWidget::ConfigureContour()
 	_mViewContour_p		->	SetModel( _mContourModel_2 );
 	_mViewContour_p		->	SetWxVtkBaseView( wxvtkbaseview );
 	_mViewContour_p		->	SetRange( 1 );
-	_mViewContour_p->SetMesureScale( _voxelSize	);
 
 //EED 3 oct 2006
 	_mViewContour_p->SetSpacing(spc);
@@ -213,7 +233,6 @@ void wxManualTree_MPRWidget::ConfigureContour()
 	_mViewContour_3D->SetModel( _mContourModel_2 );
 	_mViewContour_3D->SetWxVtkBaseView( wxvtkbaseview );
 	_mViewContour_3D->SetRange( 1 );
-	_mViewContour_3D->SetMesureScale(_voxelSize	);
 
 //EED 3 oct 2006
 	_mViewContour_3D->SetSpacing(spc);