Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2019-01-09 12:43:17 +0300
committerbubnikv <bubnikv@gmail.com>2019-01-09 12:43:17 +0300
commit5b1c1d592261e96f626b1172601a5bd0e4348575 (patch)
treeaa8f29277f8ddf35b159ad646d2fb164294045a1 /src/slic3r/GUI/MainFrame.hpp
parent094e3cb5657b87741208fdfc0139270e0068a0ae (diff)
Fixed a bug in the Win32 start wrapper (wrong number of parameters was passed for the GUI slic3r.exe).
Reworked command line processing for the GUI slic3r. Now the config is loaded first, then the model files (also the configs from AMF/3MF are applied), and lastly the free standing parameters are applied. Fixed unescaping for command line parameters. The string parameters are now not unescaped, string vector parameters are unescaped only if enquoted. Tab::load_current_preset() - disabled CallAfter for predictability. With CallAfter, it was difficult to call the method in sequence with other methods. Fixed some missing ->Destroy() calls on dialogs created from MainFrame Fixed some compiler warnings.
Diffstat (limited to 'src/slic3r/GUI/MainFrame.hpp')
-rw-r--r--src/slic3r/GUI/MainFrame.hpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index e0411b6da..954906903 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -53,8 +53,8 @@ class MainFrame : public wxFrame
PrintHostQueueDialog *m_printhost_queue_dlg;
- std::string get_base_name(const wxString full_name) const ;
- std::string get_dir_name(const wxString full_name) const ;
+ std::string get_base_name(const wxString &full_name) const;
+ std::string get_dir_name(const wxString &full_name) const;
void on_presets_changed(SimpleEvent&);
void on_value_changed(wxCommandEvent&);
@@ -86,7 +86,10 @@ public:
void reslice_now();
void repair_stl();
void export_config();
- void load_config_file(wxString file = wxEmptyString);
+ // Query user for the config file and open it.
+ void load_config_file();
+ // Open a config file. Return true if loaded.
+ bool load_config_file(const std::string &path);
void export_configbundle();
void load_configbundle(wxString file = wxEmptyString);
void load_config(const DynamicPrintConfig& config);