X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintControler.h;h=e3c5c0f3648f6fd9bdc37dc7d741ed625c4c28dd;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=33e6abdd9f0e8c4b86618bb3eefea2f51aeadd5a;hpb=897b3f6aeec3179a0afed6b1657ed426693c80de;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.h
index 33e6abd..e3c5c0f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.h
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef _MANUAL_PAINT_CONTROLER_H_
 #define _MANUAL_PAINT_CONTROLER_H_
 
 #include "ManualPaintModel.h"
-#include "ManualPaintPanel.h"
+//#include "ManualPaintPanel.h"
 #include "wxVtk2DBaseView.h"
 
 
@@ -11,17 +36,23 @@ public:
 	ManualPaintControler();
 	virtual ~ManualPaintControler();
 
-    void SetManualPaintModel(ManualPaintModel* manualPaintModel);
-    void SetManualPaintPanel(ManualPaintPanel* manualPaintPanel);
-    void SetWxVtk2DBaseView(wxVtk2DBaseView *wxvtk2Dbaseview);
-    void Config();
-    void PaintImage(int px,int py, int pz);
+    void 				SetManualPaintModel(ManualPaintModel* manualPaintModel);
+    ManualPaintModel*	GetManualPaintModel();
+    void 				SetWxVtk2DBaseView(int id, wxVtk2DBaseView *wxvtk2Dbaseview);
+    void 				Config();
+    void 				PaintImage(int px,int py, int pz, int direction);
+    void 				SetImageUndo();
+    void 				Undo();
+    void 				Redo();
+    void 				Refresh_UndoRedo();
 
 private:
     int                 auxZ;
 	ManualPaintModel	*_manualPaintModel;
-	ManualPaintPanel	*_manualPaintPanel;
-	wxVtk2DBaseView     *_wxvtk2Dbaseview;
+	wxVtk2DBaseView     *_wxvtk2Dbaseview1;
+	wxVtk2DBaseView     *_wxvtk2Dbaseview2;
+	wxVtk2DBaseView     *_wxvtk2Dbaseview3;
+	wxVtk2DBaseView     *_wxvtk2Dbaseview4;
 
 protected: