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

Fixed retrieving of the "saved in inches" flag from 3MF.

Browse source 
Fixed "import STL from Inches" - it should always scale up even if the
object is bigger than 3x3x3mm.
This commit is contained in:
Vojtech Bubnik 2020-12-12 18:54:34 +01:00
parent 3795f6b779
commit 9fdf8c8b8d
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/Plater.cpp
View file

@ -2393,22 +2393,24 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
{
// The model should now be initialized
auto convert_from_imperial_units = [](Model& model) {
model.convert_from_imperial_units();
auto convert_from_imperial_units = [](Model& model, bool only_small_volumes) {
model.convert_from_imperial_units(only_small_volumes);
wxGetApp().app_config->set("use_inches", "1");
wxGetApp().sidebar().update_ui_from_settings();
};
if (!is_project_file) {
if (imperial_units)
convert_from_imperial_units(model);
// Convert even if the object is big.
convert_from_imperial_units(model, false);
else if (model.looks_like_imperial_units()) {
wxMessageDialog msg_dlg(q, format_wxstr(_L(
"Some object(s) in file %s looks like saved in inches.\n"
"Should I consider them as a saved in inches and convert them?"), from_path(filename)) + "\n",
_L("The object appears to be saved in inches"), wxICON_WARNING | wxYES | wxNO);
if (msg_dlg.ShowModal() == wxID_YES)
convert_from_imperial_units(model);
//FIXME up-scale only the small parts?
convert_from_imperial_units(model, true);
}
if (model.looks_like_multipart_object()) {