pyKst/demo/testdataobjects.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python2.7
+import pykst as kst
+
+client=kst.Client("TestPlugins")
+
+v1 = client.new_generated_vector(0, 10, 10)
+
+e1 = client.new_equation(v1, "x^2")

pyKst/pykst.py

@@ -260,6 +260,20 @@ def image(self, name):
     """
     return Image(self, "", "", name, new=False)
 
+  def new_equation(self, x_vector, equation, name=""):
+    """ Create a new Equation in kst.
+    
+    See :class:`Equation`
+    """
+    return Equation(self, x_vector, equation, name)
+
+  def equation(self, name):
+    """ Returns an Equation from kst given its name.
+    
+    See :class:`Equation`
+    """
+    return Equation(self, "", "", name, new=False)
+
   def new_linear_fit(self, xVector, yVector, weightvector = 0, name = ""):
     """ Create a New Linear Fit in kst.
     
@@ -1322,6 +1336,29 @@ def min_z(self):
     """  Returns the max Z value of the curve or image. """
     return self.client.send_si(self.handle, "minZ()")
 
+# Equation ############################################################
+class Equation(NamedObject) : 
+  """ An equation inside kst.
+   
+    :param x_vector: the x vector of the equation
+    :param equation: the equation
+    
+    Vectors inside kst are refered to as [vectorname] or [scalarname].
+  """
+  def __init__(self, client, xvector, equation, name="", new=True) :
+    NamedObject.__init__(self,client)
+
+    if (new == True):      
+      self.client.send("newEquation()")
+
+      self.client.send("setEquation(" + equation + ")")
+      self.client.send("setInputVector(X,"+xvector.handle+")")
+      self.handle=self.client.send("endEdit()")
+      self.handle.remove(0,self.handle.indexOf("ing ")+4)
+      self.set_name(name)
+    else:
+      self.handle = name
+
 # FIT ###################################################################
 class Fit(NamedObject) :
   """ This is a class which provides some methods common to all fits """

src/libkstapp/scriptserver.cpp

@@ -119,7 +119,7 @@ ScriptServer::ScriptServer(ObjectStore *obj) : _server(new QLocalServer(this)),
     _fnMap.insert("newCurve()",&ScriptServer::newCurve);
 
     _fnMap.insert("getEquationList()",&ScriptServer::getEquationList);
-//    _fnMap.insert("newEquation()",&ScriptServer::newEquation);
+    _fnMap.insert("newEquation()",&ScriptServer::newEquation);
 
     _fnMap.insert("getHistogramList()",&ScriptServer::getHistogramList);
 //    _fnMap.insert("newHistogram()",&ScriptServer::newHistogram);
