Add menu items, file operations

diff --git a/gui/stmdsp.cpp b/gui/stmdsp.cpp
index 06f01006724685e2d91dd10f5857f0e4fa441f00..2c39f467bce8da6837eb8f772ced03d06878d9b8 100644 (file)
--- a/gui/stmdsp.cpp
+++ b/gui/stmdsp.cpp
@@ -58,7 +58,7 @@ namespace stmdsp
             m_serial.read(reinterpret_cast<uint8_t *>(&count), sizeof(uint32_t));
         }
 
-        return count;
+        return count / 2;
     }
 
     std::vector<adcsample_t> device::continuous_read() {

diff --git a/gui/wxmain.cpp b/gui/wxmain.cpp
index 2d38fad7e2b4df189df35f64939b8f660ffb46d7..8a45ada4170f41f2f63f47ce9d2fbc727b4c92f5 100644 (file)
--- a/gui/wxmain.cpp
+++ b/gui/wxmain.cpp
@@ -1,14 +1,47 @@
 #include "wxmain.hpp"
 
 #include <wx/filename.h>
+#include <wx/filedlg.h>
 #include <wx/menu.h>
 #include <wx/sizer.h>
 
+enum Id {
+    Single = 1,
+    ConnectDevice,
+    UploadFilter,
+    RenderTimer,
+
+    MFileNew,
+    MFileOpen,
+    MFileSave,
+    MFileSaveAs,
+    MRunConnect,
+    MRunStart,
+    MRunStartMeasure,
+    MRunCompile,
+    MRunUpload
+};
+
 MainFrame::MainFrame() : wxFrame(nullptr, -1, "Hello world", wxPoint(50, 50), wxSize(640, 800))
 {
     auto menubar = new wxMenuBar;
     auto menuFile = new wxMenu;
+    menuFile->Append(MFileNew, "&New");
+    menuFile->Append(MFileOpen, "&Open");
+    menuFile->Append(MFileSave, "&Save");
+    menuFile->Append(MFileSaveAs, "Save &As");
+    auto menuRun = new wxMenu;
+    menuRun->Append(MRunConnect, "&Connect");
+    menuRun->AppendSeparator();
+    menuRun->Append(MRunStart, "&Start");
+    menuRun->Append(MRunStartMeasure, "Start with &Measure");
+    menuRun->Append(wxID_ANY, "Last time:")->Enable(false);
+    menuRun->AppendSeparator();
+    menuRun->Append(MRunCompile, "&Compile code");
+    menuRun->Append(MRunUpload, "&Upload code");
+
     menubar->Append(menuFile, "&File");
+    menubar->Append(menuRun, "&Run");
     SetMenuBar(menubar);
 
     auto window = new wxBoxSizer(wxVERTICAL);
@@ -31,6 +64,11 @@ MainFrame::MainFrame() : wxFrame(nullptr, -1, "Hello world", wxPoint(50, 50), wx
 
     m_render_timer = new wxTimer(this, Id::RenderTimer);
 
+    Bind(wxEVT_MENU, &MainFrame::onFileNew, this, Id::MFileNew);
+    Bind(wxEVT_MENU, &MainFrame::onFileOpen, this, Id::MFileOpen);
+    Bind(wxEVT_MENU, &MainFrame::onFileSave, this, Id::MFileSave);
+    Bind(wxEVT_MENU, &MainFrame::onFileSaveAs, this, Id::MFileSaveAs);
+
     Bind(wxEVT_BUTTON, &MainFrame::onSinglePressed, this, Id::Single);
     Bind(wxEVT_BUTTON, &MainFrame::onUploadPressed, this, Id::UploadFilter);
     Bind(wxEVT_BUTTON, &MainFrame::onConnectPressed, this, Id::ConnectDevice);
@@ -114,7 +152,8 @@ void MainFrame::onSinglePressed(wxCommandEvent& ce)
         //this->RefreshRect(m_signal_area->GetRect());
 
         //button->SetLabel("Run");
-        button->SetLabel(wxString::Format(wxT("%u"), m_device->continuous_start_get_measurement()));
+        button->SetLabel(wxString::Format(wxT("Run (%u)"),
+                         m_device->continuous_start_get_measurement()));
     }
 }
 
@@ -182,12 +221,8 @@ void MainFrame::prepareEditor()
         wxT("void char short int long auto float double unsigned signed "
             "volatile static const constexpr constinit consteval "
             "virtual final noexcept public private protected"));
