load and save

Thomas Witte · Thomas Witte · commit 60fc171b0c94 · 2020-05-08T13:40:13.000+02:00
diff --git a/interactive_script/CMakeLists.txt b/interactive_script/CMakeLists.txt
@@ -129,6 +129,7 @@ set(interactive_script_plugin_SRCS
     src/interactive_script_plugin/builtins.cpp
     src/interactive_script_plugin/blocklybridge.cpp
     src/interactive_script_plugin/blocklywidget.cpp
+    src/interactive_script_plugin/load_save_util.cpp
 )
 
 set(interactive_script_plugin_HDRS
@@ -140,6 +141,7 @@ set(interactive_script_plugin_HDRS
     include/interactive_script/builtins.h
     include/interactive_script/blocklybridge.h
     include/interactive_script/blocklywidget.h
+    include/interactive_script/load_save_util.h
 )
 
 set(interactive_script_plugin_UIS
diff --git a/interactive_script/include/interactive_script/blocklybridge.h b/interactive_script/include/interactive_script/blocklybridge.h
@@ -12,6 +12,8 @@ class BlocklyBridge : public QObject
     explicit BlocklyBridge(QObject *parent = nullptr);
     void setEditor(QPlainTextEdit *editor);
 
+    QString current_xml = "";
+
 private:
     QPlainTextEdit *editor = nullptr;
 
diff --git a/interactive_script/include/interactive_script/blocklywidget.h b/interactive_script/include/interactive_script/blocklywidget.h
@@ -19,6 +19,8 @@ class BlocklyWidget : public QWebEngineView
 public:
     explicit BlocklyWidget(QWidget *parent = nullptr);
     void setEditor(QPlainTextEdit *editor);
+    void loadXml(const QString& xml);
+    QString xml();
 
 signals:
 
diff --git a/interactive_script/include/interactive_script/interactive_script_plugin.h b/interactive_script/include/interactive_script/interactive_script_plugin.h
@@ -14,6 +14,7 @@
 #include <memory>
 #include <interactive_script/builtins.h>
 #include <interactive_script/blocklybridge.h>
+#include <interactive_script/load_save_util.h>
 
 namespace interactive_script_plugin
 {
@@ -61,6 +62,8 @@ public slots:
     void onRunScriptClicked();
     void updateMarkerInterface() {vis.marker.update();}
     void updateTf();
+    void on_save();
+    void on_load();
 };
 
 }  // namespace rqt_graph_editor
diff --git a/interactive_script/include/interactive_script/load_save_util.h b/interactive_script/include/interactive_script/load_save_util.h
@@ -0,0 +1,24 @@
+#ifndef LOAD_SAVE_UTIL_H
+#define LOAD_SAVE_UTIL_H
+
+#include <optional>
+#include <string>
+
+namespace load_save {
+
+struct Filename {
+    std::string name;
+    enum {LUA, XML} format;
+};
+
+std::optional<Filename> save_dialog(bool blockly_perspective);
+
+std::optional<Filename> load_dialog();
+
+void save_file(const Filename& filename, const std::string& content);
+
+std::string load_file(const Filename& filename);
+
+}
+
+#endif // LOAD_SAVE_UTIL_H
diff --git a/interactive_script/interactive_script.files b/interactive_script/interactive_script.files
@@ -1,6 +1,7 @@
 CMakeLists.txt
 include/interactive_script/builtins.h
 include/interactive_script/interactive_script_plugin.h
+include/interactive_script/load_save_util.h
 include/interactive_script/marker_interface.h
 include/interactive_script/quad_interface.h
 include/interactive_script/tf_interface.h
@@ -12,6 +13,7 @@ setup.py
 src/interactive_script_plugin/builtins.cpp
 src/interactive_script_plugin/interactive_script_plugin.cpp
 src/interactive_script_plugin/interactive_script_plugin.ui
+src/interactive_script_plugin/load_save_util.cpp
 src/interactive_script_plugin/marker_interface.cpp
 src/interactive_script_plugin/quad_interface.cpp
 src/interactive_script_plugin/tf_interface.cpp
diff --git a/interactive_script/src/interactive_script_plugin/blocklybridge.cpp b/interactive_script/src/interactive_script_plugin/blocklybridge.cpp
@@ -27,6 +27,7 @@ void BlocklyBridge::state_changed(const QString& xml, const QString& lua) {
     if (editor) {
         editor->setPlainText(lua);
     }
+    current_xml = xml;
 }
 
 void BlocklyBridge::setEditor(QPlainTextEdit *editor) {
diff --git a/interactive_script/src/interactive_script_plugin/blocklywidget.cpp b/interactive_script/src/interactive_script_plugin/blocklywidget.cpp
@@ -18,6 +18,15 @@ BlocklyWidget::BlocklyWidget(QWidget *parent) : QWebEngineView(parent)
     page()->setWebChannel(channel);
 }
 
+void BlocklyWidget::loadXml(const QString& xml) {
+    std::cout << "Blockly.Xml.clearWorkspaceAndLoadFromXml('" + xml.toStdString() + "', workspace);" << std::endl;
+    page()->runJavaScript("Blockly.Xml.clearWorkspaceAndLoadFromXml(Blockly.Xml.textToDom('" + xml + "'), workspace);");
+}
+
+QString BlocklyWidget::xml() {
+    return bridge->current_xml;
+}
+
 void BlocklyWidget::setEditor(QPlainTextEdit *editor) {
     bridge->setEditor(editor);
 }
diff --git a/interactive_script/src/interactive_script_plugin/interactive_script_plugin.cpp b/interactive_script/src/interactive_script_plugin/interactive_script_plugin.cpp
@@ -43,6 +43,10 @@ void InteractiveScriptGui::initPlugin(qt_gui_cpp::PluginContext& context)
 
     connect(ui_.run_button, &QPushButton::clicked,
             this, &InteractiveScriptGui::onRunScriptClicked);
+    connect(ui_.save_button, &QPushButton::clicked,
+            this, &InteractiveScriptGui::on_save);
+    connect(ui_.load_button, &QPushButton::clicked,
+            this, &InteractiveScriptGui::on_load);
 
     connect(&vis.signal, &SignalObject::changeEditorText,
             this, &InteractiveScriptGui::onChangeEditorText);
@@ -241,6 +245,38 @@ void InteractiveScriptGui::updateTf() {
     }
 }
 
