diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 757320544..2f7afc92f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -895,7 +895,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat{24}); def = this->add("bridge_speed", coFloat); - def->label = L("Bridge"); + def->label = L("Bridge print speed"); def->category = L("Speed"); def->tooltip = L("Speed of bridge and completely overhang wall"); def->sidetext = L("mm/s"); @@ -1024,7 +1024,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionBools { true }); def = this->add("default_acceleration", coFloat); - def->label = L("Normal printing"); + def->label = L("Normal printing acceleration"); def->tooltip = L("The default acceleration of both normal printing and travel except initial layer"); def->sidetext = "mm/s²"; def->min = 0; @@ -1199,7 +1199,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionEnum(ipRectilinear)); def = this->add("outer_wall_line_width", coFloat); - def->label = L("Outer wall"); + def->label = L("Outer wall step"); def->category = L("Quality"); def->tooltip = L("Line width of outer wall"); def->sidetext = L("mm"); @@ -1208,7 +1208,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0)); def = this->add("outer_wall_speed", coFloat); - def->label = L("Outer wall"); + def->label = L("Outer wall print speed"); def->category = L("Speed"); def->tooltip = L("Speed of outer wall which is outermost and visible. " "It's used to be slower than inner wall speed to get better quality."); @@ -1760,7 +1760,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(9)); def = this->add("initial_layer_line_width", coFloat); - def->label = L("Initial layer"); + def->label = L("Initial layer step"); def->category = L("Quality"); def->tooltip = L("Line width of initial layer"); def->sidetext = L("mm"); @@ -1784,6 +1784,14 @@ void PrintConfigDef::init_fff_params() // "Note that this option only takes effect if no prime tower is generated in current plate."); //def->set_default_value(new ConfigOptionBool(0)); + /* def = this->add("default_print_speed", coFloat); + def->label = L("Default print speed"); + def->tooltip = L("Speed of initial layer except the solid infill part"); + def->sidetext = L("mm/s"); + def->min = 0; + def->mode = comAdvanced; + def->set_default_value(new ConfigOptionFloat(30));todo*/ + def = this->add("initial_layer_speed", coFloat); def->label = L("Initial layer"); def->tooltip = L("Speed of initial layer except the solid infill part"); @@ -1864,7 +1872,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0)); def = this->add("gap_infill_speed", coFloat); - def->label = L("Gap infill"); + def->label = L("Gap infill print speed"); def->category = L("Speed"); def->tooltip = L("Speed of gap infill. Gap usually has irregular line width and should be printed more slowly"); def->sidetext = L("mm/s"); @@ -2090,7 +2098,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionInt(1)); def = this->add("sparse_infill_line_width", coFloat); - def->label = L("Sparse infill"); + def->label = L("Sparse infill step"); def->category = L("Quality"); def->tooltip = L("Line width of internal sparse infill"); def->sidetext = L("mm"); @@ -2108,7 +2116,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionPercent(15)); def = this->add("sparse_infill_speed", coFloat); - def->label = L("Sparse infill"); + def->label = L("Sparse infill print speed"); def->category = L("Speed"); def->tooltip = L("Speed of internal sparse infill"); def->sidetext = L("mm/s"); @@ -2589,7 +2597,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionInt(1)); def = this->add("inner_wall_line_width", coFloat); - def->label = L("Inner wall"); + def->label = L("Inner wall step"); def->category = L("Quality"); def->tooltip = L("Line width of inner wall"); def->sidetext = L("mm"); @@ -2598,7 +2606,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0.4)); def = this->add("inner_wall_speed", coFloat); - def->label = L("Inner wall"); + def->label = L("Inner wall print speed"); def->category = L("Speed"); def->tooltip = L("Speed of inner wall"); def->sidetext = L("mm/s"); @@ -3039,7 +3047,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0.4)); def = this->add("internal_solid_infill_speed", coFloat); - def->label = L("Internal solid infill"); + def->label = L("Internal solid infill print speed"); def->category = L("Speed"); def->tooltip = L("Speed of internal solid infill, not the top and bottom surface"); def->sidetext = L("mm/s"); @@ -3296,7 +3304,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionBool(true)); def = this->add("support_line_width", coFloat); - def->label = L("Support"); + def->label = L("Support step"); def->category = L("Quality"); def->tooltip = L("Line width of support"); def->sidetext = L("mm"); @@ -3592,7 +3600,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionString("")); def = this->add("top_surface_line_width", coFloat); - def->label = L("Top surface"); + def->label = L("Top surface step"); def->category = L("Quality"); def->tooltip = L("Line width for top surfaces"); def->sidetext = L("mm"); @@ -3601,7 +3609,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0.4)); def = this->add("top_surface_speed", coFloat); - def->label = L("Top surface"); + def->label = L("Top surface print speed"); def->category = L("Speed"); def->tooltip = L("Speed of top surface infill which is solid"); def->sidetext = L("mm/s"); @@ -3631,7 +3639,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(0.6)); def = this->add("travel_speed", coFloat); - def->label = L("Travel"); + def->label = L("Travel speed"); def->tooltip = L("Speed of travel which is faster and without extrusion"); def->sidetext = L("mm/s"); def->min = 1; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 872cd83be..f97eca106 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1017,6 +1017,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionFloat, initial_layer_acceleration)) ((ConfigOptionFloat, initial_layer_line_width)) ((ConfigOptionFloat, initial_layer_print_height)) + //((ConfigOptionFloat, default_print_speed)) ((ConfigOptionFloat, initial_layer_speed)) //BBS ((ConfigOptionFloat, initial_layer_infill_speed)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index a2487b987..d2421099c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2046,25 +2046,26 @@ void TabPrint::build() optgroup = page->new_optgroup("", L"param_speed",15); //xiamian- //optgroup = page->new_optgroup(L("Initial layer speed"), L"param_speed_first", 15); + //optgroup->append_single_option_line("default_print_speed");todo optgroup->append_single_option_line("initial_layer_speed"); optgroup->append_single_option_line("initial_layer_infill_speed"); //optgroup = page->new_optgroup(L("Other layers speed"), L"param_speed", 15); optgroup->append_single_option_line("outer_wall_speed"); optgroup->append_single_option_line("inner_wall_speed"); - optgroup->append_single_option_line("small_perimeter_speed"); - optgroup->append_single_option_line("small_perimeter_threshold"); + //optgroup->append_single_option_line("small_perimeter_speed"); + //optgroup->append_single_option_line("small_perimeter_threshold"); optgroup->append_single_option_line("sparse_infill_speed"); optgroup->append_single_option_line("internal_solid_infill_speed"); optgroup->append_single_option_line("top_surface_speed"); - optgroup->append_single_option_line("enable_overhang_speed", "slow-down-for-overhang"); - Line line = { L("Overhang speed"), L("This is the speed for various overhang degrees. Overhang degrees are expressed as a percentage of line width. 0 speed means no slowing down for the overhang degree range and wall speed is used") }; - line.label_path = "slow-down-for-overhang"; - line.append_option(optgroup->get_option("overhang_1_4_speed")); - line.append_option(optgroup->get_option("overhang_2_4_speed")); - line.append_option(optgroup->get_option("overhang_3_4_speed")); - line.append_option(optgroup->get_option("overhang_4_4_speed")); - optgroup->append_line(line); - optgroup->append_single_option_line("overhang_totally_speed"); + //optgroup->append_single_option_line("enable_overhang_speed", "slow-down-for-overhang"); + //Line line = { L("Overhang speed"), L("This is the speed for various overhang degrees. Overhang degrees are expressed as a percentage of line width. 0 speed means no slowing down for the overhang degree range and wall speed is used") }; + //line.label_path = "slow-down-for-overhang"; + //line.append_option(optgroup->get_option("overhang_1_4_speed")); + //line.append_option(optgroup->get_option("overhang_2_4_speed")); + //line.append_option(optgroup->get_option("overhang_3_4_speed")); + //line.append_option(optgroup->get_option("overhang_4_4_speed")); + //optgroup->append_line(line); + //optgroup->append_single_option_line("overhang_totally_speed"); optgroup->append_single_option_line("bridge_speed"); optgroup->append_single_option_line("gap_infill_speed"); optgroup->append_single_option_line("support_speed"); @@ -2075,13 +2076,13 @@ void TabPrint::build() //optgroup = page->new_optgroup(L("Acceleration"), L"param_acceleration", 15); optgroup->append_single_option_line("default_acceleration"); - optgroup->append_single_option_line("initial_layer_acceleration"); - optgroup->append_single_option_line("outer_wall_acceleration"); - optgroup->append_single_option_line("inner_wall_acceleration"); - optgroup->append_single_option_line("top_surface_acceleration"); - optgroup->append_single_option_line("sparse_infill_acceleration"); - optgroup->append_single_option_line("accel_to_decel_enable"); - optgroup->append_single_option_line("accel_to_decel_factor"); + //optgroup->append_single_option_line("initial_layer_acceleration"); + //optgroup->append_single_option_line("outer_wall_acceleration"); + //optgroup->append_single_option_line("inner_wall_acceleration"); + //optgroup->append_single_option_line("top_surface_acceleration"); + //optgroup->append_single_option_line("sparse_infill_acceleration"); + //optgroup->append_single_option_line("accel_to_decel_enable"); + //optgroup->append_single_option_line("accel_to_decel_factor"); //optgroup = page->new_optgroup(L("Jerk(XY)"), L"param_acceleration", 15); optgroup->append_single_option_line("default_jerk");