Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

src/slic3r/GUI/Plater.cpp

@@ -6117,11 +6117,12 @@ void Plater::send_gcode()
         upload_job.printhost->get_groups(groups);
     }
     
-    PrintHostSendDialog dlg(default_output_file, upload_job.printhost->can_start_print(), groups);
+    PrintHostSendDialog dlg(default_output_file, upload_job.printhost->get_post_upload_actions(), groups);
     if (dlg.ShowModal() == wxID_OK) {
         upload_job.upload_data.upload_path = dlg.filename();
-        upload_job.upload_data.start_print = dlg.start_print();
+        upload_job.upload_data.post_action = dlg.post_action();
         upload_job.upload_data.group       = dlg.group();
+
         p->export_gcode(fs::path(), false, std::move(upload_job));
     }
 }

src/slic3r/GUI/PrintHostDialogs.cpp

@@ -23,7 +23,6 @@
 #include "GUI_App.hpp"
 #include "MsgDialog.hpp"
 #include "I18N.hpp"
-#include "../Utils/PrintHost.hpp"
 #include "MainFrame.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "NotificationManager.hpp"
@@ -35,13 +34,13 @@ namespace Slic3r {
 namespace GUI {
 
 static const char *CONFIG_KEY_PATH  = "printhost_path";
-static const char *CONFIG_KEY_PRINT = "printhost_print";
 static const char *CONFIG_KEY_GROUP = "printhost_group";
 
-PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, bool can_start_print, const wxArrayString &groups)
+PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUploadActions post_actions, const wxArrayString &groups)
     : MsgDialog(static_cast<wxWindow*>(wxGetApp().mainframe), _L("Send G-Code to printer host"), _L("Upload to Printer Host with the following filename:"))
     , txt_filename(new wxTextCtrl(this, wxID_ANY))
     , combo_groups(!groups.IsEmpty() ? new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, groups, wxCB_READONLY) : nullptr)
+    , post_upload_action(PrintHostPostUploadAction::None)
 {
 #ifdef __APPLE__
     txt_filename->OSXDisableAllSmartSubstitutions();
@@ -77,38 +76,47 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, bool can_start_pr
     txt_filename->SetValue(recent_path);
     txt_filename->SetFocus();
     
-    wxString suffix = recent_path.substr(recent_path.find_last_of('.'));
+    m_valid_suffix = recent_path.substr(recent_path.find_last_of('.'));
+    // .gcode suffix control
+    auto validate_path = [this](const wxString &path) -> bool {
+        if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
+            MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
+            if (msg_wingow.ShowModal() == wxID_NO)
+                return false;
+        }
+        return true;
+    };
 
-    if (can_start_print) {
+    if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
         auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
-        btn_print->Bind(wxEVT_BUTTON, [this, suffix](wxCommandEvent&) {
-            wxString path = txt_filename->GetValue();
-            // .gcode suffix control
-            if (!path.Lower().EndsWith(suffix.Lower()))
-            {
-                MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
-                if (msg_wingow.ShowModal() == wxID_NO)
-                    return;
+        btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+            if (validate_path(txt_filename->GetValue())) {
+                post_upload_action = PrintHostPostUploadAction::StartPrint;
+                EndDialog(wxID_OK);
             }
-            start_print_selected = true;
-            EndDialog(wxID_OK);
-            });
+        });
     }
+
+    if (post_actions.has(PrintHostPostUploadAction::StartSimulation)) {
+        auto* btn_print = add_button(wxID_YES, false, _L("Upload and Simulate"));
+        btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+            if (validate_path(txt_filename->GetValue())) {
+                post_upload_action = PrintHostPostUploadAction::StartSimulation;
+                EndDialog(wxID_OK);
+            }        
+        });
+    }
+
     add_button(wxID_CANCEL);
 
     if (auto* btn_ok = get_button(wxID_OK); btn_ok != NULL) {
         btn_ok->SetLabel(_L("Upload"));
-        btn_ok->Bind(wxEVT_BUTTON, [this, suffix](wxCommandEvent&) {
-            wxString path = txt_filename->GetValue();
-            // .gcode suffix control
-            if (!path.Lower().EndsWith(suffix.Lower()))
-            {
-                MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
-                if (msg_wingow.ShowModal() == wxID_NO)
-                    return;
+        btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+            if (validate_path(txt_filename->GetValue())) {
+                post_upload_action = PrintHostPostUploadAction::None;
+                EndDialog(wxID_OK);
             }
-            EndDialog(wxID_OK);
-        });   
+        });
     }
     finalize();
 
@@ -137,9 +145,9 @@ fs::path PrintHostSendDialog::filename() const
     return into_path(txt_filename->GetValue());
 }
 
-bool PrintHostSendDialog::start_print() const
+PrintHostPostUploadAction PrintHostSendDialog::post_action() const
 {
-    return start_print_selected;
+    return post_upload_action;
 }
 
 std::string PrintHostSendDialog::group() const
@@ -165,8 +173,7 @@ void PrintHostSendDialog::EndModal(int ret)
                 
 		AppConfig *app_config = wxGetApp().app_config;
 		app_config->set("recent", CONFIG_KEY_PATH, into_u8(path));
-        app_config->set("recent", CONFIG_KEY_PRINT, start_print() ? "1" : "0");
-        
+
         if (combo_groups != nullptr) {
             wxString group = combo_groups->GetValue();
             app_config->set("recent", CONFIG_KEY_GROUP, into_u8(group));

src/slic3r/GUI/PrintHostDialogs.hpp

@@ -1,6 +1,7 @@
 #ifndef slic3r_PrintHostSendDialog_hpp_
 #define slic3r_PrintHostSendDialog_hpp_
 
+#include <set>
 #include <string>
 #include <boost/filesystem/path.hpp>
 
@@ -10,34 +11,32 @@
 
 #include "GUI_Utils.hpp"
 #include "MsgDialog.hpp"
+#include "../Utils/PrintHost.hpp"
 
 class wxButton;
 class wxTextCtrl;
+class wxChoice;
 class wxComboBox;
-class wxCheckBox;
 class wxDataViewListCtrl;
 
-
 namespace Slic3r {
 
-struct PrintHostJob;
-
 namespace GUI {
 
-
 class PrintHostSendDialog : public GUI::MsgDialog
 {
 public:
-    PrintHostSendDialog(const boost::filesystem::path &path, bool can_start_print, const wxArrayString& groups);
+    PrintHostSendDialog(const boost::filesystem::path &path, PrintHostPostUploadActions post_actions, const wxArrayString& groups);
     boost::filesystem::path filename() const;
-    bool start_print() const;
+    PrintHostPostUploadAction post_action() const;
     std::string group() const;
 
     virtual void EndModal(int ret) override;
 private:
     wxTextCtrl *txt_filename;
     wxComboBox *combo_groups;
-    bool start_print_selected { false };
+    PrintHostPostUploadAction post_upload_action;
+    wxString    m_valid_suffix;
 };