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

[George Staikos]

CVS commit by staikos: 

bind labels partially and show how flawed labels are in the process


  A            bind_label.cpp   1.1 [GPL (v2+)]
  A            bind_label.h   1.1 [GPL (v2+)]
  A            bind_plotlabelcollection.cpp   1.1 [GPL (v2+)]
  A            bind_plotlabelcollection.h   1.1 [GPL (v2+)]
  M +3 -1      Makefile.am   1.26
  M +2 -0      TODO   1.12
  M +7 -1      bind_plot.cpp   1.3
  M +1 -0      bind_plot.h   1.3


--- kdeextragear-2/kst/kst/extensions/js/Makefile.am  #1.25:1.26
@@ -52,5 +52,7 @@
                             bind_debug.cpp \
                             bind_debuglog.cpp \
-                            bind_debuglogentry.cpp
+                            bind_debuglogentry.cpp \
+                            bind_label.cpp \
+                            bind_plotlabelcollection.cpp
 
 

--- kdeextragear-2/kst/kst/extensions/js/TODO  #1.11:1.12
@@ -10,4 +10,6 @@
 - Plots are flattened from inside windows - will be a problem when plot groups
   are accessible - what to do?
+- Labels need to have a dirty flag too, and plots need to check them.  Perhaps
+  full updates....... make them KstObjects?
 
 

--- kdeextragear-2/kst/kst/extensions/js/bind_plot.cpp  #1.2:1.3
@@ -18,4 +18,5 @@
 #include "bind_plot.h"
 #include "bind_curvecollection.h"
+#include "bind_plotlabelcollection.h"
 
 #include <kst2dplot.h>
@@ -105,4 +106,5 @@ static PlotProperties plotProperties[] =
   { "tagName", &KstBindPlot::setTagName, &KstBindPlot::tagName },
   { "curves", 0L, &KstBindPlot::curves },
+  { "labels", 0L, &KstBindPlot::labels },
   { 0L, 0L, 0L }
 };
@@ -218,5 +220,4 @@ KJS::Value KstBindPlot::tagName(KJS::Exe
 
 KJS::Value KstBindPlot::curves(KJS::ExecState *exec) const {
-  Q_UNUSED(exec)
   KstReadLocker rl(_d);
   return KJS::Object(new KstBindCurveCollection(exec, _d));
@@ -224,3 +225,8 @@ KJS::Value KstBindPlot::curves(KJS::Exec
 
 
+KJS::Value KstBindPlot::labels(KJS::ExecState *exec) const {
+  KstReadLocker rl(_d);
+  return KJS::Object(new KstBindPlotLabelCollection(exec, _d));
+}
+
 // vim: ts=2 sw=2 et

--- kdeextragear-2/kst/kst/extensions/js/bind_plot.h  #1.2:1.3
@@ -47,4 +47,5 @@ class KstBindPlot : public KstBinding {
     KJS::Value tagName(KJS::ExecState *exec) const;
     KJS::Value curves(KJS::ExecState *exec) const;
+    KJS::Value labels(KJS::ExecState *exec) const;
 
   protected: