diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 616f14f3c5..8acc61e1c5 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1453,14 +1453,14 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(300)); def = this->add("accel_to_decel_enable", coBool); - def->label = L("Adjust accel to decel"); + def->label = L("Enable accel_to_decel"); def->tooltip = L("Klipper's max_accel_to_decel will be adjusted automatically"); def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(false)); def = this->add("accel_to_decel_factor", coPercent); - def->label = L("% of acceleration"); - def->tooltip = L("Klipper's Max_accel_to_decel will be adjusted to this % of acceleration"); + def->label = L("accel_to_decel"); + def->tooltip = L("Klipper's max_accel_to_decel will be adjusted to this % of acceleration"); def->sidetext = L("%"); def->min = 1; def->max = 100; @@ -2394,8 +2394,8 @@ void PrintConfigDef::init_fff_params() def = this->add("seam_gap", coFloatOrPercent); def->label = L("Seam gap"); - def->tooltip = L("When extruding a closed loop, the loop is interrupted and shortened a bit to reduce the seam." - "\nCan be a mm or a % of the current extruder diameter. Default value is 15%"); + def->tooltip = L("In order to reduce the visibility of the seam in a closed loop extrusion, the loop is interrupted and shortened by a specified amount." + "\nhis amount can be specified in millimeters or as a percentage of the current extruder diameter. The default value for this parameter is 15%."); def->sidetext = L("mm or %"); def->min = 0; def->mode = comAdvanced; @@ -2403,22 +2403,22 @@ void PrintConfigDef::init_fff_params() def = this->add("role_based_wipe_speed", coBool); def->label = L("Role base wipe speed"); - def->tooltip = L("The wipe speed is same as the current extrusion role's speed.\n" - "e.g. if wipe action is followed by a outer wall extrusion, the outer wall speed will be used for this wipe action."); + def->tooltip = L("The wipe speed is determined by the speed of the current extrusion role.\n" + "e.g. if a wipe action is executed immediately following an outer wall extrusion, the speed of the outer wall extrusion will be utilized for the wipe action."); def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(true)); def = this->add("wipe_on_loops", coBool); def->label = L("Wipe on loops"); - def->tooltip = L("Make a little move inwards before leaving loop"); + def->tooltip = L("To minimize the visibility of the seam in a closed loop extrusion, a small inward movement is executed before the extruder leaves the loop."); def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(true)); def = this->add("wipe_speed", coFloatOrPercent); def->label = L("Wipe speed"); - def->tooltip = L("This setting will affect the speed of wipe." - " If expressed as percentage (for example: 80%) it will be calculated " - "on the travel speed setting above. Default value is 80%"); + def->tooltip = L("The wipe speed is determined by the speed setting specified in this configuration." + "\nIf the value is expressed as a percentage (e.g. 80%), it will be calculated based on the travel speed setting above." + "\nThe default value for this parameter is 80%"); def->sidetext = L("mm/s or %"); def->ratio_over = "travel_speed"; def->min = 0; diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 7cf2a17c77..93ffbfa8cf 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -64,14 +64,14 @@ namespace Slic3r { } gcode << writer.set_pressure_advance(0.0); - // draw indicator lines - gcode << writer.set_speed(fast); - gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2)); - gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 7), e * 7); - gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 7)); - gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7); - if (m_draw_numbers) { + // draw indicator lines + gcode << writer.set_speed(fast); + gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2)); + gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 7), e * 7); + gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 7)); + gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7); + for (int i = 0; i < num; i += 2) { gcode << draw_number(start_x + m_length_short + m_length_long + m_length_short + 3, y_pos + i * m_space_y + m_space_y / 2, start_pa + i * step_pa); } diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index c3db45b061..8e670f3e61 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -666,8 +666,8 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co // SoftFever for (auto el : {"accel_to_decel_enable", "accel_to_decel_factor"}) toggle_line(el, gcflavor == gcfKlipper); - - toggle_line("accel_to_decel_factor", config->opt_bool("accel_to_decel_enable")); + if(gcflavor == gcfKlipper) + toggle_field("accel_to_decel_factor", config->opt_bool("accel_to_decel_enable")); } void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/) diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 8aca0a60fe..f1a771716b 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -17,6 +17,7 @@ #include "libslic3r/Utils.hpp" #include "libslic3r/AppConfig.hpp" #include "I18N.hpp" +#include namespace Slic3r { namespace GUI { @@ -1232,8 +1233,14 @@ void ExtruderOptionsGroup::on_change_OG(const t_config_option_key& opt_id, const wxString OptionsGroup::get_url(const std::string& path_end) { - //BBS - return wxString::Format(L"https://wiki.bambulab.com/%s/software/bambu-studio/%s", L"en", from_u8(path_end)); + // Softfever: point to sf wiki for seam parameters + if (path_end == "Seam") { + return wxString::Format(L"https://github.com/SoftFever/BambuStudio-SoftFever/wiki/%s", from_u8(path_end)); + } + else { + //BBS + return wxString::Format(L"https://wiki.bambulab.com/%s/software/bambu-studio/%s", L"en", from_u8(path_end)); + } } bool OptionsGroup::launch_browser(const std::string& path_end)