[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

only use _var for members - otherwise it's confusing


  M +11 -11    kst2dplot.cpp   1.206


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.205:1.206
@@ -4060,9 +4060,9 @@ void Kst2DPlot::plotImages(QPainter& p,
 
   for (uint i = 0; i < _images.count(); i++) {
-    KstImagePtr _image = *(_images.at(i));
+    KstImagePtr image = *(_images.at(i));
 
     //get the image dimensions
     double x, y, width, height;
-    _image->arrayDimensions(x, y, width, height);
+    image->arrayDimensions(x, y, width, height);
     //figure out where the image will be on the plot
     double img_Lx_pix = 0, img_Ly_pix = 0, img_Hx_pix = 0, img_Hy_pix = 0;
@@ -4107,5 +4107,5 @@ void Kst2DPlot::plotImages(QPainter& p,
 
       //draw the colormap
-      if (_image->hasColorMap()) {
+      if (image->hasColorMap()) {
         QImage tempImage(d2i(img_Hx_pix-img_Lx_pix), d2i(img_Hy_pix-img_Ly_pix), 32);
         for (int i=0; i < d2i(img_Hx_pix-img_Lx_pix); i++) {
@@ -4122,5 +4122,5 @@ void Kst2DPlot::plotImages(QPainter& p,
               new_y = (j + img_Ly_pix - b_Y) / m_Y;
             }
-            QRgb rgb = _image->getMappedColor(new_x, new_y);
+            QRgb rgb = image->getMappedColor(new_x, new_y);
             tempImage.setPixel(i,j, rgb);
           }
@@ -4135,6 +4135,6 @@ void Kst2DPlot::plotImages(QPainter& p,
       #endif
       //draw the contourmap
-      if (_image->hasContourMap()) {
-        p.setPen(_image->contourColor());
+      if (image->hasContourMap()) {
+        p.setPen(image->contourColor());
         //do the drawing
         for (int i = d2i(ceil(img_Lx_pix)); i + CONTOUR_STEP < d2i(floor(img_Hx_pix)); i += CONTOUR_STEP) {
@@ -4143,11 +4143,11 @@ void Kst2DPlot::plotImages(QPainter& p,
             //get the z values
             double zTL, zTR, zBL, zBR;
-            _image->getNearestZ((i - b_X) / m_X, (j - b_Y) / m_Y, zTL);
-            _image->getNearestZ((i+CONTOUR_STEP - b_X) / m_X, (j - b_Y) / m_Y, zTR);
-            _image->getNearestZ((i - b_X) / m_X, (j+CONTOUR_STEP - b_Y) / m_Y, zBL);
-            _image->getNearestZ((i+CONTOUR_STEP - b_X) / m_X, (j+CONTOUR_STEP - b_Y) / m_Y, zBR);
+            image->getNearestZ((i - b_X) / m_X, (j - b_Y) / m_Y, zTL);
+            image->getNearestZ((i+CONTOUR_STEP - b_X) / m_X, (j - b_Y) / m_Y, zTR);
+            image->getNearestZ((i - b_X) / m_X, (j+CONTOUR_STEP - b_Y) / m_Y, zBL);
+            image->getNearestZ((i+CONTOUR_STEP - b_X) / m_X, (j+CONTOUR_STEP - b_Y) / m_Y, zBR);
             //determine the lines to draw
             //check each contour line
-            QValueList<double> lines = _image->contourLines();
+            QValueList<double> lines = image->contourLines();
             for (uint k = 0; k < lines.count(); k++) {
               int numPoints = 0;