Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 240 → Rev 241

/QMK-Groundstation/trunk/Forms/mktool.cpp
613,11 → 613,11
}
 
// CVS-Datei neu anlegen.
if (Old_Analog1.LogView != Settings->Analog1.LogView)
if ((logger->is_active()) && (Old_Analog1.LogView != Settings->Analog1.LogView))
{
logger->close();
logger->start_Log();
update_Log();
// update_Log();
}
 
}
624,18 → 624,19
}
 
//aktualisiere Logging-Status
void MKTool::update_Log() {
void MKTool::update_Log()
{
if (logger->is_active())
{
logger->write(AnalogData);
pb_Record->setText("Log Stop");
// logger->write(AnalogData);
// pb_Record->setText("Log Stop");
ac_RecordCSV->setText("Log Stop");
lb_Status->setText(tr("Log-Record gestartet."));
}
else
{
pb_Record->setText("Log Aufzeichnen");
ac_RecordCSV->setText("Log Aufzeichnen");
// pb_Record->setText("Log Aufzeichnen");
ac_RecordCSV->setText("Log Aufzeichnen");
lb_Status->setText(tr("Log-Record gestopt."));
}
}
647,6 → 648,7
logger->start_Log();
else
logger->close();
 
update_Log();
}
 
1090,7 → 1092,8
 
void MKTool::show_DebugData()
{
logger->write(AnalogData);
if (logger->is_active())
logger->write(AnalogData);
 
if (ac_StartPlotter->isChecked())
{
/QMK-Groundstation/trunk/Logger/CSVLogger.cpp
20,7 → 20,8
 
#include "CSVLogger.h"
 
CSVLogger::CSVLogger(cSettings * settings, sMode * mode) {
CSVLogger::CSVLogger(cSettings * settings, sMode * mode)
{
// QFile-Instanz (Log-Datei)
csvfile = new QFile("");
this->settings = settings;
27,12 → 28,14
this->mode = mode;
}
 
CSVLogger::~CSVLogger() {
CSVLogger::~CSVLogger()
{
close();
}
 
//datei ist geöffnet bedeutet wir sind soweit und können schreiben
bool CSVLogger::ready() {
bool CSVLogger::ready()
{
return csvfile->isOpen();
}
 
44,27 → 47,51
}
 
//neuen Log erstellen
void CSVLogger::newLog() {
void CSVLogger::newLog()
{
if (!csvfile->isOpen())
{
QString mode_name = mode->Hardware;
if (mode_name.size() == 0) {
 
if (mode_name.size() == 0)
{
mode_name = QString("groundstation_log");
}
QString filename = settings->DIR.Logging +
mode_name + "_" +
 
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())
{
csvfile->open(QIODevice::Append | QIODevice::Text);
 
QTextStream Out(csvfile);
 
for (int a = 0; a < MaxAnalog; a++)
{
if (settings->Analog1.LogView[a])
{
Out << settings->Analog1.Label[a];
 
if (a < MaxAnalog - 1)
Out << ';';
}
}
Out << "\n";
}
else
{
csvfile->open(QIODevice::Append | QIODevice::Text);
}
}
}
 
//daten schreiben
void CSVLogger::write(int * analogData) {
void CSVLogger::write(int * analogData)
{
if (csvfile->isOpen())
{
QTextStream out(csvfile);
79,4 → 106,4
}
out << "\n";
}
}
}