X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=d86fec0162637eb518d4b636c3e9561b9ed610c6;hb=4443a8fe2b4992b6abee8531917fd0803018fc12;hp=66b0d25091c7412de0035091e5f08e603a61a20f;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;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 66b0d25..d86fec0 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: 2008/10/31 16:32:42 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/04/01 08:41:35 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -53,6 +53,9 @@
 		mwxvtk3Dbaseview_Clipping3D	= NULL;
 		mwxvtkmpr3Dview				= NULL; 
 
+
+		std::cout<<"mtype "<<mType<<std::endl;
+		std::cout<<"type "<<type<<std::endl;
 		if (type==-1)
 		{
 			mvtk2Dbaseview	= new wxVtk2DBaseView(panel);
@@ -63,19 +66,20 @@
 
 		if (type==0)
 		{
-			mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,0);
+			mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2);
 			mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		= mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
 		}
 		if (type==1)
 		{
-			mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,1);
+			mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0);
 			mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		=	mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
 		}
+
 		if (type==2)
 		{
-			mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,2);
+			mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1);
 			mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		= mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
 		}
@@ -136,11 +140,43 @@
 			wxwindow=panelClipping3D;
 		}
 
+		if (type==6)
+		{
+			wxSplitterWindow	*panelClipping3D	= new wxSplitterWindow( panel , -1);
+			mwxvtk3Dbaseview_Clipping3D				= new wxVtk3DBaseView( panelClipping3D );
+
+			mwxvtkmpr3Dview							= new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
+			vtkMPR3DDataViewer *vtkmpr3Ddataviewer	= new vtkMPR3DDataViewer(); 
+			vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
+			vtkmpr3Ddataviewer->Configure();
+			mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
+
+			wxWindow	*window3D					= mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+
+			wxPanel			*panelControl			= new wxPanel(panelClipping3D,-1);	
+			wxPanel			*controlPanelMPR3D		= mwxvtkmpr3Dview->CreateControlPanel(panelControl);
+
+			wxFlexGridSizer  *sizerCtrol             = new wxFlexGridSizer(1);
+			sizerCtrol->Add(controlPanelMPR3D		, 1, wxALL|wxEXPAND, 2);
+
+			panelControl->SetAutoLayout(true);
+			panelControl->SetSizer(sizerCtrol);
+			panelControl->SetSize(400,350);
+			panelControl->Layout();
+			panelClipping3D	-> SetMinimumPaneSize( 5 );
+			panelClipping3D	-> SplitHorizontally( panelControl , window3D , 10  );
+			wxwindow=panelClipping3D;
+		}
+
+
+
 	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-	sizer->Add( wxwindow , 1, wxEXPAND, 0);
+	sizer->Add( wxwindow , 1, wxGROW);	
 	panel->SetSizer(sizer);
 	panel->SetAutoLayout(true);
+	sizer->Layout();
 	panel->Layout();
+	panel->Refresh();
 
 	//   mbbtkViewerMaracas= NULL;
 	}
@@ -149,6 +185,24 @@
 	wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
 	{
 
+		testDelete(mvtkmprbasedata);
+		testDelete(mvtk2Dbaseview);
+		testDelete(mvtkmpr2Dview_X); 
+		testDelete(mvtkmpr2Dview_Y); 
+		testDelete(mvtkmpr2Dview_Z); 
+		testDelete(mwidgetMesure);
+		testDelete(mvtkplane2Dview);
+		testDelete(mwxsphereview); 
+		testDelete(mwxvtkclipping3Dview);
+		testDelete(mwxvtk3Dbaseview_Clipping3D);
+		testDelete(mwxvtkmpr3Dview);
+
+	}
+
+	void wxMaracas_ViewerWidget::testDelete(void* point){
+		if(point!=NULL){
+			delete point;
+		}
 	}
 	    
 	//------------------------------------------------------------------------------------------------------------
@@ -185,7 +239,7 @@
 			mvtkmprbasedata->SetY( y );
 			mvtkmprbasedata->SetZ( z );
 		}
-		RefreshView();
+//		RefreshView();
 	}
 
 	//-------------------------------------------------------------------------
@@ -198,6 +252,7 @@
 	//-------------------------------------------------------------------------
 	void wxMaracas_ViewerWidget::RefreshView()
 	{
+		
 			if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview				-> Refresh();		}
 			if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X				-> Refresh();		}
 			if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y				-> Refresh();		}
@@ -208,6 +263,7 @@
 			if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview				-> RefreshView();	}
 			if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview			-> Refresh();		}
 			if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D	-> Refresh();		}
+
 	}
 
 	//-------------------------------------------------------------------------
@@ -227,7 +283,15 @@
 
 	void wxMaracas_ViewerWidget::SetImage( vtkImageData *image	)
 	{
-		printf("EED wxMaracas_ViewerWidget::SetImage   IMPORTANT this methode is missing \n");
+		marImageData* mar = mvtkmprbasedata->GetMarImageData();
+		mar->removeImageData(0);
+		mar->AddImageData(image);
+
+		ConfigureVTK();
+		RefreshView();
+
+
+
 	}
 
 	double wxMaracas_ViewerWidget :: GetX()