X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.cpp;h=ac69465260736205c291c5a5c9ad1b8fead13e72;hb=9d8709b5e9d72b9f0034224bb4c00281264fb28d;hp=956fe6a560f62341e0803fc6d269654c0a656a87;hpb=ef92674006375c4fe7b842ce834590c5b6d9683f;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp index 956fe6a..ac69465 100644 --- 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 } //---------------------------------------------------------------------------