3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 13:47:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: Z hop is still enabled when upper boundary is zero.

Browse source 
Jira: STUDIO-4893

Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: I5f46a02e1fbb15ff43e253e3a184aa6cc38e7598
This commit is contained in:
wenjie.guo 2023-11-06 14:10:29 +08:00 • committed by Lane.Wei
parent 8aa0c06137
commit 79eb44635d
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/GCodeWriter.cpp
View file

@ -687,7 +687,7 @@ std::string GCodeWriter::lift(LiftType lift_type, bool spiral_vase)
//BBS //BBS
double above = this->config.retract_lift_above.get_at(m_extruder->id()); double above = this->config.retract_lift_above.get_at(m_extruder->id());
double below = this->config.retract_lift_below.get_at(m_extruder->id()); double below = this->config.retract_lift_below.get_at(m_extruder->id());
if (m_pos.z() >= above && (below == 0 || m_pos.z() <= below)) if (m_pos.z() >= above && m_pos.z() <= below)
target_lift = this->config.z_hop.get_at(m_extruder->id()); target_lift = this->config.z_hop.get_at(m_extruder->id());
} }
// BBS // BBS

2
src/libslic3r/PrintConfig.cpp
View file

@ -2607,6 +2607,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Z hop will only come into effect when Z is above this value and is below the parameter: \"Z hop upper boundary\""); def->tooltip = L("Z hop will only come into effect when Z is above this value and is below the parameter: \"Z hop upper boundary\"");
def->sidetext = L("mm"); def->sidetext = L("mm");
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0;
def->set_default_value(new ConfigOptionFloats{0.}); def->set_default_value(new ConfigOptionFloats{0.});
def = this->add("retract_lift_below", coFloats); def = this->add("retract_lift_below", coFloats);
@ -2614,6 +2615,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("If this value is positive, Z hop will only come into effect when Z is above the parameter: \"Z hop lower boundary\" and is below this value"); def->tooltip = L("If this value is positive, Z hop will only come into effect when Z is above the parameter: \"Z hop lower boundary\" and is below this value");
def->sidetext = L("mm"); def->sidetext = L("mm");
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0;
def->set_default_value(new ConfigOptionFloats{0.}); def->set_default_value(new ConfigOptionFloats{0.});