mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-30 12:11:15 -06:00
ENH: change base pattern "None" to "Hollow"
1. change base pattern "None" to "Hollow", and add an icon image 2. fix a bug of not initializing m_highest_overhang_layer 3. fix a bug where normal(auto) with Tree* styles won't generate any supports. 4. add popup message when selecting support material for interface. 5. draw connected loops when wall count is larger than 1 Change-Id: I7ea211d2971b25c65724bb10d0f6cf6e0b68c6a1 (cherry picked from commit 4c1ae7f937239fc3e1397ec2cb3b290d886bb0f0)
This commit is contained in:
Arthur
Lane.Wei
parent
2690b5b558
commit
854eb0af95
10 changed files with 138 additions and 85 deletions
|
|
@ -260,8 +260,8 @@ public:
|
|||
{
|
||||
ExPolygon *area;
|
||||
int type;
|
||||
int dist_to_top;
|
||||
AreaGroup(ExPolygon *a, int t, int d) : area(a), type(t), dist_to_top(d) {}
|
||||
coordf_t dist_to_top; // mm dist to top
|
||||
AreaGroup(ExPolygon *a, int t, coordf_t d) : area(a), type(t), dist_to_top(d) {}
|
||||
};
|
||||
std::vector<AreaGroup> area_groups;
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ static t_config_enum_values s_keys_map_SupportMaterialPattern {
|
|||
{ "honeycomb", smpHoneycomb },
|
||||
{ "lightning", smpLightning },
|
||||
{ "default", smpDefault},
|
||||
{ "none", smpNone},
|
||||
{ "hollow", smpNone},
|
||||
};
|
||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialPattern)
|
||||
|
||||
|
|
@ -2571,13 +2571,13 @@ void PrintConfigDef::init_fff_params()
|
|||
def->enum_values.push_back("rectilinear-grid");
|
||||
def->enum_values.push_back("honeycomb");
|
||||
def->enum_values.push_back("lightning");
|
||||
def->enum_values.push_back("none");
|
||||
def->enum_values.push_back("hollow");
|
||||
def->enum_labels.push_back(L("Default"));
|
||||
def->enum_labels.push_back(L("Rectilinear"));
|
||||
def->enum_labels.push_back(L("Rectilinear grid"));
|
||||
def->enum_labels.push_back(L("Honeycomb"));
|
||||
def->enum_labels.push_back(L("Lightning"));
|
||||
def->enum_labels.push_back(L("None"));
|
||||
def->enum_labels.push_back(L("Hollow"));
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear));
|
||||
|
||||
|
|
@ -3830,6 +3830,8 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
|
|||
value = "tree(manual)";
|
||||
} else if (opt_key == "support_type" && value == "hybrid(auto)") {
|
||||
value = "tree(auto)";
|
||||
} else if (opt_key == "support_base_pattern" && value == "none") {
|
||||
value = "hollow";
|
||||
} else if (opt_key == "different_settings_to_system") {
|
||||
std::string copy_value = value;
|
||||
copy_value.erase(std::remove(copy_value.begin(), copy_value.end(), '\"'), copy_value.end()); // remove '"' in string
|
||||
|
|
|
|||
|
|
@ -790,7 +790,7 @@ public:
|
|||
m_extrusion_width(params.extrusion_width),
|
||||
m_support_material_closing_radius(params.support_closing_radius)
|
||||
{
|
||||
if (m_style == smsDefault) m_style = smsGrid;
|
||||
if (m_style != smsSnug) m_style = smsGrid;
|
||||
switch (m_style) {
|
||||
case smsGrid:
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include "Print.hpp"
|
||||
#include "Layer.hpp"
|
||||
#include "Fill/FillBase.hpp"
|
||||
#include "Fill/FillConcentric.hpp"
|
||||
#include "CurveAnalyzer.hpp"
|
||||
#include "SVG.hpp"
|
||||
#include "ShortestPath.hpp"
|
||||
|
|
@ -1268,18 +1269,17 @@ static inline std::vector<BoundingBox> fill_expolygons_generate_paths(
|
|||
return fill_boxes;
|
||||
}
|
||||
|
||||
static void make_perimeter_and_inner_brim(ExtrusionEntitiesPtr &dst, const Print &print, const ExPolygon &support_area, size_t wall_count, const Flow &flow, bool is_interface)
|
||||
static void _make_loops(ExtrusionEntitiesPtr& loops_entities, ExPolygons &support_area, ExtrusionRole role, size_t wall_count, const Flow &flow)
|
||||
{
|
||||
Polygons loops;
|
||||
ExPolygons support_area_new = offset_ex(support_area, -0.5f * float(flow.scaled_spacing()), jtSquare);
|
||||
|
||||
Polygons loops;
|
||||
std::map<ExPolygon *, int> depth_per_expoly;
|
||||
std::list<ExPolygon> expoly_list;
|
||||
|
||||
for (ExPolygon &expoly : support_area_new) {
|
||||
for (ExPolygon &expoly : support_area) {
|
||||
expoly_list.emplace_back(std::move(expoly));
|
||||
depth_per_expoly.insert({&expoly_list.back(), 0});
|
||||
}
|
||||
if (expoly_list.empty()) return;
|
||||
|
||||
while (!expoly_list.empty()) {
|
||||
polygons_append(loops, to_polygons(expoly_list.front()));
|
||||
|
|
@ -1287,22 +1287,68 @@ static void make_perimeter_and_inner_brim(ExtrusionEntitiesPtr &dst, const Print
|
|||
auto first_iter = expoly_list.begin();
|
||||
auto depth_iter = depth_per_expoly.find(&expoly_list.front());
|
||||
if (depth_iter->second + 1 < wall_count) {
|
||||
//ExPolygons expolys_new = offset_ex(expoly_list.front(), -float(flow.scaled_spacing()), jtSquare);
|
||||
// shrink and then dilate to prevent overlapping and overflow
|
||||
ExPolygons expolys_new = offset_ex(expoly_list.front(), -1.4 * float(flow.scaled_spacing()), jtSquare);
|
||||
expolys_new = offset_ex(expolys_new, .4*float(flow.scaled_spacing()), jtSquare);
|
||||
ExPolygons expolys_new = offset2_ex({expoly_list.front()}, -1.4 * float(flow.scaled_spacing()), .4 * float(flow.scaled_spacing()));
|
||||
|
||||
for (ExPolygon &expoly : expolys_new) {
|
||||
auto new_iter = expoly_list.insert(expoly_list.begin(), expoly);
|
||||
depth_per_expoly.insert({ &*new_iter, depth_iter->second + 1 });
|
||||
depth_per_expoly.insert({&*new_iter, depth_iter->second + 1});
|
||||
}
|
||||
}
|
||||
depth_per_expoly.erase(depth_iter);
|
||||
expoly_list.erase(first_iter);
|
||||
}
|
||||
|
||||
ExtrusionRole role = is_interface ? erSupportMaterialInterface : erSupportMaterial;
|
||||
extrusion_entities_append_loops(dst, std::move(loops), role,
|
||||
float(flow.mm3_per_mm()), float(flow.width()), float(flow.height()));
|
||||
// draw connected loops
|
||||
if (wall_count > 1 && wall_count<5) {
|
||||
wall_count = std::min(wall_count, loops.size());
|
||||
Polylines polylines;
|
||||
polylines.push_back(Polyline());
|
||||
Polyline& polyline = polylines.back();
|
||||
Point end_pt;
|
||||
Point end_dir;
|
||||
for (int wall_idx = 0; wall_idx < wall_count; wall_idx++) {
|
||||
Polygon &loop = loops[wall_idx];
|
||||
if (loop.size()<3) continue;
|
||||
// break the closed loop if this is not the last loop, so the next loop can attach to the end_pt
|
||||
//if (wall_idx != wall_count - 1 && loop.first_point() == loop.last_point())
|
||||
// loop.points.pop_back();
|
||||
|
||||
if (wall_idx == 0) {
|
||||
polyline.append(loop.points);
|
||||
} else {
|
||||
double d = loop.distance_to(end_pt);
|
||||
if (d < scale_(2)) { // if current loop is close to the previous one
|
||||
polyline.append(end_pt);
|
||||
ExtrusionPath expath;
|
||||
expath.polyline.append(loop.points);
|
||||
ExtrusionLoop extru_loop(expath);
|
||||
extru_loop.split_at(end_pt, false);
|
||||
polyline.append(extru_loop.as_polyline());
|
||||
}else{// create a new polylie if they are far away
|
||||
polylines.push_back(Polyline());
|
||||
polyline = polylines.back();
|
||||
polyline.append(loop.points);
|
||||
}
|
||||
}
|
||||
end_pt = polyline.points.back();
|
||||
end_dir = end_pt - polyline.points[polyline.points.size() - 2];
|
||||
Point perpendicular_dir = turn90_ccw(end_dir);
|
||||
end_pt = end_pt + normal(perpendicular_dir, flow.scaled_spacing());
|
||||
}
|
||||
|
||||
extrusion_entities_append_paths(loops_entities, polylines, role, float(flow.mm3_per_mm()), float(flow.width()), float(flow.height()));
|
||||
} else {
|
||||
extrusion_entities_append_loops(loops_entities, std::move(loops), role, float(flow.mm3_per_mm()), float(flow.width()), float(flow.height()));
|
||||
}
|
||||
}
|
||||
|
||||
static void make_perimeter_and_inner_brim(ExtrusionEntitiesPtr &dst, const ExPolygon &support_area, size_t wall_count, const Flow &flow, ExtrusionRole role)
|
||||
{
|
||||
Polygons loops;
|
||||
ExPolygons support_area_new = offset_ex(support_area, -0.5f * float(flow.scaled_spacing()), jtSquare);
|
||||
_make_loops(dst, support_area_new, role, wall_count, flow);
|
||||
}
|
||||
|
||||
static void make_perimeter_and_infill(ExtrusionEntitiesPtr& dst, const Print& print, const ExPolygon& support_area, size_t wall_count, const Flow& flow, ExtrusionRole role, Fill* filler_support, double support_density, bool infill_first=true)
|
||||
|
|
@ -1340,39 +1386,13 @@ static void make_perimeter_and_infill(ExtrusionEntitiesPtr& dst, const Print& pr
|
|||
}
|
||||
}
|
||||
|
||||
{
|
||||
std::map<ExPolygon*, int> depth_per_expoly;
|
||||
std::list<ExPolygon> expoly_list;
|
||||
|
||||
for (ExPolygon& expoly : support_area_new) {
|
||||
expoly_list.emplace_back(std::move(expoly));
|
||||
depth_per_expoly.insert({ &expoly_list.back(), 0 });
|
||||
}
|
||||
|
||||
while (!expoly_list.empty()) {
|
||||
polygons_append(loops, to_polygons(expoly_list.front()));
|
||||
|
||||
auto first_iter = expoly_list.begin();
|
||||
auto depth_iter = depth_per_expoly.find(&expoly_list.front());
|
||||
if (depth_iter->second + 1 < wall_count) {
|
||||
ExPolygons expolys_new = offset_ex(expoly_list.front(), -float(flow.scaled_spacing()), jtSquare);
|
||||
|
||||
for (ExPolygon& expoly : expolys_new) {
|
||||
auto new_iter = expoly_list.insert(expoly_list.begin(), expoly);
|
||||
depth_per_expoly.insert({ &*new_iter, depth_iter->second + 1 });
|
||||
}
|
||||
}
|
||||
depth_per_expoly.erase(depth_iter);
|
||||
expoly_list.erase(first_iter);
|
||||
}
|
||||
{ // draw loops
|
||||
ExtrusionEntitiesPtr loops_entities;
|
||||
_make_loops(loops_entities, support_area_new, role, wall_count, flow);
|
||||
|
||||
if (infill_first)
|
||||
extrusion_entities_append_loops(dst, std::move(loops), role,
|
||||
float(flow.mm3_per_mm()), float(flow.width()), float(flow.height()));
|
||||
else { // loops first
|
||||
ExtrusionEntitiesPtr loops_entities;
|
||||
extrusion_entities_append_loops(loops_entities, std::move(loops), role,
|
||||
float(flow.mm3_per_mm()), float(flow.width()), float(flow.height()));
|
||||
dst.insert(dst.end(), loops_entities.begin(), loops_entities.end());
|
||||
else { // loops first
|
||||
loops_entities.insert(loops_entities.end(), dst.begin(), dst.end());
|
||||
dst = std::move(loops_entities);
|
||||
}
|
||||
|
|
@ -1530,8 +1550,8 @@ void TreeSupport::generate_toolpaths()
|
|||
// interface
|
||||
if (layer_id == 0) {
|
||||
Flow flow = m_raft_layers == 0 ? m_object->print()->brim_flow() : support_flow;
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, *m_object->print(), poly, wall_count, flow,
|
||||
area_group.type == TreeSupportLayer::RoofType);
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, poly, wall_count, flow,
|
||||
area_group.type == TreeSupportLayer::RoofType ? erSupportMaterialInterface : erSupportMaterial);
|
||||
polys = std::move(offset_ex(poly, -flow.scaled_spacing()));
|
||||
} else if (area_group.type == TreeSupportLayer::Roof1stLayer) {
|
||||
polys = std::move(offset_ex(poly, 0.5*support_flow.scaled_width()));
|
||||
|
|
@ -1573,9 +1593,9 @@ void TreeSupport::generate_toolpaths()
|
|||
// base_areas
|
||||
filler_support->spacing = support_flow.spacing();
|
||||
Flow flow = (layer_id == 0 && m_raft_layers == 0) ? m_object->print()->brim_flow() : support_flow;
|
||||
if (area_group.dist_to_top < 10 / layer_height && !with_infill) {
|
||||
if (area_group.dist_to_top < 10 && !with_infill) {
|
||||
// at least 2 walls for the top tips
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, *m_object->print(), poly, std::max(wall_count, size_t(2)), flow, false);
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, poly, std::max(wall_count, size_t(2)), flow, erSupportMaterial);
|
||||
} else {
|
||||
if (with_infill && layer_id > 0 && m_support_params.base_fill_pattern != ipLightning) {
|
||||
filler_support->angle = Geometry::deg2rad(object_config.support_angle.value);
|
||||
|
|
@ -1589,8 +1609,8 @@ void TreeSupport::generate_toolpaths()
|
|||
erSupportMaterial, filler_support.get(), support_density);
|
||||
}
|
||||
} else {
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, *m_object->print(), poly,
|
||||
layer_id > 0 ? wall_count : std::numeric_limits<size_t>::max(), flow, false);
|
||||
make_perimeter_and_inner_brim(ts_layer->support_fills.entities, poly,
|
||||
layer_id > 0 ? wall_count : std::numeric_limits<size_t>::max(), flow, erSupportMaterial);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2070,9 +2090,9 @@ void TreeSupport::draw_circles(const std::vector<std::vector<Node*>>& contact_no
|
|||
ExPolygons& roof_1st_layer = ts_layer->roof_1st_layer;
|
||||
ExPolygons& floor_areas = ts_layer->floor_areas;
|
||||
ExPolygons& roof_gap_areas = ts_layer->roof_gap_areas;
|
||||
int max_layers_above_base = 0;
|
||||
int max_layers_above_roof = 0;
|
||||
int max_layers_above_roof1 = 0;
|
||||
coordf_t max_layers_above_base = 0;
|
||||
coordf_t max_layers_above_roof = 0;
|
||||
coordf_t max_layers_above_roof1 = 0;
|
||||
|
||||
BOOST_LOG_TRIVIAL(debug) << "circles at layer " << layer_nr << " contact nodes size=" << contact_nodes[layer_nr].size();
|
||||
//Draw the support areas and add the roofs appropriately to the support roof instead of normal areas.
|
||||
|
|
@ -2140,17 +2160,17 @@ void TreeSupport::draw_circles(const std::vector<std::vector<Node*>>& contact_no
|
|||
else if (node.support_roof_layers_below == 1)
|
||||
{
|
||||
append(roof_1st_layer, area);
|
||||
max_layers_above_roof1 = std::max(max_layers_above_roof1, node.distance_to_top);
|
||||
max_layers_above_roof1 = std::max(max_layers_above_roof1, node.dist_mm_to_top);
|
||||
}
|
||||
else if (node.support_roof_layers_below > 0)
|
||||
{
|
||||
append(roof_areas, area);
|
||||
max_layers_above_roof = std::max(max_layers_above_roof, node.distance_to_top);
|
||||
max_layers_above_roof = std::max(max_layers_above_roof, node.dist_mm_to_top);
|
||||
}
|
||||
else
|
||||
{
|
||||
append(base_areas, area);
|
||||
max_layers_above_base = std::max(max_layers_above_base, node.distance_to_top);
|
||||
max_layers_above_base = std::max(max_layers_above_base, node.dist_mm_to_top);
|
||||
}
|
||||
|
||||
if (layer_nr < brim_skirt_layers)
|
||||
|
|
@ -2675,7 +2695,7 @@ void TreeSupport::drop_nodes(std::vector<std::vector<Node*>>& contact_nodes)
|
|||
#ifdef SUPPORT_TREE_DEBUG_TO_SVG
|
||||
coordf_t branch_radius_temp = 0;
|
||||
coordf_t max_y = std::numeric_limits<coordf_t>::min();
|
||||
draw_layer_mst(std::to_string(layer_nr), spanning_trees, m_object->get_layer(layer_nr)->lslices);
|
||||
draw_layer_mst(std::to_string(ts_layer->print_z), spanning_trees, m_object->get_layer(layer_nr)->lslices);
|
||||
#endif
|
||||
for (size_t group_index = 0; group_index < nodes_per_part.size(); group_index++)
|
||||
{
|
||||
|
|
@ -2867,7 +2887,7 @@ void TreeSupport::drop_nodes(std::vector<std::vector<Node*>>& contact_nodes)
|
|||
}
|
||||
// move to the averaged direction of neighbor center and contour edge if they are roughly same direction
|
||||
Point movement;
|
||||
if (is_slim)
|
||||
if (/*is_slim*/1)
|
||||
movement = move_to_neighbor_center*2 + (dist2_to_outer > EPSILON ? direction_to_outer * (1 / dist2_to_outer) : Point(0, 0));
|
||||
else {
|
||||
if (movement.dot(move_to_neighbor_center) >= 0.2 || move_to_neighbor_center == Point(0, 0))
|
||||
|
|
@ -3561,7 +3581,7 @@ const ExPolygons& TreeSupportData::calculate_avoidance(const RadiusLayerPair& ke
|
|||
const auto& radius = key.first;
|
||||
const auto& layer_nr = key.second;
|
||||
std::pair<tbb::concurrent_unordered_map<RadiusLayerPair, ExPolygons, RadiusLayerPairHash>::iterator,bool> ret;
|
||||
if (is_slim) {
|
||||
if (/*is_slim*/1) {
|
||||
if (layer_nr == 0) {
|
||||
m_avoidance_cache[key] = get_collision(radius, 0);
|
||||
return m_avoidance_cache[key];
|
||||
|
|
|
|||
|
|
@ -376,8 +376,8 @@ private:
|
|||
SlicingParameters m_slicing_params;
|
||||
// Various precomputed support parameters to be shared with external functions.
|
||||
SupportParams m_support_params;
|
||||
size_t m_raft_layers;
|
||||
size_t m_highest_overhang_layer;
|
||||
size_t m_raft_layers = 0;
|
||||
size_t m_highest_overhang_layer = 0;
|
||||
std::vector<std::vector<MinimumSpanningTree>> m_spanning_trees;
|
||||
std::vector< std::unordered_map<Line, bool, LineHash>> m_mst_line_x_layer_contour_caches;
|
||||
coordf_t MAX_BRANCH_RADIUS = 10.0;
|
||||
|
|
|
|||
|
|
@ -5635,5 +5635,21 @@ void GUI_App::disassociate_files(std::wstring extend)
|
|||
|
||||
#endif // __WXMSW__
|
||||
|
||||
bool is_support_filament(int extruder_id)
|
||||
{
|
||||
auto &filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets;
|
||||
auto &filaments = Slic3r::GUI::wxGetApp().preset_bundle->filaments;
|
||||
|
||||
if (extruder_id >= filament_presets.size()) return false;
|
||||
|
||||
Slic3r::Preset *filament = filaments.find_preset(filament_presets[extruder_id]);
|
||||
if (filament == nullptr) return false;
|
||||
|
||||
Slic3r::ConfigOptionBools *support_option = dynamic_cast<Slic3r::ConfigOptionBools *>(filament->config.option("filament_is_support"));
|
||||
if (support_option == nullptr) return false;
|
||||
|
||||
return support_option->get_at(0);
|
||||
};
|
||||
|
||||
} // GUI
|
||||
} //Slic3r
|
||||
|
|
|
|||
|
|
@ -589,7 +589,9 @@ private:
|
|||
|
||||
DECLARE_APP(GUI_App)
|
||||
wxDECLARE_EVENT(EVT_CONNECT_LAN_MODE_PRINT, wxCommandEvent);
|
||||
} // GUI
|
||||
|
||||
bool is_support_filament(int extruder_id);
|
||||
} // namespace GUI
|
||||
} // Slic3r
|
||||
|
||||
#endif // slic3r_GUI_App_hpp_
|
||||
|
|
|
|||
|
|
@ -1418,7 +1418,6 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
|
|||
|
||||
// BBS popup a message to ask the user to set optimum parameters for tree support
|
||||
if (opt_key == "support_type" || opt_key == "support_style") {
|
||||
// BBS
|
||||
if (is_tree_slim(m_config->opt_enum<SupportType>("support_type"), m_config->opt_enum<SupportMaterialStyle>("support_style")) &&
|
||||
!(m_config->opt_float("support_top_z_distance") == 0 && m_config->opt_int("support_interface_top_layers") == 0 && m_config->opt_int("tree_support_wall_count") == 2)) {
|
||||
wxString msg_text = _L("We have added an experimental style \"Tree Slim\" that features smaller support volume but weaker strength.\n"
|
||||
|
|
@ -1438,6 +1437,28 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
|
|||
}
|
||||
}
|
||||
|
||||
// BBS popup a message to ask the user to set optimum parameters for support interface if support materials are used
|
||||
if (opt_key == "support_interface_filament") {
|
||||
int interface_filament_id = m_config->opt_int("support_interface_filament") - 1; // the displayed id is based from 1, while internal id is based from 0
|
||||
if (is_support_filament(interface_filament_id) && !(m_config->opt_float("support_top_z_distance") == 0 && m_config->opt_float("support_interface_spacing") == 0 &&
|
||||
m_config->opt_enum<SupportMaterialInterfacePattern>("support_interface_pattern") == SupportMaterialInterfacePattern::smipConcentric)) {
|
||||
wxString msg_text = _L("When using support material for the support interface, We recommand the following settings:\n"
|
||||
"0 top distance, 0 interface spacing, concentric pattern.");
|
||||
msg_text += "\n\n" + _L("Change these settings automatically? \n"
|
||||
"Yes - Change these settings automatically\n"
|
||||
"No - Do not change these settings for me");
|
||||
MessageDialog dialog(wxGetApp().plater(), msg_text, "Suggestion", wxICON_WARNING | wxYES | wxNO);
|
||||
DynamicPrintConfig new_conf = *m_config;
|
||||
if (dialog.ShowModal() == wxID_YES) {
|
||||
new_conf.set_key_value("support_top_z_distance", new ConfigOptionFloat(0));
|
||||
new_conf.set_key_value("support_interface_spacing", new ConfigOptionFloat(0));
|
||||
new_conf.set_key_value("support_interface_pattern", new ConfigOptionEnum<SupportMaterialInterfacePattern>(SupportMaterialInterfacePattern::smipConcentric));
|
||||
m_config_manipulation.apply(m_config, &new_conf);
|
||||
}
|
||||
wxGetApp().plater()->update();
|
||||
}
|
||||
}
|
||||
|
||||
// BBS
|
||||
#if 0
|
||||
if (opt_key == "extruders_count")
|
||||
|
|
|
|||
|
|
@ -611,24 +611,6 @@ void WipingPanel::update_warning_texts()
|
|||
|
||||
void WipingPanel::calc_flushing_volumes()
|
||||
{
|
||||
auto is_support_filament = [](int extruder_id) -> bool {
|
||||
auto& filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets;
|
||||
auto& filaments = Slic3r::GUI::wxGetApp().preset_bundle->filaments;
|
||||
|
||||
if (extruder_id >= filament_presets.size())
|
||||
return false;
|
||||
|
||||
Slic3r::Preset* filament = filaments.find_preset(filament_presets[extruder_id]);
|
||||
if (filament == nullptr)
|
||||
return false;
|
||||
|
||||
Slic3r::ConfigOptionBools* support_option = dynamic_cast<Slic3r::ConfigOptionBools*>(filament->config.option("filament_is_support"));
|
||||
if (support_option == nullptr)
|
||||
return false;
|
||||
|
||||
return support_option->get_at(0);
|
||||
};
|
||||
|
||||
for (int from_idx = 0; from_idx < m_colours.size(); from_idx++) {
|
||||
const wxColour& from = m_colours[from_idx];
|
||||
bool is_from_support = is_support_filament(from_idx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue