From 2c82a327dd9e5270cf0f3a976360c8ec99ed3452 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Mon, 17 Jul 2017 09:07:18 +0200 Subject: Fix of "Wipe Tower ... only supported ... .4 nozzle" error when slicing a non .4mm nozzle single extruder (Stock MK2S) print https://github.com/prusa3d/Slic3r/issues/426 The constraint for the "Wipe Tower" checkbox has been raised, so one will get this error message only if the printer settings has more than one extruder configured, as the wipe tower does not get generated for a single extruder print. --- xs/src/libslic3r/Print.cpp | 4 ++-- xs/src/libslic3r/Print.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index f1631b6d8..df825b05c 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -557,7 +557,7 @@ std::string Print::validate() const return "The Spiral Vase option can only be used when printing single material objects."; } - if (this->config.wipe_tower && ! this->objects.empty()) { + if (this->has_wipe_tower() && ! this->objects.empty()) { for (auto dmr : this->config.nozzle_diameter.values) if (std::abs(dmr - 0.4) > EPSILON) return "The Wipe Tower is currently only supported for the 0.4mm nozzle diameter."; @@ -939,7 +939,7 @@ void Print::_make_brim() } // Wipe tower support. -bool Print::has_wipe_tower() +bool Print::has_wipe_tower() const { return this->config.single_extruder_multi_material.value && diff --git a/xs/src/libslic3r/Print.hpp b/xs/src/libslic3r/Print.hpp index 3492a74fd..a5cab89ee 100644 --- a/xs/src/libslic3r/Print.hpp +++ b/xs/src/libslic3r/Print.hpp @@ -280,7 +280,7 @@ public: void _make_brim(); // Wipe tower support. - bool has_wipe_tower(); + bool has_wipe_tower() const; void _clear_wipe_tower(); void _make_wipe_tower(); // Tool ordering of a non-sequential print has to be known to calculate the wipe tower. -- cgit v1.2.3