4 changes: 2 additions & 2 deletions src/libkstmath/eventmonitorentry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ extern struct yy_buffer_state *yy_scan_string(const char*);

namespace Kst {

const QString EventMonitorEntry::staticTypeString = QT_TR_NOOP("Event Monitor");
const QString EventMonitorEntry::staticTypeTag = QT_TR_NOOP("eventmonitor");
const QString EventMonitorEntry::staticTypeString = "Event Monitor";
const QString EventMonitorEntry::staticTypeTag = "eventmonitor";

namespace {
const int EventMonitorEventType = int(QEvent::User) + 2931;
Expand Down
4 changes: 2 additions & 2 deletions src/libkstmath/histogram.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

namespace Kst {

const QString Histogram::staticTypeString = QT_TR_NOOP("Histogram");
const QString Histogram::staticTypeTag = QT_TR_NOOP("histogram");
const QString Histogram::staticTypeString = "Histogram";
const QString Histogram::staticTypeTag = "histogram";

static const QLatin1String& RAWVECTOR = QLatin1String("I");
static const QLatin1String& BINS = QLatin1String("B");
Expand Down
4 changes: 2 additions & 2 deletions src/libkstmath/image.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

namespace Kst {

const QString Image::staticTypeString = QT_TR_NOOP("Image");
const QString Image::staticTypeTag = QT_TR_NOOP("image");
const QString Image::staticTypeString = "Image";
const QString Image::staticTypeTag = "image";

static const QLatin1String& THEMATRIX = QLatin1String("THEMATRIX");

Expand Down
41 changes: 25 additions & 16 deletions src/libkstmath/plotdefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,35 @@ struct AxisDisplay {
AxisDisplayType type;
};

//QT_TRANSLATE_NOOP3 ( context, sourceText, comment )

const AxisInterpretation AxisInterpretations[] = {
{ QT_TR_NOOP("Julian Year"), AXIS_INTERP_YEAR },
{ QT_TR_NOOP("Standard C time"), AXIS_INTERP_CTIME },
{ QT_TRANSLATE_NOOP("Julian Date", "JD"), AXIS_INTERP_JD },
{ QT_TRANSLATE_NOOP("Modified Julian Date", "MJD"), AXIS_INTERP_MJD },
{ QT_TRANSLATE_NOOP("Reduced Julian Date", "RJD"), AXIS_INTERP_RJD },
{ QT_TRANSLATE_NOOP("Temps Atomique International", "TAI"), AXIS_INTERP_AIT },
{ QT_TR_NOOP("Excel time (Windows)"), AXIS_INTERP_EXCEL }
{ QT_TRANSLATE_NOOP("AxisTab", "Julian Year"), AXIS_INTERP_YEAR },
{ QT_TRANSLATE_NOOP("AxisTab", "Standard C time"), AXIS_INTERP_CTIME },
//{ QT_TRANSLATE_NOOP3("AxisTab", "JD", "Julian Date"), AXIS_INTERP_JD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "MJD", "Modified Julian Date"), AXIS_INTERP_MJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "RJD", "Reduced Julian Date"), AXIS_INTERP_RJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "TAI", "Temps Atomique International"), AXIS_INTERP_AIT },
{ QT_TRANSLATE_NOOP("AxisTab", "JD"), AXIS_INTERP_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "MJD"), AXIS_INTERP_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "RJD"), AXIS_INTERP_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "TAI"), AXIS_INTERP_AIT },
{ QT_TRANSLATE_NOOP("AxisTab", "Excel time (Windows)"), AXIS_INTERP_EXCEL }
};

const AxisDisplay AxisDisplays[] = {
{ QT_TR_NOOP("Julian Year"), AXIS_DISPLAY_YEAR },
{ QT_TR_NOOP("YYYY/MM/DD HH:MM:SS.SS"), AXIS_DISPLAY_YYMMDDHHMMSS_SS },
{ QT_TR_NOOP("DD/MM/YYYY HH:MM:SS.SS"), AXIS_DISPLAY_DDMMYYHHMMSS_SS },
{ QT_TR_NOOP("<Qt Text Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS },
{ QT_TR_NOOP("<Qt Local Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS },
{ QT_TRANSLATE_NOOP("Julian Date", "JD"), AXIS_DISPLAY_JD },
{ QT_TRANSLATE_NOOP("Modified Julian Date", "MJD"), AXIS_DISPLAY_MJD },
{ QT_TRANSLATE_NOOP("Reduced Julian Date", "RJD"), AXIS_DISPLAY_RJD },
{ QT_TR_NOOP("Formatted String"), AXIS_DISPLAY_QTDATETIME_FORMAT }
{ QT_TRANSLATE_NOOP("AxisTab", "Julian Year"), AXIS_DISPLAY_YEAR },
{ QT_TRANSLATE_NOOP("AxisTab", "YYYY/MM/DD HH:MM:SS.SS"), AXIS_DISPLAY_YYMMDDHHMMSS_SS },
{ QT_TRANSLATE_NOOP("AxisTab", "DD/MM/YYYY HH:MM:SS.SS"), AXIS_DISPLAY_DDMMYYHHMMSS_SS },
{ QT_TRANSLATE_NOOP("AxisTab", "<Qt Text Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS },
{ QT_TRANSLATE_NOOP("AxisTab", "<Qt Local Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS },
//{ QT_TRANSLATE_NOOP3("AxisTab", "JD", "Julian Date"), AXIS_DISPLAY_JD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "MJD", "Modified Julian Date"), AXIS_DISPLAY_MJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "RJD", "Reduced Julian Date"), AXIS_DISPLAY_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "JD"), AXIS_DISPLAY_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "MJD"), AXIS_DISPLAY_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "RJD"), AXIS_DISPLAY_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "Formatted String"), AXIS_DISPLAY_QTDATETIME_FORMAT }
};

const unsigned int numAxisInterpretations = sizeof( AxisInterpretations ) / sizeof( AxisInterpretation );
Expand Down
4 changes: 2 additions & 2 deletions src/libkstmath/psd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ extern "C" void rdft(int n, int isgn, double *a);

namespace Kst {

const QString PSD::staticTypeString = QT_TR_NOOP("Power Spectrum");
const QString PSD::staticTypeTag = QT_TR_NOOP("powerspectrum");
const QString PSD::staticTypeString = "Power Spectrum";
const QString PSD::staticTypeTag = "powerspectrum";

static const QLatin1String& INVECTOR = QLatin1String("I");
static const QLatin1String& SVECTOR = QLatin1String("S");
Expand Down
2 changes: 1 addition & 1 deletion src/libkstmath/psdcalculator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ int PSDCalculator::calculatePowerSpectrum(
PSDType outputType, double inputSamplingFreq) {

if (outputLen != calculateOutputVectorLength(inputLen, average, averageLen)) {
Kst::Debug::self()->log(Kst::Debug::self()->tr("in PSDCalculator::calculatePowerSpectrum: received output array with wrong length."), Kst::Debug::Error);
Kst::Debug::self()->log(Kst::Debug::tr("in PSDCalculator::calculatePowerSpectrum: received output array with wrong length."), Kst::Debug::Error);
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/libkstmath/relation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

namespace Kst {

const QString Relation::staticTypeString = QT_TR_NOOP("Relation");
const QString Relation::staticTypeString = "Relation";

Relation::Relation(ObjectStore *store) : Object() {
Q_UNUSED(store);
Expand Down
1 change: 0 additions & 1 deletion src/plugins/dataobject/lockin/iirfilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ template <class T> class BesselLP4 : public IIRFilter<T> {
#include <fstream>
#include <numeric>
#include <cmath>
#include "iirfilter.h"

using std::cerr;
using std::endl;
Expand Down