DFCH: Manual Paint Changes (Undo/Redo) 80% :) :)

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
index a63ce13401e92da345e31515e832daf4ebc6b72e..d9ce41aaed5a077d9091134d9588d600b445005f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -1,128 +1,141 @@
-
 #include "baseFilterManualPaint.h"
 
-baseFilterManualPaint::baseFilterManualPaint()
-{
-    _graylevel          =   0.0;
-    _2D3D               =   1;      // 0 2D             ,   1 true 3D
-    _direction          =   0;      // 1 XZ             ,   0 YZ            ,   2 XY
-    _minX               =   0;
-    _minY               =   0;
-    _minZ               =   0;
-    _maxX               =   0;
-    _maxY               =   0;
-    _maxZ               =   0;
-
-    _pMinX              =   0;
-    _pMinY              =   0;
-    _pMinZ              =   0;
-    _pMaxX              =   0;
-    _pMaxY              =   0;
-    _pMaxZ              =   0;
+baseFilterManualPaint::baseFilterManualPaint() {
+       _MRegion = new RegionStructUR();
+       CleanModifiedRegion();
+       _graylevel = 0.0;
+       _2D3D = 1; // 0 2D             ,   1 true 3D
+       _direction = 0; // 1 XZ             ,   0 YZ            ,   2 XY
+       _minX = 0;
+       _minY = 0;
+       _minZ = 0;
+       _maxX = 0;
+       _maxY = 0;
+       _maxZ = 0;
+
+       _pMinX = 0;
+       _pMinY = 0;
+       _pMinZ = 0;
+       _pMaxX = 0;
+       _pMaxY = 0;
+       _pMaxZ = 0;
 }
 
 //---------------------------------------------------------------------------
-baseFilterManualPaint::~baseFilterManualPaint()  // virtual
+baseFilterManualPaint::~baseFilterManualPaint() // virtual
 {
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::Run()  // virtual
+void baseFilterManualPaint::Run() // virtual
 {
 }
 
-
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetGrayLevel( double graylevel )
-{
-    _graylevel = graylevel;
+void baseFilterManualPaint::SetGrayLevel(double graylevel) {
+       _graylevel = graylevel;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::Set2D3D( int dim2D3D )
-{
-    _2D3D = dim2D3D;
+void baseFilterManualPaint::Set2D3D(int dim2D3D) {
+       _2D3D = dim2D3D;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetDirection(int direction)
-{
-    _direction = direction;
+void baseFilterManualPaint::SetDirection(int direction) {
+       _direction = direction;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetPoint(int px,int py, int pz)
-{
-    _px=px;
-    _py=py;
-    _pz=pz;
+void baseFilterManualPaint::SetPoint(int px, int py, int pz) {
+       _px = px;
+       _py = py;
+       _pz = pz;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetImage(vtkImageData *image)
-{
-    int ext[6];
-    _image=image;
-    _image->GetWholeExtent(ext);
-    _minX=0;
-    _minY=0;
-    _minZ=0;
-    _maxX=ext[1]-ext[0];
-    _maxY=ext[3]-ext[2];
-    _maxZ=ext[5]-ext[4];
+void baseFilterManualPaint::SetImage(vtkImageData *image) {
+       int ext[6];
+       _image = image;
+       _image->GetWholeExtent(ext);
+       _minX = 0;
+       _minY = 0;
+       _minZ = 0;
+       _maxX = ext[1] - ext[0];
+       _maxY = ext[3] - ext[2];
+       _maxZ = ext[5] - ext[4];
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::ResetGeneralMinMax()
-{
-       _pMinX=10000;
-       _pMinY=10000;
-       _pMinZ=10000;
-       _pMaxX=-10000;
-       _pMaxY=-10000;
-       _pMaxZ=-10000;
+void baseFilterManualPaint::ResetGeneralMinMax() {
+       _pMinX = 10000;
+       _pMinY = 10000;
+       _pMinZ = 10000;
+       _pMaxX = -10000;
+       _pMaxY = -10000;
+       _pMaxZ = -10000;
 }
 
-
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,int maxZ)
-{
-       if (_pMinX>minX)
-        {
-               _pMinX=minX;
-        }
-
-       if (_pMinY>minY)
-        {
-               _pMinY=minY;
-        }
-
-       if (_pMinZ>minZ)
-        {
-               _pMinZ=minZ;
-        }
-
-       if (_pMaxX<maxX)
-        {
-               _pMaxX=maxX;
-        }
-
-       if (_pMaxY<maxY)
-        {
-               _pMaxY=maxY;
-        }
-
-       if (_pMaxZ<maxZ)
-        {
-               _pMaxZ=maxZ;
-        }
+void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
+               int maxY, int minZ, int maxZ) {
+       if (_pMinX > minX) {
+               _pMinX = minX;
+       }
+
+       if (_pMinY > minY) {
+               _pMinY = minY;
+       }
+
+       if (_pMinZ > minZ) {
+               _pMinZ = minZ;
+       }
+
+       if (_pMaxX < maxX) {
+               _pMaxX = maxX;
+       }
+
+       if (_pMaxY < maxY) {
+               _pMaxY = maxY;
+       }
+
+       if (_pMaxZ < maxZ) {
+               _pMaxZ = maxZ;
+       }
 
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::GetScalarRange( double * range )
-{
+void baseFilterManualPaint::GetScalarRange(double * range) {
        range = this->_image->GetScalarRange();
 }
-
+RegionStructUR* baseFilterManualPaint::GetModifiedRegion() {
+       return (this->_MRegion);
+} //DFCH
+void baseFilterManualPaint::CleanModifiedRegion() {
+       this->_MRegion->minX = 0;
+       this->_MRegion->maxX = 0;
+       this->_MRegion->minY = 0;
+       this->_MRegion->maxY = 0;
+       this->_MRegion->minZ = 0;
+       this->_MRegion->maxZ = 0;
+} //DFCH
+void baseFilterManualPaint::CalculateMinMaxRegion(const int& i, const int& j,
+               const int& k) {
+       if (i < this->_MRegion->minX) {
+               this->_MRegion->minX = i;
+       } else {
+               this->_MRegion->maxX = i;
+       } //fi
+       if (j < this->_MRegion->minY) {
+               this->_MRegion->minY = j;
+       } else {
+               this->_MRegion->maxY = j;
+       } //fi
+       if (k < this->_MRegion->minZ) {
+               this->_MRegion->minZ = k;
+       } else {
+               this->_MRegion->maxZ = k;
+       } //fi
+}