mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 06:57:36 -06:00
ENH: disable arranging selected items
0. disable arranging selected 1. fix bug where brim is not correct. 2. fix bug where big circle objects are not arranged properly 3. disable default enable_rotation Change-Id: Ifc69f35d900ff63ec1e9ec8bf8638afc6ea7d54b (cherry picked from commit 2ed1b0dd8573a1e10aaf77f0d9f8896cef304427)
This commit is contained in:
parent
74e92ac51d
commit
07ae246e5f
9 changed files with 77 additions and 31 deletions
|
@ -2885,6 +2885,14 @@ double getTemperatureFromExtruder(const ModelVolumePtrs objectVolumes) {
|
|||
#endif
|
||||
}
|
||||
|
||||
double ModelInstance::get_auto_brim_width() const
|
||||
{
|
||||
double adhcoeff = getadhesionCoeff(object->volumes);
|
||||
double DeltaT = getTemperatureFromExtruder(object->volumes);
|
||||
// get auto brim width (Note even if the global brim_type=btOuterBrim, we can still go into this branch)
|
||||
return get_auto_brim_width(DeltaT, adhcoeff);
|
||||
}
|
||||
|
||||
void ModelInstance::get_arrange_polygon(void* ap) const
|
||||
{
|
||||
// static const double SIMPLIFY_TOLERANCE_MM = 0.1;
|
||||
|
@ -2924,18 +2932,6 @@ void ModelInstance::get_arrange_polygon(void* ap) const
|
|||
ret.extrude_ids = volume->get_extruders();
|
||||
if (ret.extrude_ids.empty()) //the default extruder
|
||||
ret.extrude_ids.push_back(1);
|
||||
|
||||
// get user specified brim width per object
|
||||
// Note: if global brim_type=btNoBrim or brAutoBrim, user can't set individual brim_width
|
||||
if (object->config.has("brim_width"))
|
||||
ret.user_brim_width = object->config.opt_float("brim_width");
|
||||
else {
|
||||
// BBS: get DeltaT, adhcoeff before calculating brim width
|
||||
double adhcoeff = getadhesionCoeff(object->volumes);
|
||||
double DeltaT = getTemperatureFromExtruder(object->volumes);
|
||||
// get auto brim width (Note even if the global brim_type=btOuterBrim, we can still go into this branch)
|
||||
ret.auto_brim_width = get_auto_brim_width(DeltaT, adhcoeff);
|
||||
}
|
||||
}
|
||||
|
||||
indexed_triangle_set FacetsAnnotation::get_facets(const ModelVolume& mv, EnforcerBlockerType type) const
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue