[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

create curve hints.  The curve hint object is populated by data objects, and
available to the UI to deal with as it pleases.  Multiple are allowed per
object.  However the curve creation utility method has to be disabled because
of dependency problems - it causes us to pull all of Kst into d2asc.  I think
d2asc needs some refactorization.


  M +2 -0      Makefile.am   1.146
  M +1 -1      kstbasecurve.h   1.25
  M +5 -0      kstdataobject.cpp   1.30
  M +4 -2      kstdataobject.h   1.27
  M +2 -0      kstequation.cpp   1.3
  M +0 -1      kstvcurve.h   1.24


--- kdeextragear-2/kst/kst/Makefile.am  #1.145:1.146
@@ -33,4 +33,5 @@
         d2asc.cpp \
         kstdataobject.cpp \
+        kstcurvehint.cpp \
         kstdatacollection-nogui.cpp \
         kstvector.cpp \
@@ -98,4 +99,5 @@
         enodefactory.cpp \
         kstequation.cpp \
+        kstcurvehint.cpp \
         kstprintoptionspage.cpp \
         kstviewscalarsdialog_i.cpp \

--- kdeextragear-2/kst/kst/kstbasecurve.h  #1.24:1.25
@@ -30,5 +30,5 @@
 enum KstCurveType { KST_VCURVE, KST_HISTOGRAM };
 
-class KstBaseCurve: public KstDataObject {
+class KstBaseCurve : public KstDataObject {
 public:
   KstBaseCurve();

--- kdeextragear-2/kst/kst/kstdataobject.cpp  #1.29:1.30
@@ -219,4 +219,9 @@ bool KstDataObject::isValid() const {
 }
 
+
+KstCurveHintList KstDataObject::curveHints() const {
+  return _curveHints;
+}
+
 #include "kstdataobject.moc"
 // vim: ts=2 sw=2 et

--- kdeextragear-2/kst/kst/kstdataobject.h  #1.26:1.27
@@ -20,4 +20,5 @@
 #define KSTDATAOBJECT_H
 
+#include "kstcurvehint.h"
 #include "kstvector.h"
 
@@ -64,4 +63,6 @@ class KstDataObject : public KstObject {
     virtual bool isValid() const;
 
+    virtual KstCurveHintList curveHints() const;
+
   protected slots:
     virtual void _showDialog() = 0;
@@ -78,4 +79,5 @@ class KstDataObject : public KstObject {
     QValueList<QPair<QString,QString> > _inputVectorLoadQueue;
     QValueList<QPair<QString,QString> > _inputScalarLoadQueue;
+    KstCurveHintList _curveHints;
 };
 

--- kdeextragear-2/kst/kst/kstequation.cpp  #1.2:1.3
@@ -152,4 +152,6 @@ void KstEquation::commonConstructor(cons
 
   setEquation(in_equation);
+
+  _curveHints.append(KstCurveHint(i18n("Equation Curve"), (*_xVector)->tagName(), (*_yVector)->tagName()));
 }