save/load (für Studie) funktioniert

Thomas Witte · Thomas Witte · commit 3b6a58420088 · 2020-05-20T17:06:15.000+02:00
diff --git a/interactive_script/src/interactive_script_plugin/interactive_script_plugin.cpp b/interactive_script/src/interactive_script_plugin/interactive_script_plugin.cpp
@@ -264,8 +264,10 @@ void InteractiveScriptGui::on_save() {
         }
     }*/
 
-    Filename f {"/data/save_" + std::to_string(time(nullptr)) + ".xml", Filename::XML};
+    Filename f {"/data/save_" + std::to_string(time(nullptr)) + ".manual.xml", Filename::XML};
     save_file(f, ui_.blockly_widget->xml().toStdString());
+    ui_.terminal->setPlainText(QString::fromStdString(f.name + " saved"));
+    ROS_INFO_STREAM(f.name << " saved"); 
 }
 
 void InteractiveScriptGui::on_load() {
@@ -283,9 +285,11 @@ void InteractiveScriptGui::on_load() {
         }
     }*/
 
-    Filename f {QDir("/data", "save_*.xml").entryList().back().toStdString(), Filename::XML};
+    Filename f {"/data/" + QDir("/data", "*.manual.xml").entryList().back().toStdString(), Filename::XML};
     ui_.blockly_widget->loadXml(QString::fromStdString(load_file(f)));
     ui_.tabWidget->setCurrentWidget(ui_.blockly_tab);
+    ui_.terminal->setPlainText(QString::fromStdString(f.name + " loaded"));
+    ROS_INFO_STREAM(f.name << " loaded"); 
 }
 
 bool InteractiveScriptGui::hasConfiguration() const {

Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,10 @@ void InteractiveScriptGui::on_save() {`
`264`	`264`	`}`
`265`	`265`	`}*/`
`266`	`266`
`267`		`- Filename f {"/data/save_" + std::to_string(time(nullptr)) + ".xml", Filename::XML};`
	`267`	`+ Filename f {"/data/save_" + std::to_string(time(nullptr)) + ".manual.xml", Filename::XML};`
`268`	`268`	`save_file(f, ui_.blockly_widget->xml().toStdString());`
	`269`	`+ ui_.terminal->setPlainText(QString::fromStdString(f.name + " saved"));`
	`270`	`+ ROS_INFO_STREAM(f.name << " saved");`
`269`	`271`	`}`
`270`	`272`
`271`	`273`	`void InteractiveScriptGui::on_load() {`
`@@ -283,9 +285,11 @@ void InteractiveScriptGui::on_load() {`
`283`	`285`	`}`
`284`	`286`	`}*/`
`285`	`287`
`286`		`- Filename f {QDir("/data", "save_*.xml").entryList().back().toStdString(), Filename::XML};`
	`288`	`+ Filename f {"/data/" + QDir("/data", "*.manual.xml").entryList().back().toStdString(), Filename::XML};`
`287`	`289`	`ui_.blockly_widget->loadXml(QString::fromStdString(load_file(f)));`
`288`	`290`	`ui_.tabWidget->setCurrentWidget(ui_.blockly_tab);`
	`291`	`+ ui_.terminal->setPlainText(QString::fromStdString(f.name + " loaded"));`
	`292`	`+ ROS_INFO_STREAM(f.name << " loaded");`
`289`	`293`	`}`
`290`	`294`
`291`	`295`	`bool InteractiveScriptGui::hasConfiguration() const {`