From dc1bac6b6c89acc41e9a043b040f5271a94a7d51 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Thu, 13 Mar 2025 12:06:16 +0800 Subject: [PATCH] ENH: refine some func and class naming jira:NONE Signed-off-by: xun.zhang Change-Id: Icaaf6197bacf5e7037835c475b0d0af0cfb22a44 --- src/libslic3r/CMakeLists.txt | 4 +-- src/libslic3r/ExtrusionEntity.cpp | 6 ++-- src/libslic3r/ExtrusionEntity.hpp | 8 ++--- src/libslic3r/Fill/Fill.cpp | 30 +++++++++---------- src/libslic3r/Fill/FillBase.cpp | 4 +-- ...Contour.cpp => FillFloatingConcentric.cpp} | 22 +++++++------- ...Contour.hpp => FillFloatingConcentric.hpp} | 10 +++---- src/libslic3r/GCode.cpp | 4 +-- src/libslic3r/GCode/GCodeProcessor.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 6 ++-- src/libslic3r/PrintConfig.hpp | 2 +- src/libslic3r/PrintObject.cpp | 2 +- src/libslic3r/Surface.cpp | 2 +- src/libslic3r/Surface.hpp | 6 ++-- src/slic3r/GUI/GCodeViewer.cpp | 4 +-- 15 files changed, 56 insertions(+), 56 deletions(-) rename src/libslic3r/Fill/{FillContour.cpp => FillFloatingConcentric.cpp} (97%) rename src/libslic3r/Fill/{FillContour.hpp => FillFloatingConcentric.hpp} (89%) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index e7494a6af..71cf247f7 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -112,8 +112,8 @@ set(lisbslic3r_sources Fill/Lightning/TreeNode.hpp Fill/FillRectilinear.cpp Fill/FillRectilinear.hpp - Fill/FillContour.hpp - Fill/FillContour.cpp + Fill/FillFloatingConcentric.hpp + Fill/FillFloatingConcentric.cpp Flow.cpp Flow.hpp Frustum.cpp diff --git a/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp index 19151eb5e..81d00a045 100644 --- a/src/libslic3r/ExtrusionEntity.cpp +++ b/src/libslic3r/ExtrusionEntity.cpp @@ -619,7 +619,7 @@ std::string ExtrusionEntity::role_to_string(ExtrusionRole role) case erExternalPerimeter : return L("Outer wall"); case erOverhangPerimeter : return L("Overhang wall"); case erInternalInfill : return L("Sparse infill"); - case erEnsureVertical : return L("Ensure vertical"); + case erFloatingVerticalShell : return L("Floating vertical shell"); case erSolidInfill : return L("Internal solid infill"); case erTopSolidInfill : return L("Top surface"); case erBottomSurface : return L("Bottom surface"); @@ -650,8 +650,8 @@ ExtrusionRole ExtrusionEntity::string_to_role(const std::string_view role) return erOverhangPerimeter; else if (role == L("Sparse infill")) return erInternalInfill; - else if (role == L("Ensure vertical")) - return erEnsureVertical; + else if (role == L("Floating vertical shell")) + return erFloatingVerticalShell; else if (role == L("Internal solid infill")) return erSolidInfill; else if (role == L("Top surface")) diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp index 1e35f82bb..773818010 100644 --- a/src/libslic3r/ExtrusionEntity.hpp +++ b/src/libslic3r/ExtrusionEntity.hpp @@ -48,7 +48,7 @@ enum ExtrusionRole : uint8_t { erOverhangPerimeter, erInternalInfill, erSolidInfill, - erEnsureVertical, + erFloatingVerticalShell, erTopSolidInfill, erBottomSurface, erIroning, @@ -70,7 +70,7 @@ enum ExtrusionRole : uint8_t { enum CustomizeFlag : uint8_t { cfNone, cfCircleCompensation, // shaft hole tolerance compensation - cfEnsureVertical + cfFloatingVerticalShell }; // Special flags describing loop @@ -99,7 +99,7 @@ inline bool is_infill(ExtrusionRole role) return role == erBridgeInfill || role == erInternalInfill || role == erSolidInfill - || role == erEnsureVertical + || role == erFloatingVerticalShell || role == erTopSolidInfill || role == erBottomSurface || role == erIroning; @@ -114,7 +114,7 @@ inline bool is_solid_infill(ExtrusionRole role) { return role == erBridgeInfill || role == erSolidInfill - || role == erEnsureVertical + || role == erFloatingVerticalShell || role == erTopSolidInfill || role == erBottomSurface || role == erIroning; diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index a13c2006f..4d015bcf6 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -14,7 +14,7 @@ #include "FillLightning.hpp" #include "FillConcentricInternal.hpp" #include "FillConcentric.hpp" -#include "FillContour.hpp" +#include "FillFloatingConcentric.hpp" #define NARROW_INFILL_AREA_THRESHOLD 3 @@ -168,8 +168,8 @@ std::vector group_fills(const Layer &layer) if (surface.is_solid()) { params.density = 100.f; //FIXME for non-thick bridges, shall we allow a bottom surface pattern? - if (surface.is_ensure_vertical()) - params.pattern = InfillPattern::ipEnsureVertical; + if (surface.is_floating_vertical_shell()) + params.pattern = InfillPattern::ipFloatingConcentric; else if (surface.is_solid_infill()) params.pattern = region_config.internal_solid_infill_pattern.value; else if (surface.is_external() && !is_bridge) @@ -184,7 +184,7 @@ std::vector group_fills(const Layer &layer) is_bridge ? erBridgeInfill : (surface.is_solid() ? - (surface.is_top() ? erTopSolidInfill : (surface.is_bottom()? erBottomSurface : surface.is_ensure_vertical()?erEnsureVertical:erSolidInfill)) : + (surface.is_top() ? erTopSolidInfill : (surface.is_bottom()? erBottomSurface : surface.is_floating_vertical_shell()?erFloatingVerticalShell:erSolidInfill)) : erInternalInfill); params.bridge_angle = float(surface.bridge_angle); params.angle = float(Geometry::deg2rad(region_config.infill_direction.value)); @@ -203,7 +203,7 @@ std::vector group_fills(const Layer &layer) params.top_surface_speed = region_config.top_surface_speed.get_at(layer.get_extruder_id(params.extruder)); else if (params.extrusion_role == erSolidInfill) params.solid_infill_speed = region_config.internal_solid_infill_speed.get_at(layer.get_extruder_id(params.extruder)); - else if (params.extrusion_role == erEnsureVertical) + else if (params.extrusion_role == erFloatingVerticalShell) params.solid_infill_speed = region_config.bridge_speed.get_at(layer.get_extruder_id(params.extruder)); } // Calculate flow spacing for infill pattern generation. @@ -395,9 +395,9 @@ std::vector group_fills(const Layer &layer) continue; } else if (narrow_floating_expoly_idx.size() == expolygons_size) { - surface_fills[i].params.pattern = ipEnsureVertical; - surface_fills[i].params.extrusion_role = erEnsureVertical; - surface_fills[i].surface.surface_type = stEnsureVertical; + surface_fills[i].params.pattern = ipFloatingConcentric; + surface_fills[i].params.extrusion_role = erFloatingVerticalShell; + surface_fills[i].surface.surface_type = stFloatingVerticalShell; } else if (narrow_expoly_idx.size() == expolygons_size) { surface_fills[i].params.pattern = ipConcentricInternal; @@ -421,11 +421,11 @@ std::vector group_fills(const Layer &layer) if (!narrow_floating_expoly_idx.empty()) { params = surface_fills[i].params; - params.pattern = ipEnsureVertical; - params.extrusion_role = erEnsureVertical; + params.pattern = ipFloatingConcentric; + params.extrusion_role = erFloatingVerticalShell; surface_fills.emplace_back(params); surface_fills.back().region_id = surface_fills[i].region_id; - surface_fills.back().surface.surface_type = stEnsureVertical; + surface_fills.back().surface.surface_type = stFloatingVerticalShell; surface_fills.back().surface.thickness = surface_fills[i].surface.thickness; surface_fills.back().region_id_group = surface_fills[i].region_id_group; surface_fills.back().no_overlap_expolygons = surface_fills[i].no_overlap_expolygons; @@ -519,8 +519,8 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: } else if (surface_fill.params.pattern == ipLightning){ dynamic_cast(f.get())->generator = lightning_generator; } - else if (surface_fill.params.pattern == ipEnsureVertical) { - FillContour* fill_contour = dynamic_cast(f.get()); + else if (surface_fill.params.pattern == ipFloatingConcentric) { + FillFloatingConcentric* fill_contour = dynamic_cast(f.get()); assert(fill_contour != nullptr); ExPolygons lower_unsuporrt_expolys; Polygons lower_sparse_polys; @@ -584,7 +584,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: params.anchor_length = surface_fill.params.anchor_length; params.anchor_length_max = surface_fill.params.anchor_length_max; params.resolution = resolution; - params.use_arachne = surface_fill.params.pattern == ipConcentric || surface_fill.params.pattern == ipEnsureVertical; + params.use_arachne = surface_fill.params.pattern == ipConcentric || surface_fill.params.pattern == ipFloatingConcentric; params.layer_height = m_regions[surface_fill.region_id]->layer()->height; // BBS @@ -602,7 +602,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: params.symmetric_infill_y_axis = surface_fill.params.symmetric_infill_y_axis; } - if (surface_fill.params.pattern == ipGrid || surface_fill.params.pattern == ipEnsureVertical) + if (surface_fill.params.pattern == ipGrid || surface_fill.params.pattern == ipFloatingConcentric) params.can_reverse = false; LayerRegion* layerm = this->m_regions[surface_fill.region_id]; for (ExPolygon& expoly : surface_fill.expolygons) { diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index bbea1224b..d0e8efb95 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -24,7 +24,7 @@ // BBS: new infill pattern header #include "FillConcentricInternal.hpp" #include "FillCrossHatch.hpp" -#include "FillContour.hpp" +#include "FillFloatingConcentric.hpp" // #define INFILL_DEBUG_OUTPUT @@ -59,7 +59,7 @@ Fill* Fill::new_from_type(const InfillPattern type) case ipMonotonicLine: return new FillMonotonicLineWGapFill(); case ipZigZag: return new FillZigZag(); case ipCrossZag: return new FillCrossZag(); - case ipEnsureVertical: return new FillContour(); + case ipFloatingConcentric: return new FillFloatingConcentric(); default: throw Slic3r::InvalidArgument("unknown type"); } } diff --git a/src/libslic3r/Fill/FillContour.cpp b/src/libslic3r/Fill/FillFloatingConcentric.cpp similarity index 97% rename from src/libslic3r/Fill/FillContour.cpp rename to src/libslic3r/Fill/FillFloatingConcentric.cpp index 4ff1c7dad..037aa88c9 100644 --- a/src/libslic3r/Fill/FillContour.cpp +++ b/src/libslic3r/Fill/FillFloatingConcentric.cpp @@ -4,7 +4,7 @@ #include "../ExPolygon.hpp" #include "../Surface.hpp" #include "../VariableWidth.hpp" -#include "FillContour.hpp" +#include "FillFloatingConcentric.hpp" #include namespace Slic3r { @@ -101,7 +101,7 @@ static ExtrusionPaths floating_thick_polyline_to_extrusion_paths(const FloatingT if (curr_floating != is_floating && length != 0) { path.polyline.append(lines[idx].a); if (is_floating) - path.set_customize_flag(CustomizeFlag::cfEnsureVertical); + path.set_customize_flag(CustomizeFlag::cfFloatingVerticalShell); set_flow_for_path(path, sum / length); append_path_and_reset(length, sum, path); } @@ -115,7 +115,7 @@ static ExtrusionPaths floating_thick_polyline_to_extrusion_paths(const FloatingT path.polyline.append(lines[i].a); if (length > SCALED_EPSILON) { if (lines[i].is_a_floating && lines[i].is_b_floating) - path.set_customize_flag(CustomizeFlag::cfEnsureVertical); + path.set_customize_flag(CustomizeFlag::cfFloatingVerticalShell); set_flow_for_path(path, sum / length); paths.emplace_back(std::move(path)); } @@ -176,7 +176,7 @@ static ExtrusionPaths floating_thick_polyline_to_extrusion_paths(const FloatingT if (curr_floating!= is_floating && length != 0) { path.polyline.append(lines[idx].a); if(is_floating) - path.set_customize_flag(CustomizeFlag::cfEnsureVertical); + path.set_customize_flag(CustomizeFlag::cfFloatingVerticalShell); set_flow_for_path(path, sum / length); append_path_and_reset(length, sum, path); } @@ -190,7 +190,7 @@ static ExtrusionPaths floating_thick_polyline_to_extrusion_paths(const FloatingT path.polyline.append(lines[final_size - 1].b); if (length > SCALED_EPSILON) { if (lines[final_size - 1].is_a_floating && lines[final_size - 1].is_b_floating) - path.set_customize_flag(CustomizeFlag::cfEnsureVertical); + path.set_customize_flag(CustomizeFlag::cfFloatingVerticalShell); set_flow_for_path(path, sum / length); paths.emplace_back(std::move(path)); } @@ -676,7 +676,7 @@ void smooth_floating_line(FloatingThickPolyline& line,coord_t max_gap_threshold, } // nearest neibour排序，但是取点时，只能取get_loop_start_candidates得到的点 -FloatingThickPolylines FillContour::resplit_order_loops(Point curr_point, std::vector all_extrusions, const ExPolygons& floating_areas, const Polygons& sparse_polys, const coord_t default_width) +FloatingThickPolylines FillFloatingConcentric::resplit_order_loops(Point curr_point, std::vector all_extrusions, const ExPolygons& floating_areas, const Polygons& sparse_polys, const coord_t default_width) { FloatingThickPolylines result; @@ -715,7 +715,7 @@ FloatingThickPolylines FillContour::resplit_order_loops(Point curr_point, std::v } #if 0 -Polylines FillContour::resplit_order_loops(Point curr_point, Polygons loops, const ExPolygons& floating_areas) +Polylines FillFloatingConcentric::resplit_order_loops(Point curr_point, Polygons loops, const ExPolygons& floating_areas) { Polylines result; for (size_t idx = 0; idx < loops.size(); ++idx) { @@ -745,7 +745,7 @@ Polylines FillContour::resplit_order_loops(Point curr_point, Polygons loops, con return result; }; -void FillContour::_fill_surface_single( +void FillFloatingConcentric::_fill_surface_single( const FillParams& params, unsigned int thickness_layers, const std::pair& direction, @@ -788,7 +788,7 @@ void FillContour::_fill_surface_single( } #endif -void FillContour::_fill_surface_single(const FillParams& params, +void FillFloatingConcentric::_fill_surface_single(const FillParams& params, unsigned int thickness_layers, const std::pair& direction, ExPolygon expolygon, @@ -842,7 +842,7 @@ void FillContour::_fill_surface_single(const FillParams& params, } -FloatingThickPolylines FillContour::fill_surface_arachne_floating(const Surface* surface, const FillParams& params) +FloatingThickPolylines FillFloatingConcentric::fill_surface_arachne_floating(const Surface* surface, const FillParams& params) { // Create the infills for each of the regions. FloatingThickPolylines floating_thick_polylines_out; @@ -851,7 +851,7 @@ FloatingThickPolylines FillContour::fill_surface_arachne_floating(const Surface* return floating_thick_polylines_out; } -void FillContour::fill_surface_extrusion(const Surface* surface, const FillParams& params, ExtrusionEntitiesPtr& out) +void FillFloatingConcentric::fill_surface_extrusion(const Surface* surface, const FillParams& params, ExtrusionEntitiesPtr& out) { FloatingThickPolylines floating_lines = this->fill_surface_arachne_floating(surface, params); if (floating_lines.empty()) diff --git a/src/libslic3r/Fill/FillContour.hpp b/src/libslic3r/Fill/FillFloatingConcentric.hpp similarity index 89% rename from src/libslic3r/Fill/FillContour.hpp rename to src/libslic3r/Fill/FillFloatingConcentric.hpp index 300c8a9cd..bb993ba63 100644 --- a/src/libslic3r/Fill/FillContour.hpp +++ b/src/libslic3r/Fill/FillFloatingConcentric.hpp @@ -1,5 +1,5 @@ -#ifndef SLIC3R_FILLCONTOUR_HPP -#define SLIC3R_FILLCONTOUR_HPP +#ifndef SLIC3R_FillFloatingConcentric_HPP +#define SLIC3R_FillFloatingConcentric_HPP #include "FillBase.hpp" #include "FillConcentric.hpp" @@ -33,15 +33,15 @@ namespace Slic3r{ }; using FloatingThickPolylines = std::vector; - class FillContour : public FillConcentric + class FillFloatingConcentric : public FillConcentric { public: - ~FillContour() override = default; + ~FillFloatingConcentric() override = default; ExPolygons lower_layer_unsupport_areas; Polygons lower_sparse_polys; protected: - Fill* clone() const override { return new FillContour(*this); } + Fill* clone() const override { return new FillFloatingConcentric(*this); } #if 0 void _fill_surface_single( const FillParams ¶ms, diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 2fe887645..802bdbe7e 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -4880,7 +4880,7 @@ std::string GCode::extrude_entity(const ExtrusionEntity &entity, std::string des std::string GCode::extrude_path(ExtrusionPath path, std::string description, double speed) { // description += ExtrusionEntity::role_to_string(path.role()); - bool flag = path.get_customize_flag() == CustomizeFlag::cfEnsureVertical; + bool flag = path.get_customize_flag() == CustomizeFlag::cfFloatingVerticalShell; std::string gcode = this->_extrude(path, description, speed,flag); if (m_wipe.enable && FILAMENT_CONFIG(wipe)) { m_wipe.path = std::move(path.polyline); @@ -5420,7 +5420,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, speed = m_config.sparse_infill_speed.get_at(cur_extruder_index()); } else if (path.role() == erSolidInfill) { speed = m_config.internal_solid_infill_speed.get_at(cur_extruder_index()); - } else if (path.role() == erEnsureVertical){ + } else if (path.role() == erFloatingVerticalShell){ if(use_seperate_speed){ speed = m_config.bridge_speed.get_at(cur_extruder_index()); } diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 557c13f38..3a95c1f7f 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -5513,7 +5513,7 @@ void GCodeProcessor::store_move_vertex(EMoveType type, EMovePathType path_type) void GCodeProcessor::set_extrusion_role(ExtrusionRole role) { m_used_filaments.process_role_cache(this); - if (role == erEnsureVertical) { + if (role == erFloatingVerticalShell) { m_extrusion_role = erSolidInfill; } else { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 01bb60fb0..04b904f8b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1364,8 +1364,8 @@ void PrintConfigDef::init_fff_params() def = this->add("vertical_shell_speed",coFloatsOrPercents); def->label = L("Vertical shell speed"); - def->tooltip = L("Speed for vertical shell area. If expressed as percentage (for example: 80%) it will be calculated on" - "the internal solid infill speed above"); + def->tooltip = L("Speed for vertical shells with overhang regions. If expressed as percentage (for example: 80%) it will be calculated on" + "the internal solid infill speed above"); def->category = L("Speed"); def->sidetext = L("mm/s or %"); def->ratio_over = "internal_solid_infill_speed"; @@ -1376,7 +1376,7 @@ void PrintConfigDef::init_fff_params() def = this->add("detect_floating_vertical_shell", coBool); def->label = L("Detect floating vertical shells"); - def->tooltip = L("Detect floating vertical shells and slow them by using bridge speed."); + def->tooltip = L("Detect overhang paths in vertical shells and slow them by bridge speed."); def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool{true}); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 036b8d6cf..9ab059e38 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -54,7 +54,7 @@ enum AuthorizationType { enum InfillPattern : int { ipConcentric, ipRectilinear, ipGrid, ipLine, ipCubic, ipTriangles, ipStars, ipGyroid, ipHoneycomb, ipAdaptiveCubic, ipMonotonic, ipMonotonicLine, ipAlignedRectilinear, ip3DHoneycomb, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipSupportCubic, ipSupportBase, ipConcentricInternal, - ipLightning, ipCrossHatch, ipZigZag, ipCrossZag,ipEnsureVertical, + ipLightning, ipCrossHatch, ipZigZag, ipCrossZag,ipFloatingConcentric, ipCount, }; diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 524ef898d..a1f5ff1ce 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1957,7 +1957,7 @@ void PrintObject::bridge_over_infill() unsupported_area = diff(unsupported_area, lower_layer_solids); for (LayerRegion *region : layer->regions()) { - auto region_internal_solids = region->fill_surfaces.filter_by_types({ stInternalSolid,stEnsureVertical }); // 取当前层的实心区域 + auto region_internal_solids = region->fill_surfaces.filter_by_type(stInternalSolid); // 取当前层的实心区域 for (const Surface *s : region_internal_solids) { Polygons unsupported = intersection(to_polygons(s->expolygon), unsupported_area); // 当前层需要生成桥接的区域，通过当前层的实心区域与下一层的非实心区域求交得到 // The following flag marks those surfaces, which overlap with unuspported area, but at least part of them is supported. diff --git a/src/libslic3r/Surface.cpp b/src/libslic3r/Surface.cpp index 5a37e2e82..cf6e861f4 100644 --- a/src/libslic3r/Surface.cpp +++ b/src/libslic3r/Surface.cpp @@ -38,7 +38,7 @@ const char* surface_type_to_color_name(const SurfaceType surface_type) case stBottom: return "rgb(0,255,0)"; // "green"; case stBottomBridge: return "rgb(0,0,255)"; // "blue"; case stInternal: return "rgb(255,255,128)"; // yellow - case stEnsureVertical: + case stFloatingVerticalShell: case stInternalSolid: return "rgb(255,0,255)"; // magenta case stInternalBridge: return "rgb(0,255,255)"; case stInternalVoid: return "rgb(128,128,128)"; diff --git a/src/libslic3r/Surface.hpp b/src/libslic3r/Surface.hpp index 2a64143c3..f8ef6d601 100644 --- a/src/libslic3r/Surface.hpp +++ b/src/libslic3r/Surface.hpp @@ -15,7 +15,7 @@ enum SurfaceType { stBottomBridge, // Normal sparse infill. stInternal, - stEnsureVertical, + stFloatingVerticalShell, // Full infill, supporting the top surfaces and/or defining the verticall wall thickness. stInternalSolid, // 1st layer of dense infill over sparse infill, printed with a bridging extrusion flow. @@ -107,8 +107,8 @@ public: bool is_bridge() const { return this->surface_type == stBottomBridge || this->surface_type == stInternalBridge; } bool is_external() const { return this->is_top() || this->is_bottom(); } bool is_internal() const { return ! this->is_external(); } - bool is_ensure_vertical() const { return this->surface_type == stEnsureVertical; } - bool is_solid() const { return this->is_external() || this->is_ensure_vertical() || this->surface_type == stInternalSolid || this->surface_type == stInternalBridge; } + bool is_floating_vertical_shell() const { return this->surface_type == stFloatingVerticalShell; } + bool is_solid() const { return this->is_external() || this->is_floating_vertical_shell() || this->surface_type == stInternalSolid || this->surface_type == stInternalBridge; } bool is_solid_infill() const { return this->surface_type == stInternalSolid; } }; diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 6731b53e2..08aeaa3cf 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -745,7 +745,7 @@ const std::vector GCodeViewer::Extrusion_Role_Colors {{ { 0.12f, 0.12f, 1.00f, 1.0f }, // erOverhangPerimeter { 0.69f, 0.19f, 0.16f, 1.0f }, // erInternalInfill { 0.59f, 0.33f, 0.80f, 1.0f }, // erSolidInfill - { 0.90f, 0.70f, 0.70f, 1.0f }, // erEnsureVertical + { 0.90f, 0.70f, 0.70f, 1.0f }, // erFloatingVerticalShell { 0.94f, 0.25f, 0.25f, 1.0f }, // erTopSolidInfill { 0.40f, 0.36f, 0.78f, 1.0f }, // erBottomSurface { 1.00f, 0.55f, 0.41f, 1.0f }, // erIroning @@ -1725,7 +1725,7 @@ void GCodeViewer::render_calibration_thumbnail(ThumbnailData& thumbnail_data, un m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erExternalPerimeter); m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erOverhangPerimeter); m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erSolidInfill); - m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erEnsureVertical); + m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erFloatingVerticalShell); m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erTopSolidInfill); m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erInternalInfill); m_extrusions.role_visibility_flags = m_extrusions.role_visibility_flags | (1 << erBottomSurface);