DFCH: UndoRedo + ManualPaint - Code update. Undo beta1 working :) :) :)

[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 3fda57bf49cc39b76705d4eb50672034f39a1fa6..e6b2fd85b2302a9481ebdb15240da3f1a68b4cfa 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -114,30 +114,34 @@ 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;
+       int min = std::numeric_limits<int>::min();
+       int max = std::numeric_limits<int>::max();
+       this->_MRegion->minX = max;
+       this->_MRegion->maxX = min;
+       this->_MRegion->minY = max;
+       this->_MRegion->maxY = min;
+       this->_MRegion->minZ = max;
+       this->_MRegion->maxZ = min;
 } //DFCH
 void baseFilterManualPaint::CalculateMinMaxRegion(const int& i, const int& j,
                const int& k) {
-       if (i < this->_MRegion->minX) {
+       if (i <= this->_MRegion->minX) {
                this->_MRegion->minX = i;
-       } else {
-               this->_MRegion->maxX = i;
        } //fi
-       if (j < this->_MRegion->minY) {
+       if (i > this->_MRegion->maxX) {
+               this->_MRegion->maxX = i;
+       } //esle
+       if (j <= this->_MRegion->minY) {
                this->_MRegion->minY = j;
-       } else {
-               this->_MRegion->maxY = j;
        } //fi
-       if (k < this->_MRegion->minZ) {
+       if (j > this->_MRegion->maxY) {
+               this->_MRegion->maxY = j;
+       } //esle
+       if (k <= this->_MRegion->minZ) {
                this->_MRegion->minZ = k;
-       } else {
-               this->_MRegion->maxZ = k;
        } //fi
+       if (k > this->_MRegion->maxZ) {
+               this->_MRegion->maxZ = k;
+       } //esle
 }
 
-