X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.h;h=a99749abce977d42e0d357ededac2dad877b3b07;hb=f9901e756bb82bd333310b47607875331616bb29;hp=1a552e73f4e00f376ad9632b2a82d410e361c2f6;hpb=86048e9a60b41a8e2dcc1f7554835d16e74f2b2e;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h index 1a552e7..a99749a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h @@ -29,18 +29,13 @@ #include "BrushFilter.h" #include "FillFilter.h" -//#include "regionStructUR.h" -//#include "imageUndoRedo.h" - #include "imageModificationManager.h" #include "imageUndoRedo.h" - class ManualPaintModel { public: ManualPaintModel(); virtual ~ManualPaintModel(); - void SetActive(bool active); void SetTool(int tool); void Set2D3D(int dim2D3D); @@ -55,19 +50,22 @@ public: void SetRangeMin(int min); void SetRangeMax(int max); void GetScalarRange(double * range); - void SetUndoImage(); //DFCH - void Undo(); //DFCH - void Redo(); //DFCH + void SetUndoImage(); //DFCH + void Undo(); //DFCH + void Redo(); //DFCH -private: - int _tool; - bool _active; - BrushFilter *_brushfilter; - FillFilter *_fillfilter; - ImageUndoRedo *_imageUndoRedo; + int GetRestorBaseInitialPointX(); + int GetRestorBaseInitialPointY(); + int GetRestorBaseInitialPointZ(); +private: + int _tool; + bool _active; + BrushFilter *_brushfilter; + FillFilter *_fillfilter; + ImageUndoRedo *_imageUndoRedo; + ImageUndoRedo *_imageUndoRedo_visited; protected: - }; #endif // _MANUAL_PAINT_MODEL_H_