[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

forward port fix for 87177 - equations incorrectly resampled


  M +5 -10     kstequationcurve.cpp   1.62


--- kdeextragear-2/kst/kst/kstequationcurve.cpp  #1.61:1.62
@@ -371,16 +371,11 @@ bool KstEquationCurve::FillY(bool force)
       }
     }
-    if ((*_xVector)->sampleCount() > 0) {
-      _interp = (ns+1) / (*_xVector)->sampleCount();
-    } else { // avoid divide by zero
-      _interp = 1;
-    }
   } else {
-    _interp = 1;
+    ns = (*_xVector)->sampleCount();
   }
 
-  if (NS != (*_xVector)->sampleCount() || _interp != 1 ||
+  if (NS != (*_xVector)->sampleCount() || (ns != (*_xVector)->sampleCount()) ||
       (*_xVector)->numShift() != (*_xVector)->numNew()) {
-    NS = (*_xVector)->sampleCount()*_interp;// - 1;
+    NS = ns;
 
     KstVectorPtr yv = *_yVector;
@@ -395,6 +390,6 @@ bool KstEquationCurve::FillY(bool force)
     // calculate shift and new samples
     // only do shift optimization if all used vectors are same size and shift
-    v_shift = (*_xVector)->numShift()*_interp;
-    v_new = (*_xVector)->numNew()*_interp;
+    v_shift = (*_xVector)->numShift();
+    v_new = (*_xVector)->numNew();
 
     for (i_v = 0; i_v < VectorsUsed.count(); i_v++) {