162,9 → 162,6 |
connect(ac_ConnectTTY, SIGNAL(triggered()), this, SLOT(slot_OpenPort())); |
connect(ac_RecordCSV, SIGNAL(triggered()), this, SLOT(slot_RecordCSV())); |
|
connect(ac_LogDir, SIGNAL(triggered()), this, SLOT(slot_SetLogDir())); |
connect(ac_ParameterDir, SIGNAL(triggered()), this, SLOT(slot_SetParDir())); |
|
// Timer-Events |
connect(Ticker, SIGNAL(timeout()), SLOT(slot_Ticker())); |
|
371,30 → 368,17 |
Settings = f_Config->get_Settings(); |
Settings->write_Settings_Analog(Mode.ID); |
|
for (int a = 0; a < MaxAnalog; a++) |
// Plotter neu einrichten |
if (Old_Analog1.PlotView != Settings->Analog1.PlotView) |
{ |
if (Old_Analog1.PlotView[a] == Settings->Analog1.PlotView[a]) |
continue; |
else |
{ |
config_Plot(); |
break; |
} |
config_Plot(); |
} |
|
if (CSVFile->isOpen()) |
// CVS-Datei neu anlegen. |
if ((CSVFile->isOpen()) && (Old_Analog1.LogView != Settings->Analog1.LogView)) |
{ |
for (int a = 0; a < MaxAnalog; a++) |
{ |
if (Old_Analog1.LogView[a] == Settings->Analog1.LogView[a]) |
continue; |
else |
{ |
slot_RecordCSV(); |
slot_RecordCSV(); |
break; |
} |
} |
slot_RecordCSV(); |
slot_RecordCSV(); |
} |
|
} |
404,9 → 388,12 |
{ |
dlg_Preferences *f_Preferences = new dlg_Preferences(this); |
|
f_Preferences->set_Settings(Settings); |
|
if (f_Preferences->exec()==QDialog::Accepted) |
{ |
|
Settings = f_Preferences->get_Settings(); |
Settings->write_Settings(); |
} |
} |
|
569,32 → 556,7 |
qDebug("Shell"); |
} |
|
// Configuration -> Verzeichnisse |
///////////////////////////////// |
void MKTool::slot_SetLogDir() |
{ |
QString directory = QFileDialog::getExistingDirectory(this, "Verzeichniss für CSV-Logdateien", Settings->DIR.Logging, QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly); |
|
if ((!directory.isEmpty()) && (Settings->DIR.Logging != directory)) |
{ |
Settings->DIR.Logging = directory; |
Settings->write_Settings(); |
} |
} |
|
void MKTool::slot_SetParDir() |
{ |
QString directory = QFileDialog::getExistingDirectory(this, "Verzeichniss für Parameter-Dateien", Settings->DIR.Parameter, QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly); |
|
if ((!directory.isEmpty()) && (Settings->DIR.Parameter != directory)) |
{ |
Settings->DIR.Parameter = directory; |
Settings->write_Settings(); |
} |
|
} |
|
|
// Settings-Bereich |
/////////////////// |
|
1506,29 → 1468,26 |
//////////////////// |
void MKTool::write_Settings() |
{ |
QBitArray TabViews(6); |
TabViews.setBit(0, ac_View0->isChecked()); |
TabViews.setBit(1, ac_View1->isChecked()); |
TabViews.setBit(2, ac_View2->isChecked()); |
TabViews.setBit(3, ac_View3->isChecked()); |
TabViews.setBit(4, ac_View4->isChecked()); |
TabViews.setBit(5, ac_View5->isChecked()); |
// QBitArray TabViews(6); |
Settings->GUI.TabViews.setBit(0, ac_View0->isChecked()); |
Settings->GUI.TabViews.setBit(1, ac_View1->isChecked()); |
Settings->GUI.TabViews.setBit(2, ac_View2->isChecked()); |
Settings->GUI.TabViews.setBit(3, ac_View3->isChecked()); |
Settings->GUI.TabViews.setBit(4, ac_View4->isChecked()); |
Settings->GUI.TabViews.setBit(5, ac_View5->isChecked()); |
|
Settings->GUI.Term_Info = cb_ShowMSG->isChecked(); |
Settings->GUI.Term_Data = cb_ShowData->isChecked(); |
Settings->GUI.Term_Always = cb_ShowAlways->isChecked(); |
|
Settings->TTY.Port = le_Port->text(); |
|
QSettings Setting("KeyOz-Net", "QMK-Groundstation"); |
|
Setting.beginGroup("Port"); |
Setting.setValue("TTY", le_Port->text()); |
Setting.endGroup(); |
|
Setting.beginGroup("GUI"); |
Setting.setValue("IsMax", isMaximized()); |
Setting.setValue("Size", size()); |
Setting.setValue("Point", pos()); |
Setting.setValue("TabViews", QBitArray(TabViews)); |
Setting.endGroup(); |
} |
|
1700,7 → 1659,7 |
if (ToolBox::Decode64(RX, true)) |
{ |
int Position = RX.Decode[0]; |
if (Position < 32) |
if (Position != 31) |
{ |
Settings->Analog1.Label[Position] = ToolBox::Data2QString(RX.Decode,1,17).trimmed(); |
Position ++; |
1713,6 → 1672,7 |
{ |
lb_Analog[a]->setText(Settings->Analog1.Label[a]); |
} |
Settings->Analog1.Version = Mode.Version; |
Settings->write_Settings_AnalogLabels(HardwareID); |
config_Plot(); |
} |
1801,8 → 1761,14 |
// "Keine Verbindung zur FlightCtrl. \nParameterbearbeitung nicht moeglich.", QMessageBox::Ok); |
} |
|
Settings->read_Settings_Analog(HardwareID); |
Settings->read_Settings_AnalogLabels(HardwareID); |
Settings->read_Settings_Analog(HardwareID); |
|
if (Settings->Analog1.Version != Mode.Version) |
{ |
slot_ac_GetLabels(); |
} |
else |
for (int a = 0; a < MaxAnalog; a++) |
{ |
lb_Analog[a]->setText(Settings->Analog1.Label[a]); |
1951,7 → 1917,4 |
{ |
CSVFile->close(); |
} |
|
// close(); |
} |
|