198,8 → 198,8 |
// Seriell-Port |
serialPort = new ManageSerialPort; |
|
// QFile-Instanz (Log-Datei) |
CSVFile = new QFile(""); |
// neuer Logger |
logger = new Logger(Settings); |
|
// 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_RecordCSV())); |
connect(ac_RecordCSV, SIGNAL(triggered()), this, SLOT(slot_RecordLog())); |
|
// Timer-Events |
connect(Ticker, SIGNAL(timeout()), SLOT(slot_Ticker())); |
613,15 → 613,44 |
} |
|
// CVS-Datei neu anlegen. |
if ((CSVFile->isOpen()) && (Old_Analog1.LogView != Settings->Analog1.LogView)) |
if (Old_Analog1.LogView != Settings->Analog1.LogView) |
{ |
slot_RecordCSV(); |
slot_RecordCSV(); |
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(); |
} |
|
} |
} |
|
//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); |
1060,76 → 1089,9 |
} |
|
|
// 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() |
{ |
if (CSVFile->isOpen()) |
{ |
write_CSV(); |
} |
logger->write(AnalogData); |
|
if (ac_StartPlotter->isChecked()) |
{ |
1697,8 → 1659,5 |
set_Preferences(); |
Settings->write_Settings(); |
|
if (CSVFile->isOpen()) |
{ |
CSVFile->close(); |
logger->close(); |
} |
} |