X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=62d2fc75cca10a1575da22cc933ffb45f1d7a693;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=ead3f1f13cdc3924f263ae224bec4393cb2c2d10;hpb=acaa3bc3e713898cad44e2a3a40dcd4269bcc3a2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index ead3f1f..62d2fc7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/29 06:32:50 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2012/05/30 17:23:12 $
+  Version:   $Revision: 1.35 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,7 +23,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Other includes
 //------------------------------------------------------------------------------------------------------------
-
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
@@ -107,7 +106,7 @@
 
 			mwxvtkclipping3Dview			= new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D);
 			vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer();
-			vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
+			vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);			
 			vtkclipping3Ddataviewer->Configure();
 			mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer);
 
@@ -214,7 +213,7 @@
 		{
 		   if (mvtkmprbasedata)         { delete mvtkmprbasedata;}
 		}
-
+		
 		if (mvtk2Dbaseview)             { delete mvtk2Dbaseview; }
 		if (mvtkmpr2Dview_X)            { delete mvtkmpr2Dview_X;}
 		if (mvtkmpr2Dview_Y)            { delete mvtkmpr2Dview_Y;}
@@ -225,6 +224,7 @@
 		if (mwxvtkmpr3Dview)            { delete mwxvtkmpr3Dview;}
 		if (mwxvtkclipping3Dview)       { delete mwxvtkclipping3Dview;}
 		if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;}
+		if (vtkmpr3Ddataviewer)			{ delete vtkmpr3Ddataviewer;}
 	}
 	//------------------------------------------------------------------------------------------------------------
 	// Methods
@@ -298,6 +298,7 @@
 		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
 		if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
 
+		
 		if (mwxvtk3Dbaseview_Clipping3D	!=NULL)
 		{
 			mwxvtk3Dbaseview_Clipping3D->Configure();
@@ -312,7 +313,8 @@
 		if (mwxvtkmpr3Dview			!=NULL)
 		{
 			mwxvtkmpr3Dview->Configure();
-			mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
+printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n");			
+//EED???			mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
 		}
 
 		if (mwxvtkclipping3Dview		!=NULL)
@@ -320,7 +322,6 @@
 			mwxvtkclipping3Dview->Configure();
 		}
 
-
 		//if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();}
 //		RefreshView();