[Kst] kdeextragear-2/kst/kst

[Rick Chern]

CVS commit by rchern: 

Move drawing of images back up before axes.


  M +5 -3      kst2dplot.cpp   1.213


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.212:1.213
@@ -1479,10 +1479,12 @@ void Kst2DPlot::draw(QPainter &p, KstPai
     plotLabels(p, x_px, y_px, xleft_bdr_px, ytop_bdr_px);
 
+    plotImages(p, Lx, Hx, Ly, Hy, m_X, m_Y, b_X, b_Y, x_max, y_max, x_min, y_min);
+    //return original pen to painter
+    p.setPen(QPen(_foregroundColor, penWidth));
+
     plotAxes(p, x_max, y_max, x_min, y_min,
                         XTick, Xorg, xleft_bdr_px, xright_bdr_px, x_orig_px, xtick_px, xtick_len_px, x_px,
                         YTick, Yorg, ytop_bdr_px, ybot_bdr_px, y_orig_px, ytick_px, ytick_len_px, y_px);
 
-    plotImages(p, Lx, Hx, Ly, Hy, m_X, m_Y, b_X, b_Y, x_max, y_max, x_min, y_min);
-
     /*** plot the legend now if its in the background **/
     if (!Legend->getFront()) {
@@ -3848,5 +3850,5 @@ void Kst2DPlot::plotImages(QPainter& p,
       //draw the contourmap
       if (image->hasContourMap()) {
-        p.setPen(image->contourColor());
+        p.setPen(QPen(image->contourColor(),0));
         //do the drawing
         for (int i = d2i(ceil(img_Lx_pix)); i + CONTOUR_STEP < d2i(floor(img_Hx_pix)); i += CONTOUR_STEP) {