/QMK-Groundstation/trunk/Logger/Logger.cpp |
---|
File deleted |
\ No newline at end of file |
/QMK-Groundstation/trunk/Logger/CSVLogger.h |
---|
File deleted |
\ No newline at end of file |
/QMK-Groundstation/trunk/Logger/Logger.h |
---|
File deleted |
\ No newline at end of file |
/QMK-Groundstation/trunk/Logger/DefaultLogger.h |
---|
File deleted |
\ No newline at end of file |
/QMK-Groundstation/trunk/Logger/CSVLogger.cpp |
---|
File deleted |
\ No newline at end of file |
/QMK-Groundstation/trunk/Forms/mktool.cpp |
---|
60,7 → 60,7 |
tab_Main->removeTab(6); |
// Tab mit Wegpunkte-Elementen verbergen |
tab_Main->removeTab(5); |
tab_Main->removeTab(5); |
// Settings-Tab hinzufügen. |
f_Settings = new wdg_Settings( this ); |
198,8 → 198,8 |
// Seriell-Port |
serialPort = new ManageSerialPort; |
// neuer Logger |
logger = new Logger(Settings); |
// QFile-Instanz (Log-Datei) |
CSVFile = new QFile(""); |
// LCD-Dialog |
f_LCD = new dlg_LCD(this); |
275,7 → 275,7 |
connect(pb_HexFile, SIGNAL(clicked()), this, SLOT(slot_pb_HexFile())); |
// CVS-Record starten / stoppen |
connect(ac_RecordCSV, SIGNAL(triggered()), this, SLOT(slot_RecordLog())); |
connect(ac_RecordCSV, SIGNAL(triggered()), this, SLOT(slot_RecordCSV())); |
// Timer-Events |
connect(Ticker, SIGNAL(timeout()), SLOT(slot_Ticker())); |
613,44 → 613,15 |
} |
// CVS-Datei neu anlegen. |
if (Old_Analog1.LogView != Settings->Analog1.LogView) |
if ((CSVFile->isOpen()) && (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); |
update_Log(); |
slot_RecordCSV(); |
slot_RecordCSV(); |
} |
} |
} |
//aktualisiere Logging-Status |
void MKTool::update_Log() { |
if (logger->is_active()) |
{ |
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"); |
lb_Status->setText(tr("Log-Record gestopt.")); |
} |
} |
//starte/stoppe Logging, wenn auf den entsprechenden Button gedrückt wurde |
void MKTool::slot_RecordLog() |
{ |
if (!logger->is_active()) |
logger->start_Log(); |
else |
logger->close(); |
update_Log(); |
} |
void MKTool::slot_ac_Preferences() |
{ |
dlg_Preferences *f_Preferences = new dlg_Preferences(this); |
1089,9 → 1060,76 |
} |
// Debug-Daten anzeigen und Aufzeichnen |
/////////////////////////////////////// |
void MKTool::write_CSV() |
{ |
QTextStream Out(CSVFile); |
for (int a=0; a<MaxAnalog; a++) |
{ |
if (Settings->Analog1.LogView[a]) |
{ |
Out << AnalogData[a]; |
if (a < MaxAnalog - 1) |
Out << ';'; |
} |
} |
Out << "\n"; |
} |
void MKTool::slot_RecordCSV() // DONE 0.71g |
{ |
if (!CSVFile->isOpen()) |
{ |
QString Filename = Settings->DIR.Logging + Mode.Hardware + " - " + 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); |
} |
// pb_Record->setIcon(ToolBox::Icon(6)); |
// pb_Record->setText("CSV Stop"); |
// ac_RecordCSV->setIcon(ToolBox::Icon(6)); |
ac_RecordCSV->setText("CSV Stop"); |
lb_Status->setText(tr("CVS-Record gestartet.")); |
} |
else |
{ |
CSVFile->close(); |
// pb_Record->setIcon(ToolBox::Icon(7)); |
// pb_Record->setText("CSV Aufzeichnen"); |
// ac_RecordCSV->setIcon(ToolBox::Icon(7)); |
ac_RecordCSV->setText("CSV Aufzeichnen"); |
lb_Status->setText(tr("CVS-Record gestopt.")); |
} |
} |
void MKTool::show_DebugData() |
{ |
logger->write(AnalogData); |
if (CSVFile->isOpen()) |
{ |
write_CSV(); |
} |
if (ac_StartPlotter->isChecked()) |
{ |
1659,5 → 1697,8 |
set_Preferences(); |
Settings->write_Settings(); |
logger->close(); |
if (CSVFile->isOpen()) |
{ |
CSVFile->close(); |
} |
} |
/QMK-Groundstation/trunk/Forms/mktool.h |
---|
47,8 → 47,8 |
#include "../Classes/cQMK_Server.h" |
#include "../Classes/cAttitude.h" |
#include "../Classes/cSpeedMeter.h" |
#include "../Logger/Logger.h" |
class QextSerialPort; |
class MKTool : public QMainWindow, public Ui::dlg_mktool_UI |
117,8 → 117,8 |
int LCD_Page; |
int LCD_MAX_Page; |
//Logger für CVS und andere |
Logger * logger; |
// Object für das Datenfile; |
QFile *CSVFile; |
sMode Mode; |
sRxData RxData; |
156,7 → 156,7 |
// Debugdaten anzeigen und speichern. |
void show_DebugData(); |
void update_Log(); |
void write_CSV(); |
// Programmeinstellungen speichern |
void set_Preferences(); |
206,7 → 206,7 |
void slot_TabChanged(int Tab); |
void slot_RecordLog(); |
void slot_RecordCSV(); |
void slot_ScrollPlot(int Pos); |
/QMK-Groundstation/trunk/debian.pro |
---|
35,8 → 35,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
59,9 → 57,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
/QMK-Groundstation/trunk/eeepc.pro |
---|
35,8 → 35,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
59,9 → 57,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
/QMK-Groundstation/trunk/gentoo.pro |
---|
35,8 → 35,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
59,9 → 57,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
/QMK-Groundstation/trunk/osx.pro |
---|
35,8 → 35,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
59,9 → 57,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
/QMK-Groundstation/trunk/suse.pro |
---|
35,8 → 35,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
59,9 → 57,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
/QMK-Groundstation/trunk/win.pro |
---|
56,8 → 56,6 |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
80,9 → 78,6 |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h |
win32:HEADERS += SerialPort/win_qextserialport.h |