[Kst] branches/work/kst/portto4/kst/src

[Mike Fenton]

SVN commit 720157 by fenton:

Conversion of KstSVector to Kst::GeneratedVector and associated changes.


 A             libkst/generatedvector.cpp   libkst/kstsvector.cpp#720153 [License: GPL (v2+)]
 A             libkst/generatedvector.h   libkst/kstsvector.h#720153 [License: GPL (v2+)]
 D             libkst/kstsvector.cpp  
 D             libkst/kstsvector.h  
 M  +2 -2      libkst/libkst.pro  
 M  +2 -2      libkst/vectorfactory.cpp  
 M  +0 -1      libkstapp/plotitem.cpp  
 M  +2 -2      libkstapp/vectordialog.cpp  
 M  +2 -2      libkstmath/kstequation.cpp  


--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #720156:720157
@@ -34,7 +34,7 @@
     generatedmatrix.cpp \
     editablematrix.cpp \
     kstvector.cpp \
-    kstsvector.cpp \
+    generatedvector.cpp \
     editablevector.cpp \
     datavector.cpp \
     kstvectordefaults.cpp \
@@ -80,7 +80,7 @@
     kstsharedptr.h \
     generatedmatrix.h \
     kststring.h \
-    kstsvector.h \
+    generatedvector.h \
     ksttimers.h \
     ksttimezones.h \
     kstvectordefaults.h \
--- branches/work/kst/portto4/kst/src/libkst/vectorfactory.cpp #720156:720157
@@ -13,7 +13,7 @@
 
 #include "kstdebug.h"
 #include "kstvector.h"
-#include "kstsvector.h"
+#include "generatedvector.h"
 #include "editablevector.h"
 #include "datavector.h"
 #include "kstdatacollection.h"
@@ -120,7 +120,7 @@
     return 0;
   }
 
-  KstVectorPtr vector = new KstSVector(tag, data, min, max, count);
+  KstVectorPtr vector = new GeneratedVector(tag, data, min, max, count);
   return vector.data();
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #720156:720157
@@ -19,7 +19,6 @@
 #include "mainwindow.h"
 #include "tabwidget.h"
 
-#include "kstsvector.h"
 #include "kstvcurve.h"
 #include "kstdatacollection.h"
 #include "kstdataobjectcollection.h"
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #720156:720157
@@ -15,7 +15,7 @@
 #include "datasourcedialog.h"
 
 #include "datavector.h"
-#include "kstsvector.h"
+#include "generatedvector.h"
 
 #include "kstdatacollection.h"
 #include "kstdataobjectcollection.h"
@@ -278,7 +278,7 @@
 //            << "\n\ttag:" << tag.tag()
 //            << endl;
 
-  KstSVectorPtr vector = new KstSVector(from, to, numberOfSamples, tag);
+  GeneratedVectorPtr vector = new GeneratedVector(from, to, numberOfSamples, tag);
   return static_cast<KstObjectPtr>(vector);
 }
 
--- branches/work/kst/portto4/kst/src/libkstmath/kstequation.cpp #720156:720157
@@ -34,7 +34,7 @@
 #include "kstdebug.h"
 #include "kstequation.h"
 #include "kst_i18n.h"
-#include "kstsvector.h"
+#include "generatedvector.h"
 
 extern "C" int yyparse();
 extern "C" void *ParsedEquation;
@@ -51,7 +51,7 @@
   KstVectorPtr xvector;
   QString vtag = KST::suggestVectorName(QString( "(%1..%2)" ).arg( x0 ).arg( x1 ) );
 
-  xvector = new KstSVector(x0, x1, nx, KstObjectTag(vtag, QStringList(in_tag)));
+  xvector = new Kst::GeneratedVector(x0, x1, nx, KstObjectTag(vtag, QStringList(in_tag)));
 
   _doInterp = false;
   _xInVector = _inputVectors.insert(XINVECTOR, xvector);