[Kst] kst_hfi_calib_branch: kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

port changes from HEAD


  M +12 -0     kstdatasource.cpp   1.46.2.1
  M +5 -0      kstdatasource.h   1.27.2.1
  M +1 -1      kstsettings.cpp   1.10.2.1


--- kdeextragear-2/kst/kst/kstdatasource.cpp  #1.46:1.46.2.1
@@ -427,4 +428,15 @@ void KstDataSource::updateNumFramesScala
 }
 
+
+int KstDataSource::readField(double *v, const QString& field, int s, int n, int skip) {
+  Q_UNUSED(v)
+  Q_UNUSED(field)
+  Q_UNUSED(s)
+  Q_UNUSED(n)
+  Q_UNUSED(skip)
+  return -9999; // unsupported
+}
+
+
 int KstDataSource::readField(double *v, const QString& field, int s, int n) {
   Q_UNUSED(v)

--- kdeextragear-2/kst/kst/kstdatasource.h  #1.27:1.27.2.1
@@ -74,4 +74,9 @@ class KstDataSource : public KstObject {
     virtual int readField(double *v, const QString& field, int s, int n);
 
+    /** Reads a field from the file.  Data is returned in the
+      double Array v[].  Will skip according to the parameter, but it may not
+      be implemented.  If it returns -9999, use the non-skip version instead. */
+    virtual int readField(double *v, const QString& field, int s, int n, int skip);
+
     /** Returns true if the field is valid, or false if it is not */
     virtual bool isValidField(const QString& field) const;

--- kdeextragear-2/kst/kst/kstsettings.cpp  #1.10:1.10.2.1
@@ -22,5 +22,5 @@
 
 KstSettings::KstSettings() {
-  plotUpdateTimer = 50;
+  plotUpdateTimer = 200;
   backgroundColor = QColor(255, 255, 255); // white
   foregroundColor = QColor(0,0,0); // black