#2864 creaMaracasVisu Feature New Normal - Manual Paint , modifies external image...

[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 f326ff525e2820fe53208d728d9111e392ad1b56..0a9f995c57616ad9292aaf3c9852d7f44b9fdd37 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -25,25 +25,31 @@
 
 #include "baseFilterManualPaint.h"
 
-baseFilterManualPaint::baseFilterManualPaint() {
+baseFilterManualPaint::baseFilterManualPaint() 
+{
        _IMManager = new ImageMManager();
        _IMManager->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;
+       _graylevel      = 0.0;
+       _2D3D           = 1; // 0 2D             ,   1 true 3D
+       _direction      = 0; // 1 XZ             ,   0 YZ            ,   2 XY
+       _image          = NULL;
+       _image2         = NULL;
+       _minX           = 0;
+       _minY           = 0;
+       _minZ           = 0;
+       _maxX           = 0;
+       _maxY           = 0;
+       _maxZ           = 0;
+
+       _pMinX          = 0;
+       _pMinY          = 0;
+       _pMinZ          = 0;
+       _pMaxX          = 0;
+       _pMaxY          = 0;
+       _pMaxZ          = 0;
+
+       _RangeMin       = 0;
+       _RangeMax       = 6000;
 }
 
 //---------------------------------------------------------------------------
@@ -79,18 +85,32 @@ void baseFilterManualPaint::SetPoint(int px, int py, int pz) {
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetImage(vtkImageData *image) {
+void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2) 
+{
+       _image  = image;
+       _image2 = image2;
+
        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];
+
+       if (_image2!=NULL)
+       {
+               int extB[6];
+               _image2->GetWholeExtent(extB);
+               _maxX = std::min( ext[1]-ext[0] , extB[1]-extB[0] );
+               _maxY = std::min( ext[3]-ext[2] , extB[3]-extB[2] );
+               _maxZ = std::min( ext[5]-ext[4] , extB[5]-extB[4] );
+       } else {
+               _maxX = ext[1]-ext[0];
+               _maxY = ext[3]-ext[2];
+               _maxZ = ext[5]-ext[4];
+       } // if
 }
 
+
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::ResetGeneralMinMax() {
        _pMinX = 10000;
@@ -135,10 +155,43 @@ void baseFilterManualPaint::GetScalarRange(double * range) {
        range = this->_image->GetScalarRange();
 }
 
+//---------------------------------------------------------------------------
 ImageMManager* baseFilterManualPaint::GetImageMManager() {
        return (this->_IMManager);
 } //DFCH
+
+//---------------------------------------------------------------------------
 void baseFilterManualPaint::CleanImageMManager() {
        this->_IMManager->CleanModifiedRegion();
 } //DFCH
 
+
+
+
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::SetRangeMin(int min) 
+{
+       _RangeMin = min;
+}
+
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::SetRangeMax(int max) 
+{
+       _RangeMax = max;
+}
+
+//---------------------------------------------------------------------------
+int baseFilterManualPaint::GetRangeMin() 
+{
+       return _RangeMin;
+}
+
+//---------------------------------------------------------------------------
+int baseFilterManualPaint::GetRangeMax() 
+{
+       return _RangeMax;
+}
+
+
+
+