[Kst] kdeextragear-2/kst/kst

Barth Netterfield netterfield at astro.utoronto.ca
Tue Nov 11 00:07:16 CET 2003


CVS commit by netterfield: 

Allow for more vectors in an equation.
The limits are still not checked, so it will fail silently after 26 vectors
in an equation.


  M +4 -3      kstequationcurve.cpp   1.37


--- kdeextragear-2/kst/kst/kstequationcurve.cpp  #1.36:1.37
@@ -352,7 +352,8 @@ void KstEquationCurve::preProcess() {
       replaced = false;
       for (i_v = 0; i_v < KST::vectorList.count(); i_v++) {
+        // FIXME: "- 'a'" probably only allows 26 vectors in an equation
         if (KST::vectorList[i_v]->tagName() == ts) {
           String[j++] = 'V';
-          String[j++] = '0' + i_v;
+          String[j++] = 'a' + i_v;
           VectorsUsed.append(KST::vectorList[i_v]);
           i_v = KST::vectorList.count();
@@ -396,5 +397,5 @@ bool KstEquationCurve::FillRPNQ() {
 
   int i=0,j;
-  char Tmp[160]="",Tmp2[160],Tmp1[160],Tmp3[6];
+  char Tmp[600]="",Tmp2[200],Tmp1[160],Tmp3[6];
 
   vstack.reset();
@@ -605,5 +606,5 @@ bool KstEquationCurve::FillY(bool force)
         numstack.Push(X);
       } else if (String[0]=='V') { // a vector
-        r = String[1] - '0';
+        r = String[1] - 'a';
         if (r < KST::vectorList.count()) {
           numstack.Push(KST::vectorList[r]->interpolate(i, NS));





More information about the Kst mailing list