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

[Peter Kümmel]

SVN commit 1132088 by kuemmel:

make naming consistent 

 M  +6 -6      kstnetcdf.cpp  
 M  +6 -3      kstnetcdf.h  


--- branches/work/kst/portto4/kst/src/datasources/netcdf/kstnetcdf.cpp #1132087:1132088
@@ -87,10 +87,10 @@
 // Vector interface
 //
 
-class DataInterfaceNetCdf : public DataSource::DataInterface<DataVector>
+class DataInterfaceNetCdfVector : public DataSource::DataInterface<DataVector>
 {
 public:
-  DataInterfaceNetCdf(NetcdfSource& s) : netcdf(s) {}
+  DataInterfaceNetCdfVector(NetcdfSource& s) : netcdf(s) {}
 
   // read one element
   int read(const QString&, const DataVector::Param&);
@@ -114,7 +114,7 @@
 };
 
 
-const DataVector::Optional DataInterfaceNetCdf::optional(const QString &field) const
+const DataVector::Optional DataInterfaceNetCdfVector::optional(const QString &field) const
 {
   if (!netcdf._fieldList.contains(field))
     return DataVector::Optional();
@@ -124,13 +124,13 @@
 
 
 
-int DataInterfaceNetCdf::read(const QString& field, const DataVector::Param& p)
+int DataInterfaceNetCdfVector::read(const QString& field, const DataVector::Param& p)
 {
   return netcdf.readField(p.data, field, p.startingFrame, p.numberOfFrames);
 }
 
 
-bool DataInterfaceNetCdf::isValid(const QString& field) const
+bool DataInterfaceNetCdfVector::isValid(const QString& field) const
 {
   return  netcdf._fieldList.contains( field );
 }
@@ -217,7 +217,7 @@
   Kst::DataSource(store, cfg, filename, type),
   _ncfile(0L),
   is(new DataInterfaceNetCdfScalar(*this)),
-  iv(new DataInterfaceNetCdf(*this)),
+  iv(new DataInterfaceNetCdfVector(*this)),
   im(new DataInterfaceNetCdfMatrix(*this))
 {
   setInterface(is);
--- branches/work/kst/portto4/kst/src/datasources/netcdf/kstnetcdf.h #1132087:1132088
@@ -26,7 +26,9 @@
 #include <netcdfcpp.h>
 
 
-class DataInterfaceNetCdf;
+class DataInterfaceNetCdfScalar;
+class DataInterfaceNetCdfVector;
+class DataInterfaceNetCdfMatrix;
 
 class NetcdfSource : public Kst::DataSource {
   public:
@@ -73,11 +75,12 @@
     QStringList _fieldList;
     QStringList _matrixList;
 
+
     friend class DataInterfaceNetCdfScalar;
-    friend class DataInterfaceNetCdf;
+    friend class DataInterfaceNetCdfVector;
     friend class DataInterfaceNetCdfMatrix;
     DataInterfaceNetCdfScalar* is;
-    DataInterfaceNetCdf* iv;
+    DataInterfaceNetCdfVector* iv;
     DataInterfaceNetCdfMatrix* im;
 };