juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-12 02:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(imex): replace "primary" magic string with kImexPrimaryMode constant

Browse Source 
Across 6 files the literal "primary" string was the sentinel for "no IMEX
parallel mode active" — used for short-circuiting in serialization, ghost
visualization, zone calc, popup-menu list construction, the IMEXModesCtrl
non-deletable first row, and several layer-of-export checks. A typo in
any one would silently bypass the guard.

Define kImexPrimaryMode in IMEXHelpers.hpp with a docstring describing
what equality with it means semantically, and route every call site
through it. No behavior change.

Touched: bbs_3mf.cpp, GCode.cpp, PartPlate.cpp, Plater.cpp, Tab.cpp.
The bbs_3mf and Tab files now include IMEXHelpers.hpp; the other three
already did.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Clifford Garwood
2026-04-25 00:32:22 -04:00
co-authored by Claude Opus 4.7
parent efa9d65cb4
commit 085f5ccec8
6 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/PartPlate.cpp
+8 -8
View File
@@ -375,12 +375,12 @@ std::string PartPlate::get_imex_mode() const
if (opt && !opt->value.empty())
return opt->value;
}
return "primary";
return kImexPrimaryMode;
}
void PartPlate::set_imex_mode(const std::string& mode)
{
if (mode.empty() || mode == "primary") {
if (mode.empty() || mode == kImexPrimaryMode) {
m_config.erase("imex_parallel_mode");
} else {
m_config.set_key_value("imex_parallel_mode", new ConfigOptionString(mode));
@@ -568,13 +568,13 @@ void PartPlate::calc_imex_zones()
// Per-plate mode takes priority over the process preset.
std::string active_mode = get_imex_mode();
if (active_mode == "primary") {
if (active_mode == kImexPrimaryMode) {
const DynamicPrintConfig& process_cfg = wxGetApp().preset_bundle->prints.get_edited_preset().config;
auto* mode_opt = process_cfg.option<ConfigOptionString>("imex_parallel_mode");
if (mode_opt && !mode_opt->value.empty())
active_mode = mode_opt->value;
}
if (active_mode == "primary" || active_mode.empty())
if (active_mode == kImexPrimaryMode || active_mode.empty())
return;
// Grid dimensions and tool layout from printer config
@@ -919,7 +919,7 @@ std::string PartPlate::build_imex_cache_key() const
return "";
// Per-plate mode takes priority over process preset.
std::string active_mode = get_imex_mode();
if (active_mode == "primary") {
if (active_mode == kImexPrimaryMode) {
const DynamicPrintConfig& process_cfg = wxGetApp().preset_bundle->prints.get_edited_preset().config;
auto* mode_opt = process_cfg.option<ConfigOptionString>("imex_parallel_mode");
if (mode_opt && !mode_opt->value.empty())
@@ -1005,12 +1005,12 @@ bool PartPlate::resolve_active_mode_tools(std::string& out_tools_str, int& out_p
if (!is_imex_opt || !is_imex_opt->value) return false;
std::string active_mode = get_imex_mode();
if (active_mode == "primary" || active_mode.empty()) {
if (active_mode == kImexPrimaryMode || active_mode.empty()) {
const DynamicPrintConfig& proc_cfg = wxGetApp().preset_bundle->prints.get_edited_preset().config;
if (auto* mo = proc_cfg.option<ConfigOptionString>("imex_parallel_mode"))
active_mode = mo->value;
}
if (active_mode.empty() || active_mode == "primary") return false;
if (active_mode.empty() || active_mode == kImexPrimaryMode) return false;
auto* names = printer_cfg.option<ConfigOptionStrings>("imex_mode_names");
auto* tools = printer_cfg.option<ConfigOptionStrings>("imex_mode_active_tools");
@@ -1214,7 +1214,7 @@ bool PartPlate::has_imex_multimaterial_conflict() const
if (!pb) return false;
auto* is_imex_opt = pb->printers.get_edited_preset().config.option<ConfigOptionBool>("is_imex");
if (!is_imex_opt || !is_imex_opt->value) return false;
if (get_imex_mode() == "primary") return false;
if (get_imex_mode() == kImexPrimaryMode) return false;
// Condition 2: objects on this plate actually use more than one unique filament/extruder
std::vector<int> used = get_extruders(true);