X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=e3215c49db8b086e9ac751f5277e6b61430a4052;hb=885faee171b5cdcbcbbcb6cc83e6d196544e005c;hp=f9822d12b23747942bb6f27925a2fc5724cdbfbc;hpb=1bf58cfa1758464b422d1d0cca808e528043e691;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 f9822d1..e3215c4 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: 2009/05/07 15:35:46 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/06/05 06:07:39 $
+  Version:   $Revision: 1.13 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -30,7 +30,7 @@
 	//------------------------------------------------------------------------------------------------------------
 
 
-	wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type)
+	wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type, vtkMPRBaseData *vtkmprbasedata)
 		: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
 	{
 		wxPanel *panel = this;
@@ -38,9 +38,18 @@
 
 		mType = type;
 
-   		marImageData	*marimagedata	= new marImageData( imagedata );			
-		mvtkmprbasedata					= new vtkMPRBaseData(); 
-		mvtkmprbasedata->SetMarImageData(marimagedata);
+		
+		if (vtkmprbasedata==NULL)
+		{
+			minternalVtkmprbasedata			= true;
+			mvtkmprbasedata					= new vtkMPRBaseData(); 
+			marImageData	*marimagedata	= new marImageData( imagedata );			
+			mvtkmprbasedata->SetMarImageData(marimagedata);
+		} else {
+			minternalVtkmprbasedata			= false;
+			mvtkmprbasedata					= vtkmprbasedata; 
+		}
+		
 
 		mvtk2Dbaseview				= NULL;
 		mvtkmpr2Dview_X				= NULL;
@@ -146,8 +155,11 @@
 
 			mwxvtkmpr3Dview							= new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
 
+
 			vtkmpr3Ddataviewer	= new vtkMPR3DDataViewer(); 	
 
+			
+
 			wxWindow	*window3D					= mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
 
 			wxPanel			*panelControl			= new wxPanel(panelClipping3D,-1);	
@@ -188,7 +200,12 @@
 	  
 	wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
 	{
-		if (mvtkmprbasedata)			{ delete mvtkmprbasedata;  }
+		
+		if (minternalVtkmprbasedata==true)
+		{
+			if (mvtkmprbasedata)			{ delete mvtkmprbasedata;  }
+		}	
+		
 		if (mvtk2Dbaseview)				{ delete mvtk2Dbaseview; }
 		if (mvtkmpr2Dview_X)			{ delete mvtkmpr2Dview_X; }
 		if (mvtkmpr2Dview_Y)			{ delete mvtkmpr2Dview_Y; }