[Kst] branches/work/kst/1.6/kst/src/libkst
Andrew Walker
arwalker at sumusltd.com
Thu Dec 13 23:38:02 CET 2007
SVN commit 748247 by arwalker:
format changes
M +0 -2 defaultprimitivenames.cpp
M +1 -1 defaultprimitivenames.h
M +1 -1 ksdebug.cpp
M +0 -2 kst_export.h
M +0 -6 kstavector.h
M +1 -4 kstdatacollection.cpp
M +0 -1 kstdatacollection.h
M +0 -3 kstdatasource.cpp
M +6 -7 kstdatasource.h
M +0 -2 kstdateparser.cpp
M +0 -1 kstdateparser.h
M +1 -3 kstdebug.cpp
M +0 -3 kstdebug.h
M +0 -2 kstevents.h
M +0 -1 kstextension.cpp
M +0 -2 kstextension.h
M +0 -2 kstindex.h
M +0 -2 kstmath.cpp
M +0 -2 kstmath.h
M +0 -1 kstmatrix.h
M +14 -17 kstmatrixdefaults.cpp
M +0 -1 kstmatrixdefaults.h
M +0 -2 kstobject.cpp
M +0 -2 kstobjectcollection.h
M +0 -3 kstprimitive.cpp
M +0 -1 kstprimitive.h
M +0 -2 kstrmatrix.cpp
M +20 -22 kstrmatrix.h
M +1 -5 kstrvector.h
M +0 -1 kstscalar.cpp
M +1 -2 kstscalar.h
M +1 -2 kststring.cpp
M +0 -1 kststring.h
M +0 -4 kstsvector.h
M +0 -1 kstvector.cpp
M +0 -2 kstvectordefaults.cpp
M +0 -1 kstvectordefaults.h
M +0 -3 logevents.h
M +0 -2 rwlock.cpp
M +0 -1 rwlock.h
M +0 -2 stdinsource.cpp
M +0 -10 stdinsource.h
--- branches/work/kst/1.6/kst/src/libkst/defaultprimitivenames.cpp #748246:748247
@@ -87,5 +87,3 @@
KstObjectTag KST::suggestUniqueVectorTag(KstObjectTag baseTag) {
return suggestUniqueTag(baseTag, KST::vectorList);
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/defaultprimitivenames.h #748246:748247
@@ -35,4 +35,4 @@
}
#endif
-// vim: ts=2 sw=2 et
+
--- branches/work/kst/1.6/kst/src/libkst/ksdebug.cpp #748246:748247
@@ -599,4 +599,4 @@
#ifdef NDEBUG
#define kstdDebug kndDebug
#endif
-// vim: ts=2 sw=2 et
+
--- branches/work/kst/1.6/kst/src/libkst/kst_export.h #748246:748247
@@ -43,5 +43,3 @@
#endif
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstavector.h #748246:748247
@@ -20,9 +20,6 @@
#include "kstvector.h"
#include "kst_export.h"
-/**A vector with n editable pts
- *@author cbn
- */
class KstAVector : public KstVector {
public:
KST_EXPORT KstAVector(const QDomElement &e);
@@ -38,7 +35,4 @@
typedef KstSharedPtr<KstAVector> KstAVectorPtr;
typedef KstObjectList<KstAVectorPtr> KstAVectorList;
-
-
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdatacollection.cpp #748246:748247
@@ -127,7 +127,7 @@
if (KST::matrixList.tagExists(tag) || KST::scalarList.tagExists(tag)) {
return true;
}
- return false;
+ return false;
}
@@ -257,6 +257,3 @@
QString KstData::currentWindow() {
return QString::null;
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdatacollection.h #748246:748247
@@ -94,4 +94,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdatasource.cpp #748246:748247
@@ -797,7 +797,4 @@
return _instance;
}
-
-
#include "kstdatasource.moc"
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdatasource.h #748246:748247
@@ -117,7 +117,7 @@
* return the number of -samples- written or -1 if writing fails or is not supported.
*/
virtual int writeField(const double *v, const QString& field, int s, int n);
-
+
/** Read the specified sub-range of the matrix, flat-packed in z in row-major order
xStart - starting x *frame*
yStart - starting y *frame*
@@ -128,7 +128,7 @@
The suggested scaling and translation is returned in xMin, yMin, xStepSize, and yStepSize
Returns the number of *samples* read **/
virtual int readMatrix(KstMatrixData* data, const QString& matrix, int xStart, int yStart, int xNumSteps, int yNumSteps, int skip);
-
+
/** Read the specified sub-range of the matrix, flat-packed in z in row-major order (non-skipping)
xStart - starting x *frame*
yStart - starting y *frame*
@@ -137,16 +137,16 @@
The suggested scaling and translation is returned in xMin, yMin, xStepSize, and yStepSize
Returns the number of *samples* read **/
virtual int readMatrix(KstMatrixData* data, const QString& matrix, int xStart, int yStart, int xNumSteps, int yNumSteps);
-
+
/** Return the current dimensions of the matrix: xDim*yDim <= total frames **/
virtual bool matrixDimensions(const QString& matrix, int* xDim, int* yDim);
-
+
/** Returns the list of fields that support readMatrix **/
virtual QStringList matrixList() const;
/** Returns true if the field is valid, or false if it is not */
virtual bool isValidField(const QString& field) const;
-
+
/** Returns true if the matrix is valid, or false if it is not */
virtual bool isValidMatrix(const QString& field) const;
@@ -226,7 +226,7 @@
/** Place to store the list of fields. Base implementation returns this. */
QStringList _fieldList;
-
+
/** Place to store the list of matrices. Base implementation returns this. */
mutable QStringList _matrixList;
@@ -313,4 +313,3 @@
};
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdateparser.cpp #748246:748247
@@ -122,5 +122,3 @@
}
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdateparser.h #748246:748247
@@ -33,4 +33,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdebug.cpp #748246:748247
@@ -127,7 +127,7 @@
return i18n("log level debug", "Debug");
default:
return i18n("log level other", "Other");
- }
+ }
}
@@ -206,6 +206,4 @@
_hasNewError = false;
}
-
#include "kstdebug.moc"
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstdebug.h #748246:748247
@@ -89,7 +89,4 @@
QString _kstRevision;
};
-
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstevents.h #748246:748247
@@ -60,5 +60,3 @@
typedef QValueList<KstELOGAttribStruct> ELOGAttribList;
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstextension.cpp #748246:748247
@@ -55,4 +55,3 @@
}
#include "kstextension.moc"
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstextension.h #748246:748247
@@ -47,5 +47,3 @@
};
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstindex.h #748246:748247
@@ -29,5 +29,3 @@
};
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstmath.cpp #748246:748247
@@ -24,5 +24,3 @@
KST_EXPORT const double NOPOINT = 0.0/0.0; // NaN
#endif
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstmath.h #748246:748247
@@ -119,5 +119,3 @@
}
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstmatrix.h #748246:748247
@@ -171,4 +171,3 @@
typedef KstObjectCollection<KstMatrix> KstMatrixCollection;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstmatrixdefaults.cpp #748246:748247
@@ -37,62 +37,62 @@
}
const QString& KstMatrixDefaults::dataSource() const {
- return _dataSource;
+ return _dataSource;
}
int KstMatrixDefaults::xStart() const {
- return _xStart;
+ return _xStart;
}
bool KstMatrixDefaults::xCountFromEnd() const {
- return _xStart < 0;
+ return _xStart < 0;
}
int KstMatrixDefaults::yStart() const {
- return _yStart;
+ return _yStart;
}
bool KstMatrixDefaults::yCountFromEnd() const {
- return _yStart < 0;
+ return _yStart < 0;
}
int KstMatrixDefaults::xNumSteps() const {
- return _xNumSteps;
+ return _xNumSteps;
}
bool KstMatrixDefaults::xReadToEnd() const {
- return _xNumSteps < 1;
+ return _xNumSteps < 1;
}
int KstMatrixDefaults::yNumSteps() const {
- return _yNumSteps;
+ return _yNumSteps;
}
bool KstMatrixDefaults::yReadToEnd() const {
- return _yNumSteps < 1;
+ return _yNumSteps < 1;
}
bool KstMatrixDefaults::doSkip() const {
- return _doSkip;
+ return _doSkip;
}
bool KstMatrixDefaults::doAverage() const {
- return _doAve;
+ return _doAve;
}
int KstMatrixDefaults::skip() const {
- return _skip;
+ return _skip;
}
void KstMatrixDefaults::sync() {
@@ -114,7 +114,7 @@
if (j >= 0) {
rmatrixList[j]->readLock();
-
+
// get the settings
_dataSource = rmatrixList[j]->filename();
_xStart = rmatrixList[j]->reqXStart();
@@ -124,7 +124,7 @@
_skip = rmatrixList[j]->skip();
_doAve = rmatrixList[j]->doAverage();
_doSkip = rmatrixList[j]->doSkip();
-
+
rmatrixList[j]->unlock();
}
}
@@ -151,6 +151,3 @@
_doAve = config->readNumEntry("defaultMatrixDoAverage", 0);
_skip = config->readNumEntry("defaultMatrixSkip", 0);
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstmatrixdefaults.h #748246:748247
@@ -63,4 +63,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstobject.cpp #748246:748247
@@ -123,6 +123,4 @@
return _dirty;
}
-
#include "kstobject.moc"
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstobjectcollection.h #748246:748247
@@ -786,6 +786,4 @@
return outNodes;
}
-
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstprimitive.cpp #748246:748247
@@ -71,6 +71,3 @@
Q_UNUSED(providerRC)
return setLastUpdateResult(NO_CHANGE);
}
-
-
-// vim: et sw=2 ts=2
--- branches/work/kst/1.6/kst/src/libkst/kstprimitive.h #748246:748247
@@ -52,4 +52,3 @@
typedef KstObjectMap<KstPrimitivePtr> KstPrimitiveMap;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstrmatrix.cpp #748246:748247
@@ -601,5 +601,3 @@
_file->unlock();
}
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstrmatrix.h #748246:748247
@@ -22,32 +22,31 @@
#include "kstsharedptr.h"
#include "kstdatasource.h"
#include "kst_export.h"
-
+
class KST_EXPORT KstRMatrix : public KstMatrix {
public:
-
// constructor
KstRMatrix(KstDataSourcePtr file, const QString &field, KstObjectTag tag,
int xStart, int yStart,
int xNumSteps, int yNumSteps,
bool doAve, bool doSkip, int skip);
-
+
// constructor to create a saved KstRMatrix
KstRMatrix(const QDomElement &e);
-
+
// save KstRMatrix
virtual void save(QTextStream &ts, const QString& indent = QString::null);
-
+
virtual ~KstRMatrix();
-
+
// change properties of KstRMatrix
void change(KstDataSourcePtr file, const QString &field,
KstObjectTag tag,
int xStart, int yStart,
int xNumSteps, int yNumSteps,
bool doAve, bool doSkip, int skip);
-
+
// return properties of KstRMatrix
int reqXStart() const;
int reqYStart() const;
@@ -62,54 +61,54 @@
bool doSkip() const;
bool doAverage() const;
int skip() const;
-
+
// labels for this matrix
virtual QString label() const;
virtual QString fileLabel() const;
-
+
// the data source this KstRMatrix is using
KstDataSourcePtr dataSource() const;
-
+
// returns true if the file and field is valid; false otherwise
bool isValid() const;
-
+
// update KstRMatrix
virtual UpdateType update(int update_counter = -1);
// reload contents of KstRMatrix from file
void reload();
-
+
// change the datasource for this matrix
void changeFile(KstDataSourcePtr file);
-
+
// make a "copy" of this KstRMatrix
KstSharedPtr<KstRMatrix> makeDuplicate() const;
-
+
private:
void commonConstructor(KstDataSourcePtr file, const QString &field,
int reqXStart, int reqYStart, int reqNX, int reqNY,
bool doAve, bool doSkip, int skip);
-
+
// internal update function, called by update()
KstObject::UpdateType doUpdate(bool force = false);
-
+
bool doUpdateSkip(int realXStart, int realYStart, bool force);
bool doUpdateNoSkip(int realXStart, int realYStart, bool force);
-
+
void reset();
-
+
// values requested; may be different from actual matrix range
int _reqXStart, _reqYStart, _reqNX, _reqNY;
-
+
// matrix params since last update - used to determine if update is needed
int _lastXStart, _lastYStart, _lastNX, _lastNY;
bool _lastDoAve : 1;
bool _lastDoSkip : 1;
int _lastSkip;
-
+
double* _aveReadBuffer; // buffer used when performing boxcar filter
int _aveReadBufferSize;
-
+
KstDataSourcePtr _file;
QString _field; // field to read from _file
bool _doAve : 1;
@@ -122,4 +121,3 @@
typedef KstObjectList<KstRMatrixPtr> KstRMatrixList;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstrvector.h #748246:748247
@@ -27,10 +27,7 @@
class Node;
}
-/**A class for handling data vectors for kst.
- *@author cbn
- */
-
+
class KST_EXPORT KstRVector : public KstVector {
public:
/** Create an RVECTOR */
@@ -162,4 +159,3 @@
typedef KstObjectList<KstRVectorPtr> KstRVectorList;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstscalar.cpp #748246:748247
@@ -198,4 +198,3 @@
}
#include "kstscalar.moc"
-// vim: et ts=2 sw=2
--- branches/work/kst/1.6/kst/src/libkst/kstscalar.h #748246:748247
@@ -69,7 +69,7 @@
bool editable() const;
void setEditable(bool editable);
-
+
signals:
void trigger();
@@ -86,4 +86,3 @@
typedef KstObjectCollection<KstScalar> KstScalarCollection;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kststring.cpp #748246:748247
@@ -108,7 +108,7 @@
if (_provider) {
_provider->update(updateCounter);
}
-
+
return setLastUpdateResult(v == value() ? NO_CHANGE : UPDATE);
}
@@ -132,4 +132,3 @@
}
#include "kststring.moc"
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kststring.h #748246:748247
@@ -71,4 +71,3 @@
typedef KstObjectCollection<KstString> KstStringCollection;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstsvector.h #748246:748247
@@ -20,9 +20,6 @@
#include "kstvector.h"
#include "kst_export.h"
-/**A vector from x0 to x1 with n pts
- *@author cbn
- */
class KST_EXPORT KstSVector : public KstVector {
public:
KstSVector(const QDomElement &e);
@@ -39,4 +36,3 @@
typedef KstObjectList<KstSVectorPtr> KstSVectorList;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstvector.cpp #748246:748247
@@ -788,4 +788,3 @@
#undef INITSIZE
#include "kstvector.moc"
-// vim: et sw=2 ts=2
--- branches/work/kst/1.6/kst/src/libkst/kstvectordefaults.cpp #748246:748247
@@ -134,5 +134,3 @@
void KstVectorDefaults::setWizardXVector(const QString& vector) {
_wizardX = vector;
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/kstvectordefaults.h #748246:748247
@@ -55,4 +55,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/logevents.h #748246:748247
@@ -32,7 +32,4 @@
KstDebug::LogMessage _msg;
};
-
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/rwlock.cpp #748246:748247
@@ -202,5 +202,3 @@
return _mutex.locked() ? WRITELOCKED : UNLOCKED;
#endif
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/rwlock.h #748246:748247
@@ -82,4 +82,3 @@
};
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/stdinsource.cpp #748246:748247
@@ -169,5 +169,3 @@
bool KstStdinSource::isEmpty() const {
return !isValid() || _src->isEmpty();
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkst/stdinsource.h #748246:748247
@@ -31,21 +31,13 @@
virtual ~KstStdinSource();
virtual KstObject::UpdateType update(int = -1);
-
virtual int readField(double *v, const QString &field, int s, int n);
-
virtual bool isValidField(const QString &field) const;
-
virtual int samplesPerFrame(const QString &field);
-
virtual int frameCount(const QString& field = QString::null) const;
-
virtual QString fileType() const;
-
virtual void save(QTextStream &ts, const QString& indent = QString::null);
-
virtual bool isValid() const;
-
virtual bool isEmpty() const;
private:
@@ -53,6 +45,4 @@
KTempFile *_file;
};
-
#endif
-// vim: ts=2 sw=2 et
More information about the Kst
mailing list