mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-14 02:07:54 -06:00
Removed parameter 'wipe_tower_adhesion', it will always be true
This commit is contained in:
parent
349a8a88ae
commit
76b280c64c
6 changed files with 3 additions and 15 deletions
|
@ -110,7 +110,7 @@ public:
|
||||||
// width -- width of wipe tower in mm ( default 60 mm - leave as it is )
|
// width -- width of wipe tower in mm ( default 60 mm - leave as it is )
|
||||||
// wipe_area -- space available for one toolchange in mm
|
// wipe_area -- space available for one toolchange in mm
|
||||||
WipeTowerPrusaMM(float x, float y, float width, float wipe_area, float rotation_angle, float cooling_tube_retraction,
|
WipeTowerPrusaMM(float x, float y, float width, float wipe_area, float rotation_angle, float cooling_tube_retraction,
|
||||||
float cooling_tube_length, float parking_pos_retraction, float bridging, bool adhesion, const std::string& parameters,
|
float cooling_tube_length, float parking_pos_retraction, float bridging, const std::string& parameters,
|
||||||
unsigned int initial_tool) :
|
unsigned int initial_tool) :
|
||||||
m_wipe_tower_pos(x, y),
|
m_wipe_tower_pos(x, y),
|
||||||
m_wipe_tower_width(width),
|
m_wipe_tower_width(width),
|
||||||
|
@ -126,7 +126,6 @@ public:
|
||||||
m_par(parameters)
|
m_par(parameters)
|
||||||
{
|
{
|
||||||
m_bridging = bridging;
|
m_bridging = bridging;
|
||||||
m_adhesion = adhesion;
|
|
||||||
|
|
||||||
for (size_t i = 0; i < 4; ++ i) {
|
for (size_t i = 0; i < 4; ++ i) {
|
||||||
// Extruder specific parameters.
|
// Extruder specific parameters.
|
||||||
|
|
|
@ -202,7 +202,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
|
||||||
|| opt_key == "wipe_tower_per_color_wipe"
|
|| opt_key == "wipe_tower_per_color_wipe"
|
||||||
|| opt_key == "wipe_tower_rotation_angle"
|
|| opt_key == "wipe_tower_rotation_angle"
|
||||||
|| opt_key == "wipe_tower_bridging"
|
|| opt_key == "wipe_tower_bridging"
|
||||||
|| opt_key == "wipe_tower_adhesion"
|
|
||||||
|| opt_key == "z_offset") {
|
|| opt_key == "z_offset") {
|
||||||
steps.emplace_back(psWipeTower);
|
steps.emplace_back(psWipeTower);
|
||||||
} else if (
|
} else if (
|
||||||
|
@ -1043,7 +1042,7 @@ void Print::_make_wipe_tower()
|
||||||
float(this->config.wipe_tower_width.value), float(this->config.wipe_tower_per_color_wipe.value),
|
float(this->config.wipe_tower_width.value), float(this->config.wipe_tower_per_color_wipe.value),
|
||||||
float(this->config.wipe_tower_rotation_angle.value), float(this->config.cooling_tube_retraction.value),
|
float(this->config.wipe_tower_rotation_angle.value), float(this->config.cooling_tube_retraction.value),
|
||||||
float(this->config.cooling_tube_length.value), float(this->config.parking_pos_retraction.value),
|
float(this->config.cooling_tube_length.value), float(this->config.parking_pos_retraction.value),
|
||||||
float(this->config.wipe_tower_bridging), bool(this->config.wipe_tower_adhesion),
|
float(this->config.wipe_tower_bridging),
|
||||||
/*this->config.wipe_tower_advanced.value*/std::string(""),m_tool_ordering.first_extruder());
|
/*this->config.wipe_tower_advanced.value*/std::string(""),m_tool_ordering.first_extruder());
|
||||||
|
|
||||||
//wipe_tower.set_retract();
|
//wipe_tower.set_retract();
|
||||||
|
|
|
@ -1841,13 +1841,6 @@ PrintConfigDef::PrintConfigDef()
|
||||||
def->cli = "wipe-tower-bridging=f";
|
def->cli = "wipe-tower-bridging=f";
|
||||||
def->default_value = new ConfigOptionFloat(10.);
|
def->default_value = new ConfigOptionFloat(10.);
|
||||||
|
|
||||||
def = this->add("wipe_tower_adhesion", coBool);
|
|
||||||
def->label = L("Increase first layer adhesion");
|
|
||||||
def->tooltip = L("This prevents using sparse infill on the first layer, if it would be "
|
|
||||||
"normally applied. Dense infill is used instead. ");
|
|
||||||
def->cli = "wipe-tower_adhesion!";
|
|
||||||
def->default_value = new ConfigOptionBool(true);
|
|
||||||
|
|
||||||
def = this->add("xy_size_compensation", coFloat);
|
def = this->add("xy_size_compensation", coFloat);
|
||||||
def->label = L("XY Size Compensation");
|
def->label = L("XY Size Compensation");
|
||||||
def->category = L("Advanced");
|
def->category = L("Advanced");
|
||||||
|
|
|
@ -629,7 +629,6 @@ public:
|
||||||
ConfigOptionFloat wipe_tower_per_color_wipe;
|
ConfigOptionFloat wipe_tower_per_color_wipe;
|
||||||
ConfigOptionFloat wipe_tower_rotation_angle;
|
ConfigOptionFloat wipe_tower_rotation_angle;
|
||||||
ConfigOptionFloat wipe_tower_bridging;
|
ConfigOptionFloat wipe_tower_bridging;
|
||||||
ConfigOptionBool wipe_tower_adhesion;
|
|
||||||
ConfigOptionFloats wiping_volumes_matrix;
|
ConfigOptionFloats wiping_volumes_matrix;
|
||||||
ConfigOptionFloats wiping_volumes_extruders;
|
ConfigOptionFloats wiping_volumes_extruders;
|
||||||
ConfigOptionFloat z_offset;
|
ConfigOptionFloat z_offset;
|
||||||
|
@ -699,7 +698,6 @@ protected:
|
||||||
OPT_PTR(wipe_tower_per_color_wipe);
|
OPT_PTR(wipe_tower_per_color_wipe);
|
||||||
OPT_PTR(wipe_tower_rotation_angle);
|
OPT_PTR(wipe_tower_rotation_angle);
|
||||||
OPT_PTR(wipe_tower_bridging);
|
OPT_PTR(wipe_tower_bridging);
|
||||||
OPT_PTR(wipe_tower_adhesion);
|
|
||||||
OPT_PTR(wiping_volumes_matrix);
|
OPT_PTR(wiping_volumes_matrix);
|
||||||
OPT_PTR(wiping_volumes_extruders);
|
OPT_PTR(wiping_volumes_extruders);
|
||||||
OPT_PTR(z_offset);
|
OPT_PTR(z_offset);
|
||||||
|
|
|
@ -199,7 +199,7 @@ const std::vector<std::string>& Preset::print_options()
|
||||||
"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", "bridge_flow_ratio", "clip_multipart_objects",
|
"top_infill_extrusion_width", "support_material_extrusion_width", "infill_overlap", "bridge_flow_ratio", "clip_multipart_objects",
|
||||||
"elefant_foot_compensation", "xy_size_compensation", "threads", "resolution", "wipe_tower", "wipe_tower_x",
|
"elefant_foot_compensation", "xy_size_compensation", "threads", "resolution", "wipe_tower", "wipe_tower_x",
|
||||||
"wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe", "wipe_tower_rotation_angle", "wipe_tower_adhesion", "wipe_tower_bridging",
|
"wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe", "wipe_tower_rotation_angle", "wipe_tower_bridging",
|
||||||
"wiping_volumes_matrix", "wiping_volumes_extruders", "compatible_printers", "compatible_printers_condition"
|
"wiping_volumes_matrix", "wiping_volumes_extruders", "compatible_printers", "compatible_printers_condition"
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -520,7 +520,6 @@ void TabPrint::build()
|
||||||
optgroup->append_single_option_line("wipe_tower_per_color_wipe");
|
optgroup->append_single_option_line("wipe_tower_per_color_wipe");
|
||||||
optgroup->append_single_option_line("wipe_tower_rotation_angle");
|
optgroup->append_single_option_line("wipe_tower_rotation_angle");
|
||||||
optgroup->append_single_option_line("wipe_tower_bridging");
|
optgroup->append_single_option_line("wipe_tower_bridging");
|
||||||
optgroup->append_single_option_line("wipe_tower_adhesion");
|
|
||||||
line = { _(L("Advanced")), "" };
|
line = { _(L("Advanced")), "" };
|
||||||
line.widget = [this](wxWindow* parent){
|
line.widget = [this](wxWindow* parent){
|
||||||
m_wipe_tower_btn = new wxButton(parent, wxID_ANY, _(L("Advanced settings"))+"\u2026", wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
|
m_wipe_tower_btn = new wxButton(parent, wxID_ANY, _(L("Advanced settings"))+"\u2026", wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue