[Kst] branches/work/kst/1.6/kst/src/libkstmath
Andrew Walker
arwalker at sumusltd.com
Thu Dec 13 23:18:51 CET 2007
SVN commit 748236 by arwalker:
format changes
M +0 -3 dialoglauncher.cpp
M +0 -2 dialoglauncher.h
M +0 -3 enodefactory.cpp
M +0 -3 enodefactory.h
M +1 -2 eparse-eh.cpp
M +0 -4 eparse-eh.h
M +2 -5 kstcolorsequence.cpp
M +1 -3 kstcolorsequence.h
M +0 -1 kstcsd.h
M +0 -3 kstcurvehint.cpp
M +1 -3 kstcurvehint.h
M +2 -4 kstcurvepointsymbol.cpp
M +0 -1 kstcurvepointsymbol.h
M +0 -2 kstdataobjectcollection.cpp
M +0 -1 kstdataobjectcollection.h
M +0 -1 kstdefaultnames.h
M +0 -3 kstobjectdefaults.cpp
M +2 -3 kstobjectdefaults.h
M +4 -6 kstpainter.cpp
M +0 -1 kstpainter.h
M +0 -1 kstplotdefines.h
M +15 -18 kstsettings.cpp
M +0 -1 kstsettings.h
M +0 -1 kstvectorview.h
M +0 -3 labelparser.cpp
M +0 -1 labelparser.h
M +0 -3 plugin.h
M +0 -2 plugincollection.cpp
M +0 -3 plugincollection.h
M +0 -3 pluginloader.cpp
M +0 -3 pluginloader.h
M +0 -2 pluginxmlparser.h
M +0 -5 psdcalculator.cpp
M +0 -1 psdcalculator.h
--- branches/work/kst/1.6/kst/src/libkstmath/dialoglauncher.cpp #748235:748236
@@ -121,6 +121,3 @@
Q_UNUSED(name)
Q_UNUSED(edit)
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/dialoglauncher.h #748235:748236
@@ -60,5 +60,3 @@
};
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/enodefactory.cpp #748235:748236
@@ -103,6 +103,3 @@
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/enodefactory.h #748235:748236
@@ -62,6 +62,3 @@
#undef CreateNode
#endif
-
-/* vim: ts=2 sw=2 et
- */
--- branches/work/kst/1.6/kst/src/libkstmath/eparse-eh.cpp #748235:748236
@@ -51,8 +51,7 @@
Equation::errorStack << i18n(s);
}
+
extern "C" void yyerrortoken(char c) {
Equation::errorStack << i18n(EParseErrorToken).arg(c);
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/eparse-eh.h #748235:748236
@@ -51,7 +51,3 @@
#endif
#endif
-
-/*
-vim: ts=2 sw=2 et
-*/
--- branches/work/kst/1.6/kst/src/libkstmath/kstcolorsequence.cpp #748235:748236
@@ -83,9 +83,9 @@
_self = sdColorSequence.setObject(_self, new KstColorSequence);
}
_self->createPalette();
-
+
QMemArray<int> usage(_self->_count*2);
-
+
for (int i = 0; i < _self->_count*2; i++) {
usage[i] = 0;
}
@@ -286,6 +286,3 @@
int dark_factor = 100 + ( 50 * ( ptr / _self->_count ) );
return _self->_pal->color( ptr % _self->_count).dark(dark_factor);
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcolorsequence.h #748235:748236
@@ -39,7 +39,7 @@
static KST_EXPORT int count();
static KST_EXPORT void reset();
static KST_EXPORT QColor entry(int ptr);
-
+
private:
KstColorSequence();
~KstColorSequence();
@@ -52,5 +52,3 @@
};
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcsd.h #748235:748236
@@ -120,4 +120,3 @@
typedef KstObjectList<KstCSDPtr> KstCSDList;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcurvehint.cpp #748235:748236
@@ -61,6 +61,3 @@
return new KstVCurve(tag, x, y, 0L, 0L, 0L, 0L, color);
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcurvehint.h #748235:748236
@@ -29,7 +29,7 @@
friend class KstDataObject;
public:
KstCurveHint(const QString& name = QString::null, const QString& x = QString::null, const QString& y = QString::null);
-
+
virtual ~KstCurveHint();
virtual const QString& curveName() const { return _curveName; }
@@ -49,5 +49,3 @@
typedef QValueList<KstCurveHintPtr> KstCurveHintList;
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcurvepointsymbol.cpp #748235:748236
@@ -24,7 +24,7 @@
void draw(int Type, QPainter *p, int x, int y, int lineSize, int size) {
Q_UNUSED(size)
-
+
int s;
if (Type < 0 || Type > KSTPOINT_MAXTYPE) {
@@ -36,7 +36,7 @@
} else {
s = ( 3 * lineSize ) / 2;
}
-
+
switch (Type) {
case 0:
p->drawLine(x-s, y-s, x+s, y+s);
@@ -148,5 +148,3 @@
}
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstcurvepointsymbol.h #748235:748236
@@ -31,4 +31,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstdataobjectcollection.cpp #748235:748236
@@ -44,5 +44,3 @@
return false;
}
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstdataobjectcollection.h #748235:748236
@@ -28,4 +28,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstdefaultnames.h #748235:748236
@@ -35,4 +35,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstobjectdefaults.cpp #748235:748236
@@ -96,6 +96,3 @@
_output = config->readNumEntry("defaultOutput", 0);
_interpolateHoles = config->readBoolEntry("defaultInterpolateHoles", false);
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstobjectdefaults.h #748235:748236
@@ -29,7 +29,7 @@
void sync();
double psdFreq() const;
int fftLen() const;
-
+
const QString& vUnits() const { return _vUnits; }
const QString& rUnits() const { return _rUnits; }
bool apodize() const { return _apodize; }
@@ -38,7 +38,7 @@
int apodizeFxn() const { return _apodizeFxn; }
int output() const { return _output; }
int interpolateHoles() const { return _interpolateHoles; }
-
+
void readConfig(KConfig *config);
void writeConfig(KConfig *config);
@@ -60,4 +60,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstpainter.cpp #748235:748236
@@ -58,10 +58,10 @@
int KstPainter::lineWidthAdjustmentFactor() const {
int factor = 1;
-
+
if (type() == P_PRINT || type() == P_EXPORT) {
const QRect& w(window());
-
+
//
// we want a line width of 1 to give a width of approximately 1 pt (where 1 pt = 1/72
// inch) when printing on letter sized paper. Assuming a margin of 0.25 inch in one
@@ -75,11 +75,9 @@
//
// w.width() + w.height() / scale factor = 10200 / 8.333 ~ 1300
//
-
+
factor = (w.width() + w.height()) / 1300;
}
-
+
return factor > 0 ? factor : 1;
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstpainter.h #748235:748236
@@ -58,4 +58,3 @@
};
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstplotdefines.h #748235:748236
@@ -123,4 +123,3 @@
const unsigned int numMajorTickSpacings = sizeof( MajorTickSpacings ) / sizeof( MajorTickSpacing );
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstsettings.cpp #748235:748236
@@ -36,7 +36,7 @@
showQuickStart = true;
tiedZoomGlobal = false;
curveColorSequencePalette = "Kst Colors";
-
+
xMajor = false;
yMajor = false;
xMinor = false;
@@ -52,9 +52,9 @@
yAxisInterpret = false;
yAxisInterpretation = AXIS_INTERP_CTIME;
yAxisDisplay = AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS;
-
+
defaultLineWeight = 0;
-
+
emailSMTPPort = 25;
emailRequiresAuthentication = false;
emailEncryption = EMailEncryptionNone;
@@ -62,7 +62,7 @@
timezone = "UTC";
offsetSeconds = 0;
-
+
setPrintingDefaults();
}
@@ -83,10 +83,10 @@
showQuickStart = x.showQuickStart;
tiedZoomGlobal = x.tiedZoomGlobal;
curveColorSequencePalette = x.curveColorSequencePalette;
-
+
timezone = x.timezone;
offsetSeconds = x.offsetSeconds;
-
+
xMajor = x.xMajor;
yMajor = x.yMajor;
xMinor = x.xMinor;
@@ -104,7 +104,7 @@
yAxisDisplay = x.yAxisDisplay;
defaultLineWeight = x.defaultLineWeight;
-
+
emailSender = x.emailSender;
emailSMTPServer = x.emailSMTPServer;
emailSMTPPort = x.emailSMTPPort;
@@ -120,7 +120,7 @@
printing.maintainAspect = x.printing.maintainAspect;
printing.curveWidthAdjust = x.printing.curveWidthAdjust;
printing.monochrome = x.printing.monochrome;
-
+
printing.monochromeSettings.enhanceReadability =
x.printing.monochromeSettings.enhanceReadability;
printing.monochromeSettings.pointStyleOrder =
@@ -171,10 +171,10 @@
cfg.writeEntry("Show QuickStart", showQuickStart);
cfg.writeEntry("Tied-zoom Global", tiedZoomGlobal);
cfg.writeEntry("Curve Color Sequence", curveColorSequencePalette);
-
+
cfg.writeEntry("Timezone", timezone);
cfg.writeEntry("OffsetSeconds", offsetSeconds);
-
+
cfg.setGroup("Grid Lines");
cfg.writeEntry("X Major", xMajor);
cfg.writeEntry("Y Major", yMajor);
@@ -196,7 +196,7 @@
cfg.setGroup("Curve");
cfg.writeEntry("DefaultLineWeight", defaultLineWeight);
-
+
cfg.setGroup("EMail");
cfg.writeEntry("Sender", emailSender);
cfg.writeEntry("Server", emailSMTPServer);
@@ -214,7 +214,7 @@
cfg.writeEntry("kst-plot-maintain-aspect-ratio", printing.maintainAspect);
cfg.writeEntry("kst-plot-curve-width-adjust", printing.curveWidthAdjust);
cfg.writeEntry("kst-plot-monochrome", printing.monochrome);
-
+
cfg.writeEntry("kst-plot-monochromesettings-enhancereadability",
printing.monochromeSettings.enhanceReadability);
cfg.writeEntry("kst-plot-monochromesettings-pointstyleorder",
@@ -246,10 +246,10 @@
showQuickStart = cfg.readBoolEntry("Show QuickStart", true);
tiedZoomGlobal = cfg.readBoolEntry("Tied-zoom Global", true);
curveColorSequencePalette = cfg.readEntry("Curve Color Sequence", "Kst Colors");
-
+
timezone = cfg.readEntry("Timezone", "UTC");
offsetSeconds = cfg.readNumEntry("OffsetSeconds", 0);
-
+
cfg.setGroup("Grid Lines");
xMajor = cfg.readBoolEntry("X Major", false);
yMajor = cfg.readBoolEntry("Y Major", false);
@@ -271,7 +271,7 @@
cfg.setGroup("Curve");
defaultLineWeight = cfg.readNumEntry("DefaultLineWeight", 0);
-
+
cfg.setGroup("EMail");
KEMailSettings es;
emailSender = cfg.readEntry("Sender", es.getSetting(KEMailSettings::EmailAddress));
@@ -331,6 +331,3 @@
int KstSettings::utcOffset() {
return offsetSeconds;
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstsettings.h #748235:748236
@@ -122,4 +122,3 @@
};
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/kstvectorview.h #748235:748236
@@ -117,4 +117,3 @@
typedef KstObjectList<KstVectorViewPtr> KstVectorViewList;
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/labelparser.cpp #748235:748236
@@ -667,6 +667,3 @@
}
return parsed;
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/labelparser.h #748235:748236
@@ -82,4 +82,3 @@
}
#endif
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/plugin.h #748235:748236
@@ -154,7 +154,4 @@
QString _xmlFile, _soFile;
};
-
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/plugincollection.cpp #748235:748236
@@ -287,5 +287,3 @@
}
#include "plugincollection.moc"
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/plugincollection.h #748235:748236
@@ -121,7 +121,4 @@
void loadPluginsFor(const QString& path);
};
-
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/pluginloader.cpp #748235:748236
@@ -93,6 +93,3 @@
return plug;
}
-
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/pluginloader.h #748235:748236
@@ -39,7 +39,4 @@
PluginXMLParser *_parser;
};
-
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/pluginxmlparser.h #748235:748236
@@ -55,5 +55,3 @@
};
#endif
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/psdcalculator.cpp #748235:748236
@@ -15,9 +15,6 @@
* *
***************************************************************************/
-/** A utility class for calculating spectra
-*/
-
#include <assert.h>
#include <math.h>
@@ -330,5 +327,3 @@
return int(pow(2, psdloglen - 1));
}
-
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/libkstmath/psdcalculator.h #748235:748236
@@ -73,4 +73,3 @@
};
#endif
-// vim: ts=2 sw=2 et
More information about the Kst
mailing list