@@ -332,12 +332,6 @@ QByteArray ScriptServer::exec(QByteArray command, QLocalSocket *s)
     if(fn!=&ScriptServer::noSuchFn) {
         return CALL_MEMBER_FN(*this,fn)(command, s,_store);
     } else {
-        if(command.contains("::")) {
-            QByteArray ret=checkPrimatives(command,s);
-            if(!ret.isEmpty()) {
-                return ret;
-            }
-        }
         if(_interface) {
             return handleResponse(_interface->doCommand(command).toLatin1(),s); //magic
         } else {
@@ -348,6 +342,7 @@ QByteArray ScriptServer::exec(QByteArray command, QLocalSocket *s)
     return "?";
 }
 
+#if 0
 QByteArray ScriptServer::checkPrimatives(QByteArray &command, QLocalSocket *s)
 {
     ///
@@ -418,6 +413,7 @@ QByteArray ScriptServer::checkPrimatives(QByteArray &command, QLocalSocket *s)
 
     return "";
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -588,16 +584,14 @@ QByteArray ScriptServer::getEquationList(QByteArray&, QLocalSocket* s,ObjectStor
     return outputObjectList<Equation>(s,_store);
 }
 
-/*
-QByteArray ScriptServer::newEquation(QByteArray&, QLocalSocket* s,ObjectStore*,const int&ifMode,
+QByteArray ScriptServer::newEquation(QByteArray&, QLocalSocket* s,ObjectStore*) {
 
-    if(_interface) { return handleResponse("To access this function, first call endEdit()",s); }
-    else {
-        _interface = DialogLauncherSI::self->showEquationDialog();
-        return handleResponse("Ok",s);
+    if(_interface) {
+      return handleResponse("To access this function, first call endEdit()",s);
+    } else {
+      _interface = EquationSI::newEquation(_store); return handleResponse("Ok",s);
     }
 }
-*/
 
 
 QByteArray ScriptServer::getHistogramList(QByteArray&, QLocalSocket* s,ObjectStore*_store) {
@@ -647,7 +641,7 @@ QByteArray ScriptServer::newPlugin(QByteArray& plugin, QLocalSocket* s,ObjectSto
   } else {
     plugin.replace("newPlugin(","");
     plugin.remove(plugin.lastIndexOf(")"),1);
-    _interface = DataObjectSI::newPlugin(store, plugin);
+    _interface = PluginSI::newPlugin(store, plugin);
     return handleResponse("Ok",s);
   }
 }
@@ -690,25 +684,6 @@ QByteArray ScriptServer::getBasicPluginList(QByteArray&, QLocalSocket* s,ObjectS
     return outputObjectList<BasicPlugin>(s,_store);
 }
 
-/*
-QByteArray ScriptServer::newBasicPlugin(QByteArray&command, QLocalSocket* s,ObjectStore*,const int&ifMode,
-
-    command.replace("newBasicPlugin(","");
-    if(command.contains(")")) { command.remove(command.indexOf(")"),99999999); }
-
-    bool ok=0;
-    for(int i=0;i<DataObject::dataObjectPluginList().size();i++) {
-        if(command==DataObject::dataObjectPluginList()[i]) {
-            ok=1;
-            break;
-        }
-    }
-    if(!ok) { return handleResponse("No such plugin",s); }
-    else if(_interface) { return handleResponse("To access this function, first call endEdit()",s); }
-    else { _interface = DialogLauncherSI::self->showBasicPluginDialog(command); return handleResponse("Ok",s); }
-}
-*/
-
 QByteArray ScriptServer::getBasicPluginTypeList(QByteArray&, QLocalSocket* s,ObjectStore*) {
 
     QString a;

src/libkstapp/scriptserver.h

@@ -42,7 +42,7 @@ class ScriptServer : public QObject
 public:
     explicit ScriptServer(ObjectStore*obj);
     ~ScriptServer();
-    QByteArray checkPrimatives(QByteArray&command,QLocalSocket* s);
+    //QByteArray checkPrimatives(QByteArray&command,QLocalSocket* s);
     void setStore(ObjectStore *obj) { _store = obj; vi.clear();}
 public slots:
     void procConnection();
@@ -79,7 +79,7 @@ public slots:
     QByteArray newCurve(QByteArray& command, QLocalSocket* s,ObjectStore*_store);
 
     QByteArray getEquationList(QByteArray& command, QLocalSocket* s,ObjectStore*_store);
-    //QByteArray newEquation(QByteArray& command, QLocalSocket* s,ObjectStore*_store);
+    QByteArray newEquation(QByteArray& command, QLocalSocket* s,ObjectStore*_store);
 
     QByteArray getHistogramList(QByteArray& command, QLocalSocket* s,ObjectStore*_store);
     //QByteArray newHistogram(QByteArray& command, QLocalSocket* s,ObjectStore*_store);

src/libkstmath/basicplugin.cpp

@@ -54,8 +54,9 @@ void BasicPlugin::_initializeShortName() {
 
 }
 
+
 ScriptInterface* BasicPlugin::createScriptInterface() {
-  return new DataObjectSI(this);
+  return new PluginSI(this);
 }
 
 

src/libkstmath/dataobject.cpp

@@ -27,6 +27,8 @@
 #include "primitive.h"
 #include "settings.h"
 
+#include "dataobjectscriptinterface.h"
+
 #include <QApplication>
 #include <QDir>
 #include <qdebug.h>
@@ -145,6 +147,7 @@ StringPtr DataObject::outputString(const QString& string) const {
 
 void DataObject::setInputVector(const QString &type, VectorPtr ptr) {
   if (ptr) {
+    qDebug() << " data object set input vector" << type << "to" << ptr->Name();
     _inputVectors[type] = ptr;
   } else {
     _inputVectors.remove(type);

src/libkstmath/dataobject.h

@@ -144,6 +144,7 @@ class KSTMATH_EXPORT DataObject : public Object
     // this is reimplemented but must not be virtual.
     QByteArray scriptInterface(QList<QByteArray>&command);
 
+
   protected slots:
     virtual void showNewDialog() = 0;
     virtual void showEditDialog() = 0;