Rev 240 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 240 | Rev 241 | ||
|---|---|---|---|
| Line 611... | Line 611... | ||
| 611 | { |
611 | { |
| 612 | config_Plot(); |
612 | config_Plot(); |
| 613 | } |
613 | } |
| Line 614... | Line 614... | ||
| 614 | 614 | ||
| 615 | // CVS-Datei neu anlegen. |
615 | // CVS-Datei neu anlegen. |
| 616 | if (Old_Analog1.LogView != Settings->Analog1.LogView) |
616 | if ((logger->is_active()) && (Old_Analog1.LogView != Settings->Analog1.LogView)) |
| 617 | { |
617 | { |
| 618 | logger->close(); |
618 | logger->close(); |
| 619 | logger->start_Log(); |
619 | logger->start_Log(); |
| 620 | update_Log(); |
620 | // update_Log(); |
| Line 621... | Line 621... | ||
| 621 | } |
621 | } |
| 622 | 622 | ||
| Line 623... | Line 623... | ||
| 623 | } |
623 | } |
| 624 | } |
624 | } |
| - | 625 | ||
| 625 | 626 | //aktualisiere Logging-Status |
|
| 626 | //aktualisiere Logging-Status |
627 | void MKTool::update_Log() |
| 627 | void MKTool::update_Log() { |
628 | { |
| 628 | if (logger->is_active()) |
629 | if (logger->is_active()) |
| 629 | { |
630 | { |
| 630 | logger->write(AnalogData); |
631 | // logger->write(AnalogData); |
| 631 | pb_Record->setText("Log Stop"); |
632 | // pb_Record->setText("Log Stop"); |
| 632 | ac_RecordCSV->setText("Log Stop"); |
633 | ac_RecordCSV->setText("Log Stop"); |
| 633 | lb_Status->setText(tr("Log-Record gestartet.")); |
634 | lb_Status->setText(tr("Log-Record gestartet.")); |
| 634 | } |
635 | } |
| 635 | else |
636 | else |
| 636 | { |
637 | { |
| 637 | pb_Record->setText("Log Aufzeichnen"); |
638 | // pb_Record->setText("Log Aufzeichnen"); |
| 638 | ac_RecordCSV->setText("Log Aufzeichnen"); |
639 | ac_RecordCSV->setText("Log Aufzeichnen"); |
| Line 639... | Line 640... | ||
| 639 | lb_Status->setText(tr("Log-Record gestopt.")); |
640 | lb_Status->setText(tr("Log-Record gestopt.")); |
| Line 645... | Line 646... | ||
| 645 | { |
646 | { |
| 646 | if (!logger->is_active()) |
647 | if (!logger->is_active()) |
| 647 | logger->start_Log(); |
648 | logger->start_Log(); |
| 648 | else |
649 | else |
| 649 | logger->close(); |
650 | logger->close(); |
| - | 651 | ||
| 650 | update_Log(); |
652 | update_Log(); |
| 651 | } |
653 | } |
| Line 652... | Line 654... | ||
| 652 | 654 | ||
| 653 | void MKTool::slot_ac_Preferences() |
655 | void MKTool::slot_ac_Preferences() |
| Line 1088... | Line 1090... | ||
| 1088 | } |
1090 | } |
| Line 1089... | Line 1091... | ||
| 1089 | 1091 | ||
| 1090 | 1092 | ||
| - | 1093 | void MKTool::show_DebugData() |
|
| 1091 | void MKTool::show_DebugData() |
1094 | { |
| Line 1092... | Line 1095... | ||
| 1092 | { |
1095 | if (logger->is_active()) |
| 1093 | logger->write(AnalogData); |
1096 | logger->write(AnalogData); |
| 1094 | 1097 | ||