2343 creaMaracasVisu Bug New Normal Interaction between ColorLayer and manualPaint

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / ManualPaintModel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
index 956fe6a560f62341e0803fc6d269654c0a656a87..ac69465260736205c291c5a5c9ad1b8fead13e72 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -26,28 +26,46 @@
 #include "ManualPaintModel.h"
 
 ManualPaintModel::ManualPaintModel() {
-       _tool = 0; // 0 pencil         ,   1 fill
-       _brushfilter = new BrushFilter();
-       _fillfilter = new FillFilter();
-       _imageUndoRedo = new ImageUndoRedo();
+       _active         = true;
+       _tool           = 0; // 0 pencil         ,   1 fill
+       _brushfilter    = new BrushFilter();
+       _fillfilter     = new FillFilter();
+       _imageUndoRedo  = new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel() {
+ManualPaintModel::~ManualPaintModel() 
+{
        delete _brushfilter;
        delete _fillfilter;
 }
 
+
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetActive( bool active )
+{
+  _active = active;
+}
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::PaintImage(int px, int py, int pz) {
-       if (_tool == 0) {
+void ManualPaintModel::PaintImage(int px, int py, int pz) 
+{
+printf("EED   ManualPaintModel::PaintImage\n");
+  if (_active==true)
+  {
+
+       if (_tool == 0) 
+       {
                _brushfilter->SetPoint(px, py, pz);
                _brushfilter->Run();
-       }
-       if (_tool == 1) {
+       } // _tool 2
+
+       if (_tool == 1) 
+       {
                _fillfilter->SetPoint(px, py, pz);
                _fillfilter->Run();
-       }
+       } // _tool 1
+  } // _active
 }
 
 //---------------------------------------------------------------------------