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

Removed the unsupported "pillars" support pattern.

Browse Source
This commit is contained in:
bubnikv 2018-03-14 20:08:34 +01:00
parent 4351187ce5
commit 61ae78432c
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/libslic3r/PrintConfig.cpp
View File

@ -1527,12 +1527,10 @@ PrintConfigDef::PrintConfigDef()
def->enum_values.push_back("rectilinear"); def->enum_values.push_back("rectilinear");
def->enum_values.push_back("rectilinear-grid"); def->enum_values.push_back("rectilinear-grid");
def->enum_values.push_back("honeycomb"); def->enum_values.push_back("honeycomb");
def->enum_values.push_back("pillars");
def->enum_labels.push_back("rectilinear"); def->enum_labels.push_back("rectilinear");
def->enum_labels.push_back("rectilinear grid"); def->enum_labels.push_back("rectilinear grid");
def->enum_labels.push_back("honeycomb"); def->enum_labels.push_back("honeycomb");
def->enum_labels.push_back("pillars"); def->default_value = new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear);
def->default_value = new ConfigOptionEnum<SupportMaterialPattern>(smpPillars);
def = this->add("support_material_spacing", coFloat); def = this->add("support_material_spacing", coFloat);
def->label = L("Pattern spacing"); def->label = L("Pattern spacing");
@ -1804,6 +1802,9 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
values is a dirty hack and will need to be removed sometime in the future, but it values is a dirty hack and will need to be removed sometime in the future, but it
will avoid lots of complaints for now. */ will avoid lots of complaints for now. */
value = "0"; value = "0";
} else if (opt_key == "support_material_pattern" && value == "pillars") {
// Slic3r PE does not support the pillars. They never worked well.
value = "rectilinear";
} else if (opt_key == "support_material_threshold" && value == "0") { } else if (opt_key == "support_material_threshold" && value == "0") {
// 0 used to be automatic threshold, but we introduced percent values so let's // 0 used to be automatic threshold, but we introduced percent values so let's
// transform it into the default value // transform it into the default value

3
xs/src/libslic3r/PrintConfig.hpp
View File

@ -33,7 +33,7 @@ enum InfillPattern {
}; };
enum SupportMaterialPattern { enum SupportMaterialPattern {
smpRectilinear, smpRectilinearGrid, smpHoneycomb, smpPillars, smpRectilinear, smpRectilinearGrid, smpHoneycomb,
}; };
enum SeamPosition { enum SeamPosition {
@ -87,7 +87,6 @@ template<> inline t_config_enum_values& ConfigOptionEnum<SupportMaterialPattern>
keys_map["rectilinear"] = smpRectilinear; keys_map["rectilinear"] = smpRectilinear;
keys_map["rectilinear-grid"] = smpRectilinearGrid; keys_map["rectilinear-grid"] = smpRectilinearGrid;
keys_map["honeycomb"] = smpHoneycomb; keys_map["honeycomb"] = smpHoneycomb;
keys_map["pillars"] = smpPillars;
} }
return keys_map; return keys_map;
} }

1
xs/src/libslic3r/SupportMaterial.cpp
View File

@ -2491,7 +2491,6 @@ void PrintObjectSupportMaterial::generate_toolpaths(
infill_pattern = ipRectilinear; infill_pattern = ipRectilinear;
break; break;
case smpHoneycomb: case smpHoneycomb:
case smpPillars:
infill_pattern = ipHoneycomb; infill_pattern = ipHoneycomb;
break; break;
} }

4
xs/t/15_config.t
View File

@ -99,8 +99,8 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
$config->set_deserialize('fill_pattern', 'line'); $config->set_deserialize('fill_pattern', 'line');
is $config->get('fill_pattern'), 'line', 'deserialize enum (fill_pattern)'; is $config->get('fill_pattern'), 'line', 'deserialize enum (fill_pattern)';
$config->set_deserialize('support_material_pattern', 'pillars'); $config->set_deserialize('support_material_pattern', 'rectilinear');
is $config->get('support_material_pattern'), 'pillars', 'deserialize enum (support_material_pattern)'; is $config->get('support_material_pattern'), 'rectilinear', 'deserialize enum (support_material_pattern)';
$config->set('extruder_offset', [[10,20],[30,45]]); $config->set('extruder_offset', [[10,20],[30,45]]);
is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points'; is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points';