-    m_text_editor->SetText(
-R"cpp(adcsample_t *process_data(adcsample_t *samples, unsigned int size)
-{
-    return samples;
-}
-)cpp");
+    wxCommandEvent dummy;
+    onFileNew(dummy);
 }
 
 static const char *makefile_text = R"make(
@@ -246,3 +281,60 @@ wxString MainFrame::compileEditorCode()
         return "";
 }
 
+void MainFrame::onFileNew([[maybe_unused]] wxCommandEvent&)
+{
+    m_open_file_path = "";
+    m_text_editor->SetText(
+R"cpp(adcsample_t *process_data(adcsample_t *samples, unsigned int size)
+{
+    return samples;
+}
+)cpp");
+}
+
+void MainFrame::onFileOpen([[maybe_unused]] wxCommandEvent&)
+{
+    wxFileDialog openDialog(this, "Open filter file", "", "",
+                            "C++ source file (*.cpp)|*.cpp",
+                            wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+
+    if (openDialog.ShowModal() != wxID_CANCEL) {
+        if (wxFileInputStream file_stream (openDialog.GetPath()); file_stream.IsOk()) {
+            auto size = file_stream.GetSize();
+            auto buffer = new char[size];
+            if (file_stream.ReadAll(buffer, size)) {
+                m_open_file_path = openDialog.GetPath();
+                m_text_editor->SetText(buffer);
+            }
+            delete[] buffer;
+        }
+    }
+}
+
+void MainFrame::onFileSave(wxCommandEvent& ce)
+{
+    if (m_open_file_path.IsEmpty()) {
+        onFileSaveAs(ce);
+    } else {
+        if (wxFile file (m_open_file_path, wxFile::write); file.IsOpened()) {
+            file.Write(m_text_editor->GetText());
+            file.Close();
+        }
+    }
+}
+
+void MainFrame::onFileSaveAs([[maybe_unused]] wxCommandEvent& ce)
+{
+    wxFileDialog saveDialog(this, "Save filter file", "", "",
+                            "C++ source file (*.cpp)|*.cpp",
+                            wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+
+    if (saveDialog.ShowModal() != wxID_CANCEL) {
+        if (wxFile file (saveDialog.GetPath(), wxFile::write); file.IsOpened()) {
+            file.Write(m_text_editor->GetText());
+            file.Close();
+            m_open_file_path = saveDialog.GetPath();
+        }
+    }
+}
+

diff --git a/gui/wxmain.hpp b/gui/wxmain.hpp
index b0f73a68640a000d2721f95029f39de803d93b10..4e5632643ae9a052901abbe701fcc17e91aa5f3a 100644 (file)
--- a/gui/wxmain.hpp
+++ b/gui/wxmain.hpp
@@ -18,18 +18,30 @@
 
 class MainFrame : public wxFrame
 {
-    enum Id {
-        Single = 1,
-        ConnectDevice,
-        UploadFilter,
-        RenderTimer
-    };
+public:
+    MainFrame();
+    
+    void onPaint(wxPaintEvent& pe);
+    void onSinglePressed(wxCommandEvent& ce);
+    void onConnectPressed(wxCommandEvent& ce);
+    void onUploadPressed(wxCommandEvent& ce);
+    void onRenderTimer(wxTimerEvent& te);
+
+    void onFileNew(wxCommandEvent&);
+    void onFileOpen(wxCommandEvent&);
+    void onFileSave(wxCommandEvent&);
+    void onFileSaveAs(wxCommandEvent&);
+
+    void doSingle();
+    void updateDrawing();
 
+private:
     bool m_is_rendering = false;
     wxTimer *m_render_timer = nullptr;
     wxComboBox *m_device_combo = nullptr;
     wxStyledTextCtrl *m_text_editor = nullptr;
     wxControl *m_signal_area = nullptr;
+    wxString m_open_file_path;
 
     stmdsp::device *m_device = nullptr;
     std::future<std::vector<stmdsp::adcsample_t>> m_device_samples_future;
@@ -38,18 +50,6 @@ class MainFrame : public wxFrame
     bool tryDevice();
     void prepareEditor();
     wxString compileEditorCode();
-
-public:
-    MainFrame();
-    
-    void onPaint(wxPaintEvent& pe);
-    void onSinglePressed(wxCommandEvent& ce);
-    void onConnectPressed(wxCommandEvent& ce);
-    void onUploadPressed(wxCommandEvent& ce);
-    void onRenderTimer(wxTimerEvent& te);
-
-    void doSingle();
-    void updateDrawing();
 };
 
 #endif // WXMAIN_HPP_