diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index cc644fc74..7d1af094d 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2731,14 +2731,14 @@ void PrintConfigDef::init_sla_params() def->min = 0; def->default_value = new ConfigOptionFloat(1.0); - def = this->add("pad_wall_tilt", coFloat); - def->label = L("Pad wall tilt"); + def = this->add("pad_wall_slope", coFloat); + def->label = L("Pad wall slope"); def->category = L("Pad"); - def->tooltip = L("The tilt of the pad wall relative to the bed plane. " + def->tooltip = L("The slope of the pad wall relative to the bed plane. " "90 degrees means straight walls."); def->sidetext = L("degrees"); def->cli = ""; - def->min = 0.1; // What should be the minimum? + def->min = 45; def->max = 90; def->default_value = new ConfigOptionFloat(45.0); } diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 21bc32ed9..9b6f72391 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1028,8 +1028,8 @@ public: // The smoothing radius of the pad edges ConfigOptionFloat pad_edge_radius /*= 1*/; - // The tilt of the pad wall... - ConfigOptionFloat pad_wall_tilt; + // The slope of the pad wall... + ConfigOptionFloat pad_wall_slope; protected: void initialize(StaticCacheBase &cache, const char *base_ptr) @@ -1056,7 +1056,7 @@ protected: OPT_PTR(pad_wall_height); OPT_PTR(pad_max_merge_distance); OPT_PTR(pad_edge_radius); - OPT_PTR(pad_wall_tilt); + OPT_PTR(pad_wall_slope); } }; diff --git a/src/libslic3r/SLA/SLABasePool.cpp b/src/libslic3r/SLA/SLABasePool.cpp index 42b22acb9..62d8f0f30 100644 --- a/src/libslic3r/SLA/SLABasePool.cpp +++ b/src/libslic3r/SLA/SLABasePool.cpp @@ -601,8 +601,8 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out, const double thickness = cfg.min_wall_thickness_mm; const double wingheight = cfg.min_wall_height_mm; const double fullheight = wingheight + thickness; - const double tilt = cfg.wall_tilt; - const double wingdist = wingheight / std::tan(tilt); + const double slope = cfg.wall_slope; + const double wingdist = wingheight / std::tan(slope); // scaled values const coord_t s_thickness = mm(thickness); diff --git a/src/libslic3r/SLA/SLABasePool.hpp b/src/libslic3r/SLA/SLABasePool.hpp index 69b4561b1..3c88e58c8 100644 --- a/src/libslic3r/SLA/SLABasePool.hpp +++ b/src/libslic3r/SLA/SLABasePool.hpp @@ -28,17 +28,17 @@ struct PoolConfig { double min_wall_height_mm = 5; double max_merge_distance_mm = 50; double edge_radius_mm = 1; - double wall_tilt = std::atan(1.0); // Universal constant for Pi/4 + double wall_slope = std::atan(1.0); // Universal constant for Pi/4 ThrowOnCancel throw_on_cancel = [](){}; inline PoolConfig() {} - inline PoolConfig(double wt, double wh, double md, double er, double tilt): + inline PoolConfig(double wt, double wh, double md, double er, double slope): min_wall_thickness_mm(wt), min_wall_height_mm(wh), max_merge_distance_mm(md), edge_radius_mm(er), - wall_tilt(tilt) {} + wall_slope(slope) {} }; /// Calculate the pool for the mesh for SLA printing diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index bad64b8fc..827846b71 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -753,7 +753,7 @@ void SLAPrint::process() double md = po.m_config.pad_max_merge_distance.getFloat(); // Radius is disabled for now... double er = 0; // po.m_config.pad_edge_radius.getFloat(); - double tilt = po.m_config.pad_wall_tilt.getFloat() * PI / 180.0; + double tilt = po.m_config.pad_wall_slope.getFloat() * PI / 180.0; double lh = po.m_config.layer_height.getFloat(); double elevation = po.m_config.support_object_elevation.getFloat(); if(!po.m_config.supports_enable.getBool()) elevation = 0; @@ -1369,7 +1369,7 @@ bool SLAPrintObject::invalidate_state_by_config_options(const std::vector& Preset::sla_print_options() "pad_wall_height", "pad_max_merge_distance", "pad_edge_radius", - "pad_wall_tilt", + "pad_wall_slope", "output_filename_format", "default_sla_print_profile", "compatible_printers", diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 783527026..b52ddbf48 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3290,7 +3290,7 @@ void TabSLAPrint::build() optgroup->append_single_option_line("pad_max_merge_distance"); // TODO: Disabling this parameter for the beta release // optgroup->append_single_option_line("pad_edge_radius"); - optgroup->append_single_option_line("pad_wall_tilt"); + optgroup->append_single_option_line("pad_wall_slope"); page = add_options_page(_(L("Output options")), "page_white_go.png"); optgroup = page->new_optgroup(_(L("Output file")));