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

[Peter Kümmel]

SVN commit 1320351 by kuemmel:

spit out ascii data interfaces

 A             asciidatainterfaces.h   [License: GPL (v2+)]
 M  +1 -128    asciisource.cpp  


--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.cpp #1320350:1320351
@@ -18,6 +18,7 @@
 
 #include "asciisource.h"
 #include "asciisourceconfig.h"
+#include "asciidatainterfaces.h"
 
 #include "curve.h"
 #include "colorsequence.h"
@@ -52,135 +53,7 @@
 using namespace Kst;
 
 
-//
-// Vector interface
-//
-
-
 //-------------------------------------------------------------------------------------------
-class DataInterfaceAsciiVector : public DataSource::DataInterface<DataVector>
-{
-public:
-  DataInterfaceAsciiVector(AsciiSource& a) : ascii(a) {}
-
-  // read one element
-  int read(const QString&, DataVector::ReadInfo&);
-
-  // named elements
-  QStringList list() const { return ascii._fieldList; }
-  bool isListComplete() const { return ascii._fieldListComplete; }
-  bool isValid(const QString& field) const { return ascii._fieldList.contains( field ); }
-
-  // T specific
-  const DataVector::DataInfo dataInfo(const QString&) const;
-  void setDataInfo(const QString&, const DataVector::DataInfo&) {}
-
-  // meta data
-  QMap<QString, double> metaScalars(const QString&);
-  QMap<QString, QString> metaStrings(const QString&);
-
-
-  AsciiSource& ascii;
-};
-
-
-//-------------------------------------------------------------------------------------------
-const DataVector::DataInfo DataInterfaceAsciiVector::dataInfo(const QString &field) const
-{
-  if (!ascii._fieldList.contains(field))
-    return DataVector::DataInfo();
-
-  return DataVector::DataInfo(ascii._numFrames, 1);
-}
-
-
-//-------------------------------------------------------------------------------------------
-int DataInterfaceAsciiVector::read(const QString& field, DataVector::ReadInfo& p)
-{
-  return ascii.readField(p.data, field, p.startingFrame, p.numberOfFrames);
-}
-
-
-//-------------------------------------------------------------------------------------------
-// TODO FRAMES only in vector?
-QMap<QString, double> DataInterfaceAsciiVector::metaScalars(const QString&)
-{
-  QMap<QString, double> m;
-  m["FRAMES"] = ascii._numFrames;;
-  return m;
-}
-
-QMap<QString, QString> DataInterfaceAsciiVector::metaStrings(const QString& field)
-{
-  QMap<QString, QString> m;
-  if (ascii._fieldUnits.contains(field)) {
-    m["units"] = ascii._fieldUnits[field];
-  }
-  return m;
-}
-
-
-
-//
-// String interface
-//
-
-class DataInterfaceAsciiString : public DataSource::DataInterface<DataString>
-{
-public:
-  DataInterfaceAsciiString(AsciiSource& s) : ascii(s) {}
-
-  // read one element
-  int read(const QString&, DataString::ReadInfo&);
-
-  // named elements
-  QStringList list() const { return ascii._strings.keys(); }
-  bool isListComplete() const { return true; }
-  bool isValid(const QString&) const;
-
-  // T specific
-  const DataString::DataInfo dataInfo(const QString&) const { return DataString::DataInfo(); }
-  void setDataInfo(const QString&, const DataString::DataInfo&) {}
-
-  // meta data
-  QMap<QString, double> metaScalars(const QString&) { return QMap<QString, double>(); }
-  QMap<QString, QString> metaStrings(const QString&) { return QMap<QString, QString>(); }
-
-
-private:
-  AsciiSource& ascii;
-};
-
-
-//-------------------------------------------------------------------------------------------
-int DataInterfaceAsciiString::read(const QString& string, DataString::ReadInfo& p)
-{
-  if (isValid(string) && p.value) {
-    *p.value = ascii._strings[string];
-    return 1;
-  }
-  return 0;
-}
-
-
-//-------------------------------------------------------------------------------------------
-bool DataInterfaceAsciiString::isValid(const QString& string) const
-{
-  return  ascii._strings.contains( string );
-}
-
-
-
-
-
-
-
-
-//
-// AsciiSource
-//
-
-//-------------------------------------------------------------------------------------------
 static const QString asciiTypeString = I18N_NOOP("ASCII file");