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

Rename skirt types

Browse source
This commit is contained in:
vovodroid 2024-09-07 12:02:39 +03:00
parent 5b5cd478c2
commit 5165515167
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/GCode.cpp
View file

@ -4054,7 +4054,7 @@ LayerResult GCode::process_layer(
if (layer_tools.has_wipe_tower && m_wipe_tower)
m_last_processor_extrusion_role = erWipeTower;
if (print.config().skirt_type == stCommon && !print.skirt().empty())
if (print.config().skirt_type == stCombined && !print.skirt().empty())
gcode += generate_skirt(print, print.skirt(), Point(0,0), layer_tools, layer, extruder_id);
auto objects_by_extruder_it = by_extruder.find(extruder_id);
@ -4090,7 +4090,7 @@ LayerResult GCode::process_layer(
}
// BBS
if (print.config().skirt_type == stObject &&
if (print.config().skirt_type == stPerObject &&
print.config().print_sequence == PrintSequence::ByObject &&
!layer.object()->object_skirt().empty() &&
((layer.id() < print.config().skirt_height || print.config().draft_shield == DraftShield::dsEnabled))
@ -4126,7 +4126,7 @@ LayerResult GCode::process_layer(
gcode+="; PURGING FINISHED\n";
for (InstanceToPrint &instance_to_print : instances_to_print) {
if (print.config().skirt_type == stObject &&
if (print.config().skirt_type == stPerObject &&
!instance_to_print.print_object.object_skirt().empty() &&
print.config().print_sequence == PrintSequence::ByLayer
&&

6
src/libslic3r/Print.cpp
View file

@ -2311,7 +2311,7 @@ void Print::_make_skirt()
// Draw outlines from outside to inside.
// Loop while we have less skirts than required or any extruder hasn't reached the min length if any.
std::vector<coordf_t> extruded_length(extruders.size(), 0.);
if (m_config.skirt_type == stCommon) {
if (m_config.skirt_type == stCombined) {
for (size_t i = m_config.skirt_loops, extruder_idx = 0; i > 0; -- i) {
this->throw_if_canceled();
// Offset the skirt outside.
@ -2365,7 +2365,7 @@ void Print::_make_skirt()
for (Polygon &poly : offset(convex_hull, distance + 0.5f * float(scale_(spacing)), ClipperLib::jtRound, float(scale_(0.1))))
append(m_skirt_convex_hull, std::move(poly.points));
if (m_config.skirt_type == stObject) {
if (m_config.skirt_type == stPerObject) {
// BBS
for (auto obj_cvx_hull : object_convex_hulls) {
double object_skirt_distance = float(scale_(m_config.skirt_distance.value - spacing/2.));
@ -2952,7 +2952,7 @@ void Print::export_gcode_from_previous_file(const std::string& file, GCodeProces
std::tuple<float, float> Print::object_skirt_offset(double margin_height) const
{
if (config().skirt_loops == 0 || config().skirt_type != stObject)
if (config().skirt_loops == 0 || config().skirt_type != stPerObject)
return std::make_tuple(0, 0);
float max_nozzle_diameter = *std::max_element(m_config.nozzle_diameter.values.begin(), m_config.nozzle_diameter.values.end());

16
src/libslic3r/PrintConfig.cpp
View file

@ -318,8 +318,8 @@ static const t_config_enum_values s_keys_map_TimelapseType = {
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(TimelapseType)
static const t_config_enum_values s_keys_map_SkirtType = {
{ "common", stCommon },
{ "object", stObject }
{ "combined", stCombined },
{ "perobject", stPerObject }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SkirtType)
@ -4044,14 +4044,14 @@ void PrintConfigDef::init_fff_params()
def = this->add("skirt_type", coEnum);
def->label = L("Skirt type");
def->full_label = L("Skirt type");
def->tooltip = L("Common - single skirt for all objects, Object - individual per object skirt.");
def->tooltip = L("Combined - single skirt for all objects, Per object - individual object skirt.");
def->enum_keys_map = &ConfigOptionEnum<SkirtType>::get_enum_values();
def->enum_values.push_back("common");
def->enum_values.push_back("object");
def->enum_labels.push_back(L("Common"));
def->enum_labels.push_back(L("Object"));
def->enum_values.push_back("combined");
def->enum_values.push_back("perobject");
def->enum_labels.push_back(L("Combined"));
def->enum_labels.push_back(L("Per object"));
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<SkirtType>(stCommon));
def->set_default_value(new ConfigOptionEnum<SkirtType>(stCombined));
def = this->add("skirt_loops", coInt);
def->label = L("Skirt loops");

2
src/libslic3r/PrintConfig.hpp
View file

@ -225,7 +225,7 @@ enum TimelapseType : int {
};
enum SkirtType {
stCommon, stObject
stCombined, stPerObject
};
enum DraftShield {