mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 03:43:52 +00:00
FIX: CLI: don't set wipe_tower_pos to default if set before
jira: no-jira Change-Id: Ib9cc006e5b9e3c2dd728d629bad1beb9f9130491 (cherry picked from commit 6a3672c3cf9777f27c04e19a01d8e1e2accbddba)
This commit is contained in:
@@ -3508,6 +3508,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
|
|
||||||
m_print_config.option<ConfigOptionEnum<PrinterTechnology>>("printer_technology", true)->value = printer_technology;
|
m_print_config.option<ConfigOptionEnum<PrinterTechnology>>("printer_technology", true)->value = printer_technology;
|
||||||
|
|
||||||
|
bool has_wipe_tower_position = m_print_config.option<ConfigOptionFloats>("wipe_tower_x") && m_print_config.option<ConfigOptionFloats>("wipe_tower_y");
|
||||||
// Initialize full print configs for both the FFF and SLA technologies.
|
// Initialize full print configs for both the FFF and SLA technologies.
|
||||||
FullPrintConfig fff_print_config;
|
FullPrintConfig fff_print_config;
|
||||||
//SLAFullPrintConfig sla_print_config;
|
//SLAFullPrintConfig sla_print_config;
|
||||||
@@ -4737,7 +4738,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
bool is_seq_print = false;
|
bool is_seq_print = false;
|
||||||
get_print_sequence(cur_plate, m_print_config, is_seq_print);
|
get_print_sequence(cur_plate, m_print_config, is_seq_print);
|
||||||
|
|
||||||
if (!is_seq_print && assemble_plate.filaments_count > 1)
|
if (!is_seq_print && (assemble_plate.filaments_count > 1) && !has_wipe_tower_position)
|
||||||
{
|
{
|
||||||
//prepare the wipe tower
|
//prepare the wipe tower
|
||||||
auto printer_structure_opt = m_print_config.option<ConfigOptionEnum<PrinterStructure>>("printer_structure");
|
auto printer_structure_opt = m_print_config.option<ConfigOptionEnum<PrinterStructure>>("printer_structure");
|
||||||
|
|||||||
Reference in New Issue
Block a user