From 956d47aaf59f6be519126f1eddcbc77bef2ce8d4 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 9 Jan 2024 10:28:08 +0100 Subject: [PATCH] Avoid re-use of setting getters by storing setting-value in local variable CURA 11395 --- src/raft.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/raft.cpp b/src/raft.cpp index 9bb181cf5d..a4286c2ce5 100644 --- a/src/raft.cpp +++ b/src/raft.cpp @@ -23,15 +23,17 @@ void Raft::generate(SliceDataStorage& storage) const Settings& settings = Application::getInstance().current_slice_->scene.current_mesh_group->settings.get("raft_base_extruder_nr").settings_; constexpr bool include_support = true; constexpr bool dont_include_prime_tower = false; // Prime tower raft will be handled separately in 'storage.primeRaftOutline'; see below. + const auto raft_base_margin = settings.get("raft_base_margin"); + const auto raft_interface_margin = settings.get("raft_interface_margin"); + const auto raft_surface_margin = settings.get("raft_surface_margin"); storage.raftBaseOutline = storage.raftSurfaceOutline = storage.raftInterfaceOutline = storage.getLayerOutlines(0, include_support, dont_include_prime_tower); - storage.raftBaseOutline = storage.raftBaseOutline.offset(settings.get("raft_base_margin"), ClipperLib::jtRound); - storage.raftInterfaceOutline = storage.raftInterfaceOutline.offset(settings.get("raft_interface_margin"), ClipperLib::jtRound); - storage.raftSurfaceOutline = storage.raftSurfaceOutline.offset(settings.get("raft_surface_margin"), ClipperLib::jtRound); + storage.raftBaseOutline = storage.raftBaseOutline.offset(raft_base_margin, ClipperLib::jtRound); + storage.raftInterfaceOutline = storage.raftInterfaceOutline.offset(raft_interface_margin, ClipperLib::jtRound); + storage.raftSurfaceOutline = storage.raftSurfaceOutline.offset(raft_surface_margin, ClipperLib::jtRound); const coord_t shield_line_width_layer0 = settings.get("skirt_brim_line_width"); - const coord_t max_raft_distance - = std::max(std::max(settings.get("raft_base_margin"), settings.get("raft_interface_margin")), settings.get("raft_surface_margin")); + const coord_t max_raft_distance = std::max(std::max(raft_base_margin, raft_interface_margin), raft_surface_margin); if (storage.draft_protection_shield.size() > 0) { Polygons draft_shield_raft