Editing of Custom G-code: Added EditGCodeDialog : WIP

src/slic3r/CMakeLists.txt

@@ -109,6 +109,8 @@ set(SLIC3R_GUI_SOURCES
     GUI/PresetComboBoxes.cpp
     GUI/BitmapComboBox.hpp
     GUI/BitmapComboBox.cpp
+    GUI/EditGCodeDialog.hpp
+    GUI/EditGCodeDialog.cpp
     GUI/SavePresetDialog.hpp
     GUI/SavePresetDialog.cpp
     GUI/PhysicalPrinterDialog.hpp

src/slic3r/GUI/EditGCodeDialog.cpp

@@ -0,0 +1,155 @@
+#include "EditGCodeDialog.hpp"
+
+#include <vector>
+#include <string>
+
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/statbox.h>
+#include <wx/wupdlock.h>
+
+#include "GUI.hpp"
+#include "GUI_App.hpp"
+#include "MainFrame.hpp"
+#include "format.hpp"
+#include "Tab.hpp"
+#include "wxExtensions.hpp"
+#include "BitmapCache.hpp"
+#include "MsgDialog.hpp"
+
+namespace Slic3r {
+namespace GUI {
+
+static wxArrayString get_patterns_list()
+{
+    wxArrayString patterns;
+    for (const wxString& item : {          
+          ";comment"//format_wxstr(";%1%",_L("comment"))
+        , "M862.3 P \"[printer_model]\" ; printer model check"
+        , "M862.1 P[nozzle_diameter]; nozzle diameter check"
+        , "M115 U3.12.2; tell printer latest fw version"
+        , "G90; use absolute coordinates"
+        , "M83; extruder relative mode"
+        , "M104 S[first_layer_temperature]; set extruder temp"
+        , "M140 S[first_layer_bed_temperature]; set bed temp"
+        , "M190 S[first_layer_bed_temperature]; wait for bed temp"
+        , "M109 S[first_layer_temperature]; wait for extruder temp"
+        , "G28 W; home all without mesh bed level"
+        , "G80; mesh bed leveling"
+        , "M403 E0 F {\n"
+          " + ((filament_type[0] == \"FLEX\") ? 1 : ((filament_type[0] == \"PVA\") ? 2 : 0))\n"
+          "}"
+        , "{if not OPTION}"
+        , "G1"
+        , "T[initial_tool]; select extruder"
+        , "G92 E0"
+        , "{endif}"
+    })
+        patterns.Add(item);
+    return patterns;
+}
+
+//------------------------------------------
+//          EditGCodeDialog
+//------------------------------------------
+
+EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value) :
+    DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+    SetFont(wxGetApp().normal_font());
+    wxGetApp().UpdateDarkUI(this);
+
+    int border = 10;
+    int em = em_unit();
+
+    wxStaticText* label_top = new wxStaticText(this, wxID_ANY, _L("Edit your custom G-code using patterns"));
+    label_top->SetFont(wxGetApp().bold_font());
+
+    auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
+    grid_sizer->SetFlexibleDirection(wxBOTH);
+
+    m_patterns_list = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(em * 15, em * 30), get_patterns_list(), wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_SORT
+#ifdef _WIN32
+        | wxBORDER_SIMPLE
+#endif
+    );
+    m_patterns_list->SetFont(wxGetApp().code_font());
+    wxGetApp().UpdateDarkUI(m_patterns_list);
+
+    m_add_btn = new ScalableButton(this, wxID_ANY, "add_copies");
+    m_add_btn->SetToolTip(_L("Add selected pettern to the G-code"));
+
+    m_gcode_editor = new wxTextCtrl(this, wxID_ANY, value, wxDefaultPosition, wxSize(em * 45, em * 30), wxTE_MULTILINE
+#ifdef _WIN32
+    | wxBORDER_SIMPLE
+#endif
+    );
+    m_gcode_editor->SetFont(wxGetApp().code_font());
+    wxGetApp().UpdateDarkUI(m_gcode_editor);
+
+    grid_sizer->Add(m_patterns_list,    1, wxEXPAND);
+    grid_sizer->Add(m_add_btn,          0, wxALIGN_CENTER_VERTICAL);
+    grid_sizer->Add(m_gcode_editor,     2, wxEXPAND);
+
+    grid_sizer->AddGrowableRow(0, 1);
+    grid_sizer->AddGrowableCol(0, 1);
+    grid_sizer->AddGrowableCol(2, 1);
+
+    wxStdDialogButtonSizer* btns = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
+    wxButton* btnOK = static_cast<wxButton*>(this->FindWindowById(wxID_OK, this));
+    wxGetApp().UpdateDarkUI(btnOK);
+    wxGetApp().UpdateDarkUI(static_cast<wxButton*>(this->FindWindowById(wxID_CANCEL, this)));
+
+    wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL);
+
+    topSizer->Add(label_top           , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(grid_sizer          , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(btns                , 0, wxEXPAND | wxALL, border);
+
+    SetSizer(topSizer);
+    topSizer->SetSizeHints(this);
+
+    this->Fit();
+    this->Layout();
+
+    this->CenterOnScreen();
+
+
+    m_patterns_list->Bind(wxEVT_LISTBOX_DCLICK, [this](wxCommandEvent& evt) {
+        wxString val = m_patterns_list->GetString(m_patterns_list->GetSelection());
+        assert(!val.IsEmpty());
+        auto insert_to = m_gcode_editor->GetInsertionPoint();
+        m_gcode_editor->WriteText(val);
+    });
+}
+
+void EditGCodeDialog::on_dpi_changed(const wxRect&suggested_rect)
+{
+    const int& em = em_unit();
+
+    //m_optgroup->msw_rescale();
+
+    msw_buttons_rescale(this, em, { wxID_OK, wxID_CANCEL });
+
+    const wxSize& size = wxSize(45 * em, 35 * em);
+    SetMinSize(size);
+
+    Fit();
+    Refresh();
+}
+
+void EditGCodeDialog::on_sys_color_changed()
+{
+    m_add_btn->sys_color_changed();
+}
+
+void EditGCodeDialog::OnOK(wxEvent& event)
+{
+
+    event.Skip();
+}
+
+}}    // namespace Slic3r::GUI

