3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto color change: check overhangs lust from Preview when detecting auto color changes

Browse source 
+ fixed typo in equivalent_areas()
 + Added missed include
This commit is contained in:
YuSanka 2021-10-12 15:23:50 +02:00
parent 5990f05418
commit a4ad4ff4a9
3 changed files with 7 additions and 6 deletions
src/slic3r/GUI
DoubleSlider.cpp

8
src/slic3r/GUI/DoubleSlider.cpp
View file

@ -43,7 +43,7 @@ constexpr double miscalculation = scale_(scale_(1)); // equal to 1 mm2
bool equivalent_areas(const double& bottom_area, const double& top_area)
{
return fabs(bottom_area - top_area <= miscalculation);
return fabs(bottom_area - top_area) <= miscalculation;
}
wxDEFINE_EVENT(wxCUSTOMEVT_TICKSCHANGED, wxEvent);
@ -2042,7 +2042,7 @@ void Control::show_cog_icon_context_menu()
GUI::wxGetApp().plater()->PopupMenu(&menu);
}
bool check_color_change(PrintObject* object, size_t frst_layer_id, size_t layers_cnt, std::function<bool(Layer*)> break_condition)
bool check_color_change(PrintObject* object, size_t frst_layer_id, size_t layers_cnt, bool check_overhangs, std::function<bool(Layer*)> break_condition)
{
double prev_area = area(object->get_layer(frst_layer_id)->lslices);
@ -2052,7 +2052,7 @@ bool check_color_change(PrintObject* object, size_t frst_layer_id, size_t layers
double cur_area = area(layer->lslices);
// check for overhangs
if (cur_area > prev_area && !equivalent_areas(prev_area, cur_area))
if (check_overhangs && cur_area > prev_area && !equivalent_areas(prev_area, cur_area))
break;
// Check percent of the area decrease.
@ -2087,7 +2087,7 @@ void Control::auto_color_change()
if (object->layer_count() == 0)
continue;
check_color_change(object, 1, object->layers().size(), [this, extruders_cnt](Layer* layer)
check_color_change(object, 1, object->layers().size(), false, [this, extruders_cnt](Layer* layer)
{
int tick = get_tick_from_value(layer->print_z);
if (tick >= 0 && !m_ticks.has_tick(tick)) {