[Kst] kdeextragear-2/kst/kst

Barth Netterfield netterfield at astro.utoronto.ca
Wed Oct 27 21:54:50 CEST 2004


CVS commit by netterfield: 

BUG: 92145


  M +14 -13    kst2dplot.cpp   1.296


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.295:1.296
@@ -1513,15 +1513,4 @@ void Kst2DPlot::genAxisTickLabels(QPaint
   int i;
 
-  tp.maxWidth = 0.0;
-  tp.maxHeight = 0.0;
-  tp.labels.clear();
-  tp.delta = false;
-
-  setTicks(tp.tick, tp.org, Max, Min, bLog, isX);
-
-  tp.iLo = (int)((Min-tp.org)/tp.tick);
-  tp.iHi = (int)((Max-tp.org)/tp.tick)+1;
-  iShort = tp.iLo;
-
   if (isX && _isXAxisInterpreted) {
     double range;
@@ -1591,4 +1580,18 @@ void Kst2DPlot::genAxisTickLabels(QPaint
   }
 
+  tp.maxWidth = 0.0;
+  tp.maxHeight = 0.0;
+  tp.labels.clear();
+  tp.delta = false;
+
+  setTicks(tp.tick, tp.org, Max*scale, Min*scale, bLog, isX);
+  tp.tick/=scale;
+  tp.org/=scale;
+
+  tp.iLo = (int)((Min-tp.org)/tp.tick);
+  tp.iHi = (int)((Max-tp.org)/tp.tick)+1;
+  iShort = tp.iLo;
+
+
   //
   //  determine the values, and determine
@@ -1667,6 +1670,4 @@ void Kst2DPlot::internalAlignment(QRect&
   updateScale();
   getLScale(x_min, y_min, x_max, y_max);
-  //setTicks(XTick, Xorg, x_max, x_min, _xLog, true);
-  //setTicks(YTick, Yorg, y_max, y_min, _yLog, false);
   setBorders(xleft_bdr_px, xright_bdr_px, ytop_bdr_px, ybot_bdr_px,
              tpx, tpy, p, offsetX, offsetY);





More information about the Kst mailing list