src/slic3r/GUI/EditGCodeDialog.hpp

@@ -0,0 +1,47 @@
+#ifndef slic3r_EditGCodeDialog_hpp_
+#define slic3r_EditGCodeDialog_hpp_
+
+#include <vector>
+
+#include <wx/gdicmn.h>
+
+#include "GUI_Utils.hpp"
+
+class wxListBox;
+class wxTextCtrl;
+//class wxStaticText;
+class ScalableButton;
+//class wxBoxSizer;
+
+namespace Slic3r {
+
+namespace GUI {
+
+class PresetComboBox;
+
+//------------------------------------------
+//          EditGCodeDialog
+//------------------------------------------
+
+class EditGCodeDialog : public DPIDialog
+{
+    wxListBox*          m_patterns_list {nullptr};
+    ScalableButton*     m_add_btn       {nullptr};
+    wxTextCtrl*         m_gcode_editor  {nullptr};
+
+    void OnOK(wxEvent& event);
+
+public:
+    EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value);
+    ~EditGCodeDialog() {}
+
+protected:
+    void on_dpi_changed(const wxRect& suggested_rect) override;
+    void on_sys_color_changed() override;
+};
+
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif

src/slic3r/GUI/Tab.cpp

@@ -45,6 +45,7 @@
 #include "format.hpp"
 #include "UnsavedChangesDialog.hpp"
 #include "SavePresetDialog.hpp"
+#include "EditGCodeDialog.hpp"
 #include "MsgDialog.hpp"
 #include "Notebook.hpp"
 
@@ -1860,7 +1861,12 @@ static void validate_custom_gcode_cb(Tab* tab, const wxString& title, const t_co
 
 void Tab::edit_custom_gcode(const t_config_option_key& opt_key)
 {
-    MessageDialog(this, format_wxstr("Edit gcode for %1%", opt_key), this->title()).ShowModal();
+    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key)).ShowModal();
+}
+
+void TabFilament::edit_custom_gcode(const t_config_option_key& opt_key)
+{
+    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key, m_active_extruder < 0 ? unsigned(0) : unsigned(m_active_extruder))).ShowModal();
 }
 
 void TabFilament::create_line_with_near_label_widget(ConfigOptionsGroupShp optgroup, const std::string& opt_key, int opt_index/* = 0*/)

src/slic3r/GUI/Tab.hpp

@@ -388,10 +388,11 @@ class Tab: public wxPanel
 	const std::map<wxString, std::string>& get_category_icon_map() { return m_category_icon; }
 
 	static bool validate_custom_gcode(const wxString& title, const std::string& gcode);
-    void        edit_custom_gcode(const t_config_option_key &opt_key);
 	bool        validate_custom_gcodes();
     bool        validate_custom_gcodes_was_shown{ false };
 
+    virtual void edit_custom_gcode(const t_config_option_key &opt_key);
+
 protected:
 	void			create_line_with_widget(ConfigOptionsGroup* optgroup, const std::string& opt_key, const std::string& path, widget_t widget);
 	wxSizer*		compatible_widget_create(wxWindow* parent, PresetDependencies &deps);
@@ -475,6 +476,8 @@ class TabFilament : public Tab
     void        update_extruder_combobox();
     int         get_active_extruder() const { return m_active_extruder; }
 
+	void		edit_custom_gcode(const t_config_option_key& opt_key) override;
+
 protected:
     bool        select_preset_by_name(const std::string& name_w_suffix, bool force) override;
     bool        save_current_preset(const std::string& new_name, bool detach) override;