misc changes

Signed-off-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
SoftFever 2023-01-26 23:11:21 +08:00
parent 031a027717
commit 86f367b1f6
4 changed files with 29 additions and 22 deletions

View file

@ -1453,14 +1453,14 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionFloat(300)); def->set_default_value(new ConfigOptionFloat(300));
def = this->add("accel_to_decel_enable", coBool); 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->tooltip = L("Klipper's max_accel_to_decel will be adjusted automatically");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));
def = this->add("accel_to_decel_factor", coPercent); def = this->add("accel_to_decel_factor", coPercent);
def->label = L("% 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->tooltip = L("Klipper's max_accel_to_decel will be adjusted to this % of acceleration");
def->sidetext = L("%"); def->sidetext = L("%");
def->min = 1; def->min = 1;
def->max = 100; def->max = 100;
@ -2394,8 +2394,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("seam_gap", coFloatOrPercent); def = this->add("seam_gap", coFloatOrPercent);
def->label = L("Seam gap"); 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." 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."
"\nCan be a mm or a % of the current extruder diameter. Default value is 15%"); "\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->sidetext = L("mm or %");
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2403,22 +2403,22 @@ void PrintConfigDef::init_fff_params()
def = this->add("role_based_wipe_speed", coBool); def = this->add("role_based_wipe_speed", coBool);
def->label = L("Role base wipe speed"); def->label = L("Role base wipe speed");
def->tooltip = L("The wipe speed is same as the current extrusion role's speed.\n" def->tooltip = L("The wipe speed is determined by the speed of the current extrusion role.\n"
"e.g. if wipe action is followed by a outer wall extrusion, the outer wall speed will be used for this wipe action."); "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->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true)); def->set_default_value(new ConfigOptionBool(true));
def = this->add("wipe_on_loops", coBool); def = this->add("wipe_on_loops", coBool);
def->label = L("Wipe on loops"); 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->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true)); def->set_default_value(new ConfigOptionBool(true));
def = this->add("wipe_speed", coFloatOrPercent); def = this->add("wipe_speed", coFloatOrPercent);
def->label = L("Wipe speed"); def->label = L("Wipe speed");
def->tooltip = L("This setting will affect the speed of wipe." def->tooltip = L("The wipe speed is determined by the speed setting specified in this configuration."
" If expressed as percentage (for example: 80%) it will be calculated " "\nIf the value is expressed as a percentage (e.g. 80%), it will be calculated based on the travel speed setting above."
"on the travel speed setting above. Default value is 80%"); "\nThe default value for this parameter is 80%");
def->sidetext = L("mm/s or %"); def->sidetext = L("mm/s or %");
def->ratio_over = "travel_speed"; def->ratio_over = "travel_speed";
def->min = 0; def->min = 0;

View file

@ -64,6 +64,7 @@ namespace Slic3r {
} }
gcode << writer.set_pressure_advance(0.0); gcode << writer.set_pressure_advance(0.0);
if (m_draw_numbers) {
// draw indicator lines // draw indicator lines
gcode << writer.set_speed(fast); gcode << writer.set_speed(fast);
gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2)); gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2));
@ -71,7 +72,6 @@ namespace Slic3r {
gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 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); 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) {
for (int i = 0; i < num; i += 2) { 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); 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);
} }

View file

@ -666,8 +666,8 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
// SoftFever // SoftFever
for (auto el : {"accel_to_decel_enable", "accel_to_decel_factor"}) for (auto el : {"accel_to_decel_enable", "accel_to_decel_factor"})
toggle_line(el, gcflavor == gcfKlipper); toggle_line(el, gcflavor == gcfKlipper);
if(gcflavor == gcfKlipper)
toggle_line("accel_to_decel_factor", config->opt_bool("accel_to_decel_enable")); 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*/) void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/)

View file

@ -17,6 +17,7 @@
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "libslic3r/AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include <locale>
namespace Slic3r { namespace GUI { 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) wxString OptionsGroup::get_url(const std::string& 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 //BBS
return wxString::Format(L"https://wiki.bambulab.com/%s/software/bambu-studio/%s", L"en", from_u8(path_end)); 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) bool OptionsGroup::launch_browser(const std::string& path_end)