X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=66d647ef5e373504159a2ea02fb2bf8b52938438;hb=401bb9b06310683e21d0a7676ef543fb9255f1f9;hp=6f6cbcfc9475b57b4d45ce392ce2aa1a45cc70a6;hpb=d37b5379345cb4c29e10caf62b4d881bd84bf929;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 6f6cbcf..66d647e 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/01/21 13:54:15 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2010/03/17 16:52:51 $
+  Version:   $Revision: 1.24 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -19,7 +19,7 @@
 // Definition includes
 //------------------------------------------------------------------------------------------------------------
 #include "wxMaracas_ViewerWidget.h"
-
+#include <wx/notebook.h>
 //------------------------------------------------------------------------------------------------------------
 // Other includes
 //------------------------------------------------------------------------------------------------------------
@@ -34,14 +34,16 @@
 		: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
 	{
 		wxPanel *panel = this;
-		wxWindow *wxwindow = NULL, *window3D = 0;		
-		double xSpacing, ySpacing, zSpacing;
-		int xMin, xMax, yMin, yMax, zMin, zMax;
-		wxSplitterWindow	*panelClipping3D = 0;
-		wxPanel	*panelControl = 0, *controlPanelMPR3D = 0, *controlPanelClipping3D = 0;
-		wxFlexGridSizer  *sizerCtrol = 0;		
-		vtkCellPicker* picker = 0;
-		wxBoxSizer *sizer = 0;
+		wxWindow *wxwindow = NULL, *window3D	= 0;		
+		wxSplitterWindow	*panelClipping3D	= 0;
+//		wxPanel	*panelControl					= 0;
+//		wxFlexGridSizer  *sizerCtrol			= 0;		
+		wxPanel	*controlPanelMPR3D				= 0;
+		wxPanel	*controlPanelClippingSurf3D		= 0;
+		//RaC 03-2010 Adding a tab
+		wxPanel	*controlPanelClippingVol3D		= 0;
+
+		wxBoxSizer *sizer						= 0;
 
 
 		mType = type;
@@ -121,39 +123,56 @@
 			vtkmpr3Ddataviewer->Configure();
 			mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
 
-			window3D					= mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+			window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+
+
+//--			
+			wxNotebook *notebook = new wxNotebook(panelClipping3D, -1);
+
+			// First tab
+			controlPanelMPR3D		= mwxvtkmpr3Dview->CreateControlPanel(notebook, true);
+			notebook->AddPage(controlPanelMPR3D, _T("Planes") );
 
+			// Second Tab
+			controlPanelClippingSurf3D	= mwxvtkclipping3Dview->CreateSurfControlPanel(notebook);			
+			notebook->AddPage(controlPanelClippingSurf3D, _T("Surface") );
+			
+			//Third tab
+			//RaC 03-2010 Moving the volume functionnality to other tab. The changes were realized only in the wxVtkClipping3DViewCntrlPanel class
+			controlPanelClippingVol3D	= mwxvtkclipping3Dview->CreateVolControlPanel(notebook);
+			notebook->AddPage(controlPanelClippingVol3D, _T("Volume") );
+
+
+			panelClipping3D	-> SplitHorizontally( notebook , window3D , 10  );
+			panelClipping3D	-> SetMinimumPaneSize( 15 );
+			
+	/*		EED 04 / Febrary / 2010
 			panelControl			= new wxPanel(panelClipping3D,-1);	
 			controlPanelMPR3D		= mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
 			controlPanelClipping3D	= mwxvtkclipping3Dview->CreateControlPanel(panelControl);
 	//		                 mbtnCutImageData		= new wxCheckBox(panelControl,-1,_T("Cut Module"));
 	//		Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED  , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData );
-
 			sizerCtrol             = new wxFlexGridSizer(1);
 			sizerCtrol->Add(controlPanelMPR3D		, 1, wxALL|wxEXPAND, 2);
 			sizerCtrol->Add(controlPanelClipping3D	, 1, wxALL|wxEXPAND, 2);
 	//		sizerCtrol->Add( mbtnCutImageData		, 1, wxALL, 2);
-
 			panelControl->SetAutoLayout(true);
 			panelControl->SetSizer(sizerCtrol);
 			panelControl->SetSize(400,350);
 			panelControl->Layout();
-			panelClipping3D	-> SetMinimumPaneSize( 5 );
 			panelClipping3D	-> SplitHorizontally( panelControl , window3D , 10  );
+			panelClipping3D	-> SetMinimumPaneSize( 5 );
+	 */
 			wxwindow=panelClipping3D;
-		}else if (type==6)
-		{
+			
+		} else if (type==6)		{
 			panelClipping3D	= new wxSplitterWindow( panel , -1);
 			mwxvtk3Dbaseview_Clipping3D				= new wxVtk3DBaseView( panelClipping3D );
 
 			mwxvtkmpr3Dview							= new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
 
-
 			vtkmpr3Ddataviewer	= new vtkMPR3DDataViewer(); 	
-
-
 			
-
 			wxWindow	*window3D					= mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
 
 			wxPanel			*panelControl			= new wxPanel(panelClipping3D,-1);