*** empty log message ***

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index 642e656439868396b62ef2453ee3c825c5a7fff1..79b39f5855ae1a154627c7ab1ade9eb39933137e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -1,4 +1,3 @@
-/*
 
 #include "BrushFilter.h"
 
@@ -96,10 +95,10 @@ void BrushFilter::SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,
 
 
 //---------------------------------------------------------------------------
-void BrushFilter::FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size)
+void BrushFilter::FindMinMaxBrush(int &minX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size)
 {
         size = _brushsize-1;
-       minX = _px-size;
+        minX = _px-size;
         maxX = _px+size;
         minY = _py-size;
         maxY = _py+size;
@@ -110,18 +109,18 @@ void BrushFilter::FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &
         {
             if (_direction==0)  // YZ
             {
-                minX=px;
-                maxX=px;
+                minX=_px;
+                maxX=_px;
             }
             if (_direction==1) // XZ
             {
-                minY=py;
-                maxY=py;
+                minY=_py;
+                maxY=_py;
             }
             if (_direction==2) // XY
             {
-                minZ=pz;
-                maxZ=pz;
+                minZ=_pz;
+                maxZ=_pz;
             }
         }
 
@@ -175,23 +174,23 @@ void BrushFilter::Run()
 
        int size;
         int minX,maxX,minY,maxY,minZ,maxZ;
-        FindMinMaxBrush(minxX,maxX,minY,maxY,minZ,maxZ,size);
+        FindMinMaxBrush(minX,maxX,minY,maxY,minZ,maxZ,size);
 
         double xx,yy,zz,rr=size*size;
 
         for (i=minX; i<=maxX; i++)
         {
-            xx=px-i;
+            xx=_px-i;
             xx=xx*xx;
             for (j=minY; j<=maxY; j++)
             {
-                yy=py-j;
+                yy=_py-j;
                 yy=yy*yy;
                 for (k=minZ; k<=maxZ; k++)
                 {
 //                    if ((i>=_minX) && (i<=_maxX) && (j>=_minY) && (j<=_maxY) && (k>=_minZ) && (k<=_maxZ))
 //                    {
-                        zz=pz-k;
+                        zz=_pz-k;
                         zz=zz*zz;
                         if (_brushform==0)
                         {
@@ -253,11 +252,11 @@ void BrushFilter::SetDirection(int direction)
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::Set(int px,int py, int pz)
+void BrushFilter::SetPoint(int px,int py, int pz)
 {
     _px=px;
     _py=py;
     _pz=pz;
 }
 
-*/
+