3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/ys_imperial_unit'

Browse source
This commit is contained in:
YuSanka 2020-05-18 16:01:10 +02:00
commit 504066e64b
8 changed files with 165 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Plater.hpp
View file

@ -133,6 +133,7 @@ public:
bool is_collapsed();
void collapse(bool collapse);
void update_searcher();
void update_ui_from_settings();
std::vector<PresetComboBox*>& combos_filament();
Search::OptionsSearcher& get_searcher();
@ -165,13 +166,13 @@ public:
void new_project();
void load_project();
void load_project(const wxString& filename);
void add_model();
void add_model(bool imperial_units = false);
void import_sl1_archive();
void extract_config_from_project();
std::vector<size_t> load_files(const std::vector<boost::filesystem::path>& input_files, bool load_model = true, bool load_config = true);
std::vector<size_t> load_files(const std::vector<boost::filesystem::path>& input_files, bool load_model = true, bool load_config = true, bool imperial_units = false);
// To be called when providing a list of files to the GUI slic3r on command line.
std::vector<size_t> load_files(const std::vector<std::string>& input_files, bool load_model = true, bool load_config = true);
std::vector<size_t> load_files(const std::vector<std::string>& input_files, bool load_model = true, bool load_config = true, bool imperial_units = false);
void update();
void stop_jobs();