[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Use AUTOBORDER as the default setting for the the y-axis, else there is no way to return to the plot as it is originally drawn. 
Fix indentation.


  M +28 -28    kst2dplot.cpp   1.386
  M +1 -1      kst2dplot.h   1.148


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.385:1.386
@@ -124,5 +124,5 @@ Kst2DPlot::Kst2DPlot(const QDomElement& 
 : KstPlotBase(e), _buffer(8) {
   QString in_tag = "unknown";
-  KstScaleModeType yscale_in = AUTO, xscale_in = AUTO;
+  KstScaleModeType yscale_in = AUTOBORDER, xscale_in = AUTO;
   double xmin_in = 0, ymin_in = 0, xmax_in = 1, ymax_in = 1;
   QStringList ctaglist;
@@ -939,6 +939,6 @@ void Kst2DPlot::updateScale() {
         if (_xLog) {
           XMin = log10(XMin);
-          XMax = (XMax > 0) ? log10(XMax): 0;
-          double dx = (XMax-XMin)/40;
+          XMax = (XMax > 0.0) ? log10(XMax): 0.0;
+          double dx = (XMax-XMin)/40.0;
           XMax += dx;
           XMin -= dx;
@@ -946,5 +946,5 @@ void Kst2DPlot::updateScale() {
           XMin = pow(10.0, XMin);
         } else {
-          double dx = (XMax-XMin)/40;
+          double dx = (XMax-XMin)/40.0;
           XMax += dx;
           XMin -= dx;
@@ -1144,9 +1144,9 @@ void Kst2DPlot::updateScale() {
         YMin = pow(10.0, -350.0);
       }
-      if (_yScaleMode==AUTOBORDER) {
+      if (_yScaleMode == AUTOBORDER) {
         if (_yLog) {
           YMin = log10(YMin);
           YMax = (YMax > 0) ? log10(YMax): 0;
-          double dy = (YMax-YMin)/40;
+          double dy = (YMax-YMin)/40.0;
           YMax += dy;
           YMin -= dy;
@@ -1154,5 +1154,5 @@ void Kst2DPlot::updateScale() {
           YMin = pow(10.0, YMin);
         } else {
-          double dy = (YMax-YMin)/40;
+          double dy = (YMax-YMin)/40.0;
           YMax += dy;
           YMin -= dy;

--- kdeextragear-2/kst/kst/kst2dplot.h  #1.147:1.148
@@ -76,5 +76,5 @@ class Kst2DPlot : public KstPlotBase {
 public:
   Kst2DPlot(const QString& in_tag = "SomePlot",
-          KstScaleModeType yscale = AUTO,
+          KstScaleModeType yscale = AUTOBORDER,
           KstScaleModeType xscale = AUTO,
           double xmin = 0, double ymin = 0,