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=26f8dbf475c38ac14be547137695d61743efee40;hpb=eb9b8072280bdbfe4bf4d747a28c98472b68451b;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 26f8dbf..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/03/05 23:03:18 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2010/03/17 16:52:51 $
+  Version:   $Revision: 1.24 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -39,7 +39,10 @@
 //		wxPanel	*panelControl					= 0;
 //		wxFlexGridSizer  *sizerCtrol			= 0;		
 		wxPanel	*controlPanelMPR3D				= 0;
-		wxPanel	*controlPanelClipping3D			= 0;
+		wxPanel	*controlPanelClippingSurf3D		= 0;
+		//RaC 03-2010 Adding a tab
+		wxPanel	*controlPanelClippingVol3D		= 0;
+
 		wxBoxSizer *sizer						= 0;
 
 
@@ -125,10 +128,21 @@
 
 //--			
 			wxNotebook *notebook = new wxNotebook(panelClipping3D, -1);
+
+			// First tab
 			controlPanelMPR3D		= mwxvtkmpr3Dview->CreateControlPanel(notebook, true);
-			controlPanelClipping3D	= mwxvtkclipping3Dview->CreateControlPanel(notebook);
 			notebook->AddPage(controlPanelMPR3D, _T("Planes") );
-			notebook->AddPage(controlPanelClipping3D, _T("Volume / Surface") );
+
+			// 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 );