#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[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 ac69465260736205c291c5a5c9ad1b8fead13e72..868583ab83d2408dda9fdf1b30eec4c46cff8b4a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -25,12 +25,15 @@
 
 #include "ManualPaintModel.h"
 
-ManualPaintModel::ManualPaintModel() {
-       _active         = true;
-       _tool           = 0; // 0 pencil         ,   1 fill
-       _brushfilter    = new BrushFilter();
-       _fillfilter     = new FillFilter();
-       _imageUndoRedo  = new ImageUndoRedo();
+ManualPaintModel::ManualPaintModel() 
+{
+       _active                                 = true;
+       _tool                                   = 0; // 0 pencil         ,   1 fill
+       _brushfilter                    = new BrushFilter();
+       _fillfilter                     = new FillFilter();
+       _imageUndoRedo                  = new ImageUndoRedo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     _imageUndoRedo_visited  = new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
@@ -50,16 +53,13 @@ void ManualPaintModel::SetActive( bool active )
 //---------------------------------------------------------------------------
 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();
        } // _tool 2
-
        if (_tool == 1) 
        {
                _fillfilter->SetPoint(px, py, pz);
@@ -69,89 +69,143 @@ printf("EED   ManualPaintModel::PaintImage\n");
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetTool(int tool) {
+void ManualPaintModel::SetTool(int tool) 
+{
        _tool = tool;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::Set2D3D(int dim2D3D) {
-       _brushfilter->Set2D3D(dim2D3D);
-       _fillfilter->Set2D3D(dim2D3D);
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetImage(vtkImageData *image) {
-       _brushfilter->SetImage(image);
-       _fillfilter->SetImage(image);
-       _imageUndoRedo->SetImage(image);
+void ManualPaintModel::Set2D3D(int dim2D3D) 
+{
+       _brushfilter -> Set2D3D(dim2D3D);
+       _fillfilter  -> Set2D3D(dim2D3D);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel(double graylevel) {
+void ManualPaintModel::SetImages(vtkImageData *image,vtkImageData *image2) 
+{
+       if (image!=NULL)
+       {
+               _brushfilter -> SetImages(image,image2);
+               _fillfilter  -> SetImages(image,image2);
+               if (image2!=NULL)
+               {
+                       _imageUndoRedo->SetImage(image2);
+               } else {
+                       _imageUndoRedo->SetImage(image);
+               }
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//             _imageUndoRedo_visited->SetImage( _fillfilter->GetAuxImageFill() );
+       } else {
+               printf("EED Warning image=NULL in ManualPaintModel::SetImage(image)\n ");
+       }
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetGrayLevel(double graylevel) 
+{
        _brushfilter->SetGrayLevel(graylevel);
        _fillfilter->SetGrayLevel(graylevel);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetRangeMin(int min) {
+void ManualPaintModel::SetRangeMin(int min) 
+{
        _brushfilter->SetRangeMin(min);
        _fillfilter->SetRangeMin(min);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetRangeMax(int max) {
+void ManualPaintModel::SetRangeMax(int max) 
+{
        _brushfilter->SetRangeMax(max);
        _fillfilter->SetRangeMax(max);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDirection(int direction) {
+void ManualPaintModel::SetDirection(int direction) 
+{
        _brushfilter->SetDirection(direction);
        _fillfilter->SetDirection(direction);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushSize(int brushsize) {
+void ManualPaintModel::SetBrushSize(int brushsize) 
+{
        _brushfilter->SetBrushSize(brushsize);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm(int brushform) {
+void ManualPaintModel::SetBrushForm(int brushform) 
+{
        _brushfilter->SetBrushForm(brushform);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetToleranceFill(double tolerancefill) {
+void ManualPaintModel::SetToleranceFill(double tolerancefill) 
+{
        _fillfilter->SetToleranceFill(tolerancefill);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDistanceFill(int distancefill) {
+void ManualPaintModel::SetDistanceFill(int distancefill) 
+{
        _fillfilter->SetDistanceFill(distancefill);
 }
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::GetScalarRange(double * range) {
+void ManualPaintModel::GetScalarRange(double * range) 
+{
        _fillfilter->GetScalarRange(range);
 }
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetUndoImage() {
+void ManualPaintModel::SetUndoImage() 
+{
        ImageMManager* imMManager = NULL;
-        if (_tool == 0) {
-        imMManager = this->_brushfilter->GetImageMManager();
-        }
-        if (_tool == 1) {
-        imMManager = this->_fillfilter->GetImageMManager();
-        }
-        this->_imageUndoRedo->SetURImages(imMManager);
-        this->_brushfilter->CleanImageMManager();
-        this->_fillfilter->CleanImageMManager();
+       if (_tool == 0) 
+       {
+               imMManager = this->_brushfilter->GetImageMManager();
+       } // if 0
+       if (_tool == 1) 
+       {
+               imMManager = this->_fillfilter->GetImageMManager();
+       } // if 1
+       this->_imageUndoRedo                    -> SetURImages(imMManager);
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     this->_imageUndoRedo_visited    -> SetURImages(imMManager);
+       this->_brushfilter                              -> CleanImageMManager();
+       this->_fillfilter                               -> CleanImageMManager();
 }
 //---------------------------------------------------------------------------
 
-void ManualPaintModel::Undo() {
+void ManualPaintModel::Undo() 
+{
        this->_imageUndoRedo->Undo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     this->_imageUndoRedo_visited->Undo();
 }
 
-void ManualPaintModel::Redo() {
+void ManualPaintModel::Redo() 
+{
        this->_imageUndoRedo->Redo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     this->_imageUndoRedo_visited->Redo();
 }
+
+
+int ManualPaintModel::GetRestorBaseInitialPointX() 
+{
+       return  this->_imageUndoRedo->GetRestorBaseInitialPointX();
+}
+
+int ManualPaintModel::GetRestorBaseInitialPointY() 
+{
+       return  this->_imageUndoRedo->GetRestorBaseInitialPointY();
+}
+
+int ManualPaintModel::GetRestorBaseInitialPointZ() 
+{
+       return  this->_imageUndoRedo->GetRestorBaseInitialPointZ();
+}
+