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:
authorsupermerill <merill@fr.fr>2019-02-14 13:00:03 +0300
committersupermerill <merill@fr.fr>2019-02-14 13:00:03 +0300
commit605bc5ddb8b9e2ac49701d9e26bc2f6cc72dd466 (patch)
tree327a2136315f67387b329cf2a2d30e55cd451449
parentf1a19d241c3ddb48be02b557144cb9f3e290e3f9 (diff)
vase mode: also remove dense infill1.42.0-alpha5.1
-rw-r--r--src/libslic3r/PrintConfig.cpp7
-rw-r--r--src/slic3r/GUI/Tab.cpp5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index addc391f7..fa6043b39 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -3208,8 +3208,9 @@ void DynamicPrintConfig::normalize()
this->opt<ConfigOptionPercent>("fill_density", true)->value = 0;
this->opt<ConfigOptionBool>("support_material", true)->value = false;
this->opt<ConfigOptionInt>("support_material_enforce_layers")->value = 0;
- this->opt<ConfigOptionBool>("exact_last_layer_height", true)->value = false;
- this->opt<ConfigOptionBool>("ensure_vertical_shell_thickness", true)->value = false;
+ this->opt<ConfigOptionBool>("exact_last_layer_height", true)->value = false;
+ this->opt<ConfigOptionBool>("ensure_vertical_shell_thickness", true)->value = false;
+ this->opt<ConfigOptionBool>("infill_dense", true)->value = false;
}
}
}
@@ -3363,6 +3364,8 @@ std::string FullPrintConfig::validate()
return "Spiral vase mode is not compatible with top solid layers";
if (this->support_material || this->support_material_enforce_layers > 0)
return "Spiral vase mode is not compatible with support material";
+ if (this->infill_dense)
+ return "Spiral vase mode can only print hollow objects and have no top surface, so you don't need any dense infill";
}
// extrusion widths
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 4e0c20300..00f731462 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1227,6 +1227,7 @@ void TabPrint::update()
&& m_config->opt_int("support_material_enforce_layers") == 0
&& m_config->opt_bool("exact_last_layer_height") == false
&& m_config->opt_bool("ensure_vertical_shell_thickness") == false
+ && m_config->opt_bool("infill_dense") == false
)) {
wxString msg_text = _(L("The Spiral Vase mode requires:\n"
"- one perimeter\n"
@@ -1235,6 +1236,7 @@ void TabPrint::update()
"- no support material\n"
"- no ensure_vertical_shell_thickness\n"
"- unchecked 'exact last layer height'\n"
+ "- unchecked 'dense infill'\n"
"\nShall I adjust those settings in order to enable Spiral Vase?"));
auto dialog = new wxMessageDialog(parent(), msg_text, _(L("Spiral Vase")), wxICON_WARNING | wxYES | wxNO);
is_msg_dlg_already_exist = true;
@@ -1246,7 +1248,8 @@ void TabPrint::update()
new_conf.set_key_value("support_material", new ConfigOptionBool(false));
new_conf.set_key_value("support_material_enforce_layers", new ConfigOptionInt(0));
new_conf.set_key_value("exact_last_layer_height", new ConfigOptionBool(false));
- new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(false));
+ new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(false));
+ new_conf.set_key_value("infill_dense", new ConfigOptionBool(false));
fill_density = 0;
}
else {