[Kst] kdeextragear-2/kst/kst/extensions/js

[George Staikos]

CVS commit by staikos: 

Add binding for equations


  A            bind_equation.cpp   1.1 [GPL (v2+)]
  A            bind_equation.h   1.1 [GPL (v2+)]
  M +1 -1      Makefile.am   1.13
  M +3 -3      bind_datavector.cpp   1.7
  M +1 -0      bind_datavector.h   1.7
  M +3 -2      bind_scalar.cpp   1.6
  M +3 -2      bind_vector.cpp   1.12
  M +1 -0      bind_vector.h   1.10
  M +1 -1      bindings.txt   1.5
  M +2 -0      js.cpp   1.15


--- kdeextragear-2/kst/kst/extensions/js/Makefile.am  #1.12:1.13
@@ -13,5 +13,5 @@
                         kstbinding.cpp bind_vector.cpp bind_kst.cpp \
                         bind_scalar.cpp bind_string.cpp bind_datasource.cpp \
-                        bind_datavector.cpp
+                        bind_datavector.cpp bind_equation.cpp
 
 

--- kdeextragear-2/kst/kst/extensions/js/bind_datavector.cpp  #1.6:1.7
@@ -222,5 +221,6 @@ bool KstBindDataVector::hasProperty(KJS:
 void KstBindDataVector::put(KJS::ExecState *exec, const KJS::Identifier& propertyName, const KJS::Value& value, int attr) {
   if (!_v) {
-    return KstBinding::put(exec, propertyName, value, attr);
+    KstBinding::put(exec, propertyName, value, attr);
+    return;
   }
 
@@ -237,5 +237,5 @@ void KstBindDataVector::put(KJS::ExecSta
   }
 
-  return KstBinding::put(exec, propertyName, value, attr);
+  KstBinding::put(exec, propertyName, value, attr);
 }
 

--- kdeextragear-2/kst/kst/extensions/js/bind_datavector.h  #1.6:1.7
@@ -68,4 +68,5 @@ class KstBindDataVector : public KstBind
     void addBindings(KJS::ExecState *exec, KJS::Object& obj);
 
+  public:
     KstRVectorPtr _v;
 };

--- kdeextragear-2/kst/kst/extensions/js/bind_scalar.cpp  #1.5:1.6
@@ -108,5 +108,6 @@ bool KstBindScalar::hasProperty(KJS::Exe
 void KstBindScalar::put(KJS::ExecState *exec, const KJS::Identifier& propertyName, const KJS::Value& value, int attr) {
   if (!_s) {
-    return KstBinding::put(exec, propertyName, value, attr);
+    KstBinding::put(exec, propertyName, value, attr);
+    return;
   }
 
@@ -122,5 +123,5 @@ void KstBindScalar::put(KJS::ExecState *
   }
 
-  return KstBinding::put(exec, propertyName, value, attr);
+  KstBinding::put(exec, propertyName, value, attr);
 }
 

--- kdeextragear-2/kst/kst/extensions/js/bind_vector.cpp  #1.11:1.12
@@ -138,5 +138,6 @@ KJS::Value KstBindVector::call(KJS::Exec
 void KstBindVector::put(KJS::ExecState *exec, const KJS::Identifier& propertyName, const KJS::Value& value, int attr) {
   if (!_v) {
-    return KstBinding::put(exec, propertyName, value, attr);
+    KstBinding::put(exec, propertyName, value, attr);
+    return;
   }
 
@@ -153,5 +154,5 @@ void KstBindVector::put(KJS::ExecState *
   }
 
-  return KstBinding::put(exec, propertyName, value, attr);
+  KstBinding::put(exec, propertyName, value, attr);
 }
 

--- kdeextragear-2/kst/kst/extensions/js/bind_vector.h  #1.9:1.10
@@ -62,4 +62,5 @@ class KstBindVector : public KstBinding 
     void addBindings(KJS::ExecState *exec, KJS::Object& obj);
 
+  public:
     KstVectorPtr _v;
 };

--- kdeextragear-2/kst/kst/extensions/js/bindings.txt  #1.4:1.5
@@ -15,5 +15,5 @@
 Matrix
 
-Equation
+Equation        DONE
 PowerSpectrum
 Fit

--- kdeextragear-2/kst/kst/extensions/js/js.cpp  #1.14:1.15
@@ -37,4 +37,5 @@
 #include "bind_datasource.h"
 #include "bind_datavector.h"
+#include "bind_equation.h"
 #include "bind_kst.h"
 #include "bind_scalar.h"
@@ -92,4 +93,5 @@ void KstJS::createBindings() {
   new KstBindDataSource(exec, &globalObj);
   new KstBindDataVector(exec, &globalObj);
+  new KstBindEquation(exec, &globalObj);
   new KstBindKst(exec, &globalObj);
 }