[Kst] branches/work/kst/portto4/kst/src/libkstmath

[Mike Fenton]

SVN commit 807798 by fenton:

Fix Curve Saving.  Update Curve Drawing to follow line width directions regardless of pen width.


 M  +5 -3      curve.cpp  
 M  +2 -2      curvefactory.cpp  
 M  +0 -1      dataobject.cpp  


--- branches/work/kst/portto4/kst/src/libkstmath/curve.cpp #807797:807798
@@ -939,13 +939,15 @@
     Qt::PenStyle style = Kst::LineStyle[lineStyle()];
     int i0, iN;
     int width;
-    
+
     if (lineWidth() == 0) {
       width = penWidth;
+    } else if (penWidth > 0) {
+      width = lineWidth() * penWidth;
     } else {
-      width = lineWidth() * penWidth;
+      width = lineWidth();
     }
-    
+
     if (xv->isRising()) {
       i0 = indexNearX(XMin, xv, NS);
       if (i0 > 0) {
--- branches/work/kst/portto4/kst/src/libkstmath/curvefactory.cpp #807797:807798
@@ -56,8 +56,8 @@
         errorYMinusVectorTag = attrs.value("erroryminusvector").toString();
 
         hasLines = attrs.value("haslines").toString() == "true" ? true : false;
-        lineStyle = attrs.value("linewidth").toString().toInt();
-        lineWidth = attrs.value("linestyle").toString().toInt();
+        lineWidth = attrs.value("linewidth").toString().toInt();
+        lineStyle = attrs.value("linestyle").toString().toInt();
 
         hasPoints = attrs.value("haspoints").toString() == "true" ? true : false;
         pointType = attrs.value("pointtype").toString().toInt();
--- branches/work/kst/portto4/kst/src/libkstmath/dataobject.cpp #807797:807798
@@ -180,7 +180,6 @@
       vector->triggerUpdateSignal(object);
     }
     foreach (MatrixPtr matrix, _outputMatrices) {
-      qDebug() << "loop updating matrix" << matrix->shortName();
       matrix->triggerUpdateSignal(object);
     }
     foreach (ScalarPtr scalar, _outputScalars) {