mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-01 06:22:03 +08:00
Removed unused parameter 'arc_fitting_tolerance' from the configuration layer,
added static_assert for coord_t size
This commit is contained in:
parent
623e9d5cb4
commit
e6c4522143
@ -375,6 +375,7 @@ double arc_fit_max_deviation(const Point &start_point, const Point &end_point, c
|
|||||||
const Points::const_iterator begin, const Points::const_iterator end);
|
const Points::const_iterator begin, const Points::const_iterator end);
|
||||||
|
|
||||||
// 1.2m diameter, maximum given by coord_t
|
// 1.2m diameter, maximum given by coord_t
|
||||||
|
static_assert(sizeof(coord_t) == 4);
|
||||||
static constexpr const double default_scaled_max_radius = scaled<double>(600.);
|
static constexpr const double default_scaled_max_radius = scaled<double>(600.);
|
||||||
// 0.05mm
|
// 0.05mm
|
||||||
static constexpr const double default_scaled_resolution = scaled<double>(0.05);
|
static constexpr const double default_scaled_resolution = scaled<double>(0.05);
|
||||||
|
@ -465,7 +465,7 @@ static std::vector<std::string> s_Preset_print_options {
|
|||||||
"ooze_prevention", "standby_temperature_delta", "interface_shells", "extrusion_width", "first_layer_extrusion_width",
|
"ooze_prevention", "standby_temperature_delta", "interface_shells", "extrusion_width", "first_layer_extrusion_width",
|
||||||
"perimeter_extrusion_width", "external_perimeter_extrusion_width", "infill_extrusion_width", "solid_infill_extrusion_width",
|
"perimeter_extrusion_width", "external_perimeter_extrusion_width", "infill_extrusion_width", "solid_infill_extrusion_width",
|
||||||
"top_infill_extrusion_width", "support_material_extrusion_width", "infill_overlap", "infill_anchor", "infill_anchor_max", "bridge_flow_ratio",
|
"top_infill_extrusion_width", "support_material_extrusion_width", "infill_overlap", "infill_anchor", "infill_anchor_max", "bridge_flow_ratio",
|
||||||
"elefant_foot_compensation", "xy_size_compensation", "resolution", "gcode_resolution", "arc_fitting", "arc_fitting_tolerance",
|
"elefant_foot_compensation", "xy_size_compensation", "resolution", "gcode_resolution", "arc_fitting",
|
||||||
"wipe_tower", "wipe_tower_x", "wipe_tower_y",
|
"wipe_tower", "wipe_tower_x", "wipe_tower_y",
|
||||||
"wipe_tower_width", "wipe_tower_cone_angle", "wipe_tower_rotation_angle", "wipe_tower_brim_width", "wipe_tower_bridging", "single_extruder_multi_material_priming", "mmu_segmented_region_max_width",
|
"wipe_tower_width", "wipe_tower_cone_angle", "wipe_tower_rotation_angle", "wipe_tower_brim_width", "wipe_tower_bridging", "single_extruder_multi_material_priming", "mmu_segmented_region_max_width",
|
||||||
"mmu_segmented_region_interlocking_depth", "wipe_tower_extruder", "wipe_tower_no_sparse_layers", "wipe_tower_extra_spacing", "compatible_printers", "compatible_printers_condition", "inherits",
|
"mmu_segmented_region_interlocking_depth", "wipe_tower_extruder", "wipe_tower_no_sparse_layers", "wipe_tower_extra_spacing", "compatible_printers", "compatible_printers_condition", "inherits",
|
||||||
|
@ -447,15 +447,6 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionEnum<ArcFittingType>(ArcFittingType::Disabled));
|
def->set_default_value(new ConfigOptionEnum<ArcFittingType>(ArcFittingType::Disabled));
|
||||||
|
|
||||||
def = this->add("arc_fitting_tolerance", coFloatOrPercent);
|
|
||||||
def->label = L("Arc fitting tolerance");
|
|
||||||
def->sidetext = L("mm or %");
|
|
||||||
def->tooltip = L("When using the arc_fitting option, allow the curve to deviate certain % from the collection of straight paths.\n"
|
|
||||||
"Can be either a mm value or a percentage of the current extrusion width.");
|
|
||||||
def->mode = comAdvanced;
|
|
||||||
def->min = 0;
|
|
||||||
def->set_default_value(new ConfigOptionFloatOrPercent(5, true));
|
|
||||||
|
|
||||||
// Maximum extruder temperature, bumped to 1500 to support printing of glass.
|
// Maximum extruder temperature, bumped to 1500 to support printing of glass.
|
||||||
const int max_temp = 1500;
|
const int max_temp = 1500;
|
||||||
def = this->add("avoid_crossing_curled_overhangs", coBool);
|
def = this->add("avoid_crossing_curled_overhangs", coBool);
|
||||||
|
@ -701,7 +701,6 @@ PRINT_CONFIG_CLASS_DEFINE(
|
|||||||
GCodeConfig,
|
GCodeConfig,
|
||||||
|
|
||||||
((ConfigOptionEnum<ArcFittingType>, arc_fitting))
|
((ConfigOptionEnum<ArcFittingType>, arc_fitting))
|
||||||
((ConfigOptionFloatOrPercent, arc_fitting_tolerance))
|
|
||||||
((ConfigOptionBool, autoemit_temperature_commands))
|
((ConfigOptionBool, autoemit_temperature_commands))
|
||||||
((ConfigOptionString, before_layer_gcode))
|
((ConfigOptionString, before_layer_gcode))
|
||||||
((ConfigOptionString, between_objects_gcode))
|
((ConfigOptionString, between_objects_gcode))
|
||||||
|
@ -715,8 +715,7 @@ bool PrintObject::invalidate_state_by_config_options(
|
|||||||
|| opt_key == "perimeter_extrusion_width"
|
|| opt_key == "perimeter_extrusion_width"
|
||||||
|| opt_key == "infill_overlap"
|
|| opt_key == "infill_overlap"
|
||||||
|| opt_key == "external_perimeters_first"
|
|| opt_key == "external_perimeters_first"
|
||||||
|| opt_key == "arc_fitting"
|
|| opt_key == "arc_fitting") {
|
||||||
|| opt_key == "arc_fitting_tolerance") {
|
|
||||||
steps.emplace_back(posPerimeters);
|
steps.emplace_back(posPerimeters);
|
||||||
} else if (
|
} else if (
|
||||||
opt_key == "gap_fill_enabled"
|
opt_key == "gap_fill_enabled"
|
||||||
|
@ -345,9 +345,6 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig* config)
|
|||||||
toggle_field("min_feature_size", have_arachne);
|
toggle_field("min_feature_size", have_arachne);
|
||||||
toggle_field("min_bead_width", have_arachne);
|
toggle_field("min_bead_width", have_arachne);
|
||||||
toggle_field("thin_walls", !have_arachne);
|
toggle_field("thin_walls", !have_arachne);
|
||||||
|
|
||||||
bool has_arc_fitting = config->opt_enum<ArcFittingType>("arc_fitting") != ArcFittingType::Disabled;
|
|
||||||
toggle_field("arc_fitting_tolerance", has_arc_fitting);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/)
|
void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/)
|
||||||
|
@ -1677,7 +1677,6 @@ void TabPrint::build()
|
|||||||
optgroup->append_single_option_line("resolution");
|
optgroup->append_single_option_line("resolution");
|
||||||
optgroup->append_single_option_line("gcode_resolution");
|
optgroup->append_single_option_line("gcode_resolution");
|
||||||
optgroup->append_single_option_line("arc_fitting");
|
optgroup->append_single_option_line("arc_fitting");
|
||||||
optgroup->append_single_option_line("arc_fitting_tolerance");
|
|
||||||
optgroup->append_single_option_line("xy_size_compensation");
|
optgroup->append_single_option_line("xy_size_compensation");
|
||||||
optgroup->append_single_option_line("elefant_foot_compensation", "elephant-foot-compensation_114487");
|
optgroup->append_single_option_line("elefant_foot_compensation", "elephant-foot-compensation_114487");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user