+void InteractiveScriptGui::on_save() {
+    using namespace load_save;
+    if(auto file = save_dialog(ui_.tabWidget->currentWidget() == ui_.blockly_tab)) {
+        switch (file->format) {
+        case Filename::XML:
+            save_file(*file, ui_.blockly_widget->xml().toStdString());
+            ui_.tabWidget->setCurrentWidget(ui_.blockly_tab);
+            break;
+        case Filename::LUA:
+            save_file(*file, ui_.editor->toPlainText().toStdString());
+            ui_.tabWidget->setCurrentWidget(ui_.code_tab);
+            break;
+        }
+    }
+}
+
+void InteractiveScriptGui::on_load() {
+    using namespace load_save;
+    if (auto file = load_dialog()) {
+        switch (file->format) {
+        case Filename::XML:
+            ui_.blockly_widget->loadXml(QString::fromStdString(load_file(*file)));
+            ui_.tabWidget->setCurrentWidget(ui_.blockly_tab);
+            break;
+        case Filename::LUA:
+            ui_.editor->setPlainText(QString::fromStdString(load_file(*file)));
+            ui_.tabWidget->setCurrentWidget(ui_.code_tab);
+            break;
+        }
+    }
+}
+
 bool InteractiveScriptGui::hasConfiguration() const {
   return true;
 }
diff --git a/interactive_script/src/interactive_script_plugin/interactive_script_plugin.ui b/interactive_script/src/interactive_script_plugin/interactive_script_plugin.ui
@@ -19,6 +19,20 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="save_button">
+       <property name="text">
+        <string>Save</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="load_button">
+       <property name="text">
+        <string>Load</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
diff --git a/interactive_script/src/interactive_script_plugin/load_save_util.cpp b/interactive_script/src/interactive_script_plugin/load_save_util.cpp
@@ -0,0 +1,60 @@
+#include <interactive_script/load_save_util.h>
+#include <QFileDialog>
+#include <iostream>
+#include <fstream>
+
+namespace load_save {
+
+std::optional<Filename> save_dialog(bool blockly_perspective) {
+    QString selected_filter = "Blockly Xml (*.xml)";
+    if (!blockly_perspective) {
+        selected_filter = "Lua Script (*.lua)";
+    }
+
+    Filename result;
+
+    result.name = QFileDialog::getSaveFileName(nullptr, "Save script", "", "Lua Script (*.lua);;Blockly Xml (*.xml)", &selected_filter).toStdString();
+    result.format = (selected_filter == "Blockly Xml (*.xml)" ? Filename::XML : Filename::LUA);
+
+    if (result.name.empty())
+        return std::nullopt;
+
+    return std::move(result);
+}
+
+std::optional<Filename> load_dialog() {
+
+    QString name = QFileDialog::getOpenFileName(nullptr, "Load script", "", "Supported Scripts (*.lua *.xml)");
+
+    Filename result;
+    result.name = name.toStdString();
+    result.format = (name.endsWith(".lua") ? Filename::LUA : Filename::XML);
+
+    if (result.name.empty())
+        return std::nullopt;
+
+    return std::move(result);
+}
+
+void save_file(const Filename& filename, const std::string& content) {
+    std::cout << "Saving file " << filename.name << (filename.format == Filename::LUA ? " (lua) " : " (xml) ") << std::endl;
+
+    std::ofstream out(filename.name, std::ios_base::out);
+    out << content;
+    out.close();
+}
+
+std::string load_file(const Filename& filename) {
+    std::cout << "Loading file " << filename.name << (filename.format == Filename::LUA ? " (lua) " : " (xml) ") << std::endl;
+
+    std::string content, buffer;
+    std::ifstream in(filename.name, std::ios_base::in);
+    while (std::getline(in, buffer)) {
+        content += buffer;
+    }
+    in.close();
+
+    return content;
+}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ set(interactive_script_plugin_SRCS`
`129`	`129`	`src/interactive_script_plugin/builtins.cpp`
`130`	`130`	`src/interactive_script_plugin/blocklybridge.cpp`
`131`	`131`	`src/interactive_script_plugin/blocklywidget.cpp`
	`132`	`+ src/interactive_script_plugin/load_save_util.cpp`
`132`	`133`	`)`
`133`	`134`
`134`	`135`	`set(interactive_script_plugin_HDRS`
`@@ -140,6 +141,7 @@ set(interactive_script_plugin_HDRS`
`140`	`141`	`include/interactive_script/builtins.h`
`141`	`142`	`include/interactive_script/blocklybridge.h`
`142`	`143`	`include/interactive_script/blocklywidget.h`
	`144`	`+ include/interactive_script/load_save_util.h`
`143`	`145`	`)`
`144`	`146`
`145`	`147`	`set(interactive_script_plugin_UIS`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ void BlocklyBridge::state_changed(const QString& xml, const QString& lua) {`
`27`	`27`	`if (editor) {`
`28`	`28`	`editor->setPlainText(lua);`
`29`	`29`	`}`
	`30`	`+ current_xml = xml;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`void BlocklyBridge::setEditor(QPlainTextEdit *editor) {`