Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 239 → Rev 240

/QMK-Groundstation/trunk/Forms/mktool.cpp
199,7 → 199,7
serialPort = new ManageSerialPort;
 
// neuer Logger
logger = new Logger(Settings);
logger = new Logger(Settings, &Mode);
 
// LCD-Dialog
f_LCD = new dlg_LCD(this);
615,9 → 615,8
// CVS-Datei neu anlegen.
if (Old_Analog1.LogView != Settings->Analog1.LogView)
{
QString filename = Settings->DIR.Logging + Mode.Hardware + " - " + QDate::currentDate().toString(("yyyy-MM-dd")) + " -- " + QTime::currentTime().toString("hh-mm");
logger->close();
logger->newLog(filename);
logger->start_Log();
update_Log();
}
 
/QMK-Groundstation/trunk/Logger/CSVLogger.cpp
20,10 → 20,11
 
#include "CSVLogger.h"
 
CSVLogger::CSVLogger(cSettings * settings) {
CSVLogger::CSVLogger(cSettings * settings, sMode * mode) {
// QFile-Instanz (Log-Datei)
csvfile = new QFile("");
this->settings = settings;
this->mode = mode;
}
 
CSVLogger::~CSVLogger() {
43,9 → 44,17
}
 
//neuen Log erstellen
void CSVLogger::newLog(QString filename) {
void CSVLogger::newLog() {
if (!csvfile->isOpen())
{
QString mode_name = mode->Hardware;
if (mode_name.size() == 0) {
mode_name = QString("groundstation_log");
}
QString filename = settings->DIR.Logging +
mode_name + "_" +
QDate::currentDate().toString(("yyyy-MM-dd")) + "_" +
QTime::currentTime().toString("hh-mm") + ".csv";
csvfile = new QFile(filename);
if (!csvfile->exists())
{
/QMK-Groundstation/trunk/Logger/CSVLogger.h
24,6 → 24,9
#include <QString>
#include <QTextStream>
#include <QFile>
#include <QDate>
#include <QTime>
#include "../global.h"
#include "../Classes/cSettings.h"
#include "DefaultLogger.h"
 
33,8 → 36,9
// Object für das Datenfile;
QFile * csvfile;
cSettings * settings;
sMode * mode;
public:
CSVLogger(cSettings * settings);
CSVLogger(cSettings * settings, sMode * mode);
~CSVLogger();
 
//schreibe log
41,7 → 45,7
void write(int * analogData);
 
//erzeuge neue Log-Datei/neuen Datensatz
void newLog(QString name);
void newLog();
 
//alles bereit zum schreiben?
bool ready();
/QMK-Groundstation/trunk/Logger/DefaultLogger.h
32,7 → 32,7
virtual void write(int *) { };
 
//erzeuge neue Log-Datei/neuen Datensatz
virtual void newLog(QString) { };
virtual void newLog() { };
 
//alles bereit zum schreiben?
virtual bool ready() { return false; };
/QMK-Groundstation/trunk/Logger/Logger.cpp
20,9 → 20,9
 
#include "Logger.h"
 
Logger::Logger(cSettings * settings)
Logger::Logger(cSettings * settings, sMode * mode)
{
csv = new CSVLogger(settings);
csv = new CSVLogger(settings, mode);
logger << csv;
active = false;
}
41,17 → 41,12
log->write(analogData);
}
 
//erzeuge neue Log-Datei/neuen Datensatz
void Logger::newLog(QString name)
{
foreach (DefaultLogger * log, logger)
log->newLog(name);
}
 
//starte Logging
void Logger::start_Log()
{
active = true;
foreach (DefaultLogger * log, logger)
log->newLog();
}
 
//soll geloggt werden?
/QMK-Groundstation/trunk/Logger/Logger.h
24,6 → 24,7
#include <QLinkedList>
#include <QString>
#include "DefaultLogger.h"
#include "../global.h"
#include "../Classes/cSettings.h"
 
//Die verschiedenen header der einzelnen Logger
40,7 → 41,7
bool active;
 
public:
Logger(cSettings * settings);
Logger(cSettings * settings, sMode * mode);
~Logger();
 
void start_Log();
51,9 → 52,6
//schreibe log
void write(int * analogData);
 
//erzeuge neue Log-Datei/neuen Datensatz
void newLog(QString name);
 
//alles schließen
void close();
};