X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_N_ViewersWidget.h;h=b20c91f5c5e8373033270cc791c9cce7675b93ee;hb=22b3a32e023370c44f812976adc4b45b88401c2f;hp=f938a381cd2b097a909b1c5861edfb57ae0ec602;hpb=5d3149fdf909da63747a9bb4b1cb7229cf50e4fa;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
index f938a38..b20c91f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
@@ -3,14 +3,14 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.h,v $
   Language:  C++
-  Date:      $Date: 2010/05/03 13:46:48 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2010/10/23 12:01:32 $
+  Version:   $Revision: 1.12 $
 
   Copyright: (c) 2002, 2003
   License:
-  
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
@@ -48,15 +48,40 @@ class creaMaracasVisu_EXPORT wxMaracas_N_ViewersWidget : public wxPanel
   {
   public:
 
-	  	  
+
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
 
+	/**
+	*	@pre A wxWindow* object must be provided as a parent for the viewer
+	*	@post The layout of the viewer is initialize, if there is no image or type set,
+			only the panel of the viwer is created with no vtk objects
+	*	@param wxWindow* parent of the window
+	*	@param vtkImageData* imagedata of the viewer
+	*	@param std::vector<int>* vector of the type for the viewer
+	*	@deprecated This method will be eliminated in future versions,
+	*	@deprecated the viewers will start with a default image if it is not specified,
+	*	@deprecated this is in order to create the layout of the viewer,
+	*	@deprecated the vtkInteractors* and the object vtkRenderer* use second constructor
+	*/
 	wxMaracas_N_ViewersWidget(wxWindow *parent, vtkImageData* imagedata = NULL, std::vector<int> *nTypeView = NULL);
-    ~wxMaracas_N_ViewersWidget();
+	/**
+	*	@pre A wxWindow* object must be provided as a parent for the viewer and the type of layout for the viewer
+	*	@post The layout of the viewer is initialized, if no image is provided at first, a default image is
+	*		used
+	*	@param wxWindow* parent of the window
+	*	@param std::vector<int>* vector of the type for the viewer
+	*	@param vtkImageData* imagedata of the viewer
+	*/
+	wxMaracas_N_ViewersWidget(wxWindow *parent, std::vector<int> *nTypeView, vtkImageData* imagedata = NULL);
+	/**
+	*	@pre none
+	*	@post the viewer window is deleted, all of the interactors and the renderer are deleted
+	*/
+	~wxMaracas_N_ViewersWidget();
+
 
-	
 	//------------------------------------------------------------------------------------------------------------
 	// Methods
 	//------------------------------------------------------------------------------------------------------------
@@ -89,7 +114,11 @@ class creaMaracasVisu_EXPORT wxMaracas_N_ViewersWidget : public wxPanel
 	//------------------------------------------------------------------------------------------------------------
 
   private:
-	
+
+	wxPanel *wxw1;
+	wxPanel *wxw2;
+	wxPanel *wxw3;
+	wxPanel *wxw4;
 	wxMaracas_ViewerWidget	*wxwindow1;
 	wxMaracas_ViewerWidget	*wxwindow2;
 	wxMaracas_ViewerWidget	*wxwindow3;
@@ -100,8 +129,8 @@ class creaMaracasVisu_EXPORT wxMaracas_N_ViewersWidget : public wxPanel
 
 	std::vector<int> *nTypeView;
 
-	vtkMPRBaseData* mvtkmprbasedata;  
-	 
+	vtkMPRBaseData* mvtkmprbasedata;
+
 	void invariant();
   DECLARE_EVENT_TABLE( );
   };