#3331 creaMaracasVisu Bug New Normal - Select contour with 2 points, HelpViewerNV

[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 f0de5e28650a9480226af3f9197c12b0582e0b0c..61c234ecf81e25a35e98c59f32b5334b583c13ec 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -25,7 +25,8 @@
 
 #include "ManualPaintModel.h"
 
-ManualPaintModel::ManualPaintModel() {
+ManualPaintModel::ManualPaintModel() 
+{
        _active         = true;
        _tool           = 0; // 0 pencil         ,   1 fill
        _brushfilter    = new BrushFilter();
@@ -50,7 +51,6 @@ void ManualPaintModel::SetActive( bool active )
 //---------------------------------------------------------------------------
 void ManualPaintModel::PaintImage(int px, int py, int pz) 
 {
-printf("EED   ManualPaintModel::PaintImage\n");
   if (_active==true)
   {
 
@@ -82,12 +82,12 @@ void ManualPaintModel::Set2D3D(int dim2D3D)
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetImage(vtkImageData *image) 
+void ManualPaintModel::SetImages(vtkImageData *image,vtkImageData *image2) 
 {
        if (image!=NULL)
        {
-               _brushfilter->SetImage(image);
-               _fillfilter->SetImage(image);
+               _brushfilter -> SetImages(image,image2);
+               _fillfilter  -> SetImages(image,image2);
                _imageUndoRedo->SetImage(image);
        } else {
                printf("EED Warning image=NULL in ManualPaintModel::SetImage(image)\n ");
@@ -155,6 +155,7 @@ void ManualPaintModel::GetScalarRange(double * range)
 //---------------------------------------------------------------------------
 void ManualPaintModel::SetUndoImage() 
 {
+       printf("EED ManualPaintModel::SetUndoImage \n");
        ImageMManager* imMManager = NULL;
        if (_tool == 0) 
        {
@@ -172,6 +173,7 @@ void ManualPaintModel::SetUndoImage()
 
 void ManualPaintModel::Undo() 
 {
+       printf("EED ManualPaintModel::Undo \n");
        this->_imageUndoRedo->Undo();
 }