3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GUI - reenabling rotation angle settings for the wipe tower (was disabled by the merge with master)

Browse source
This commit is contained in:
Lukas Matena 2018-02-27 08:56:11 +01:00
parent 5f5a59328b
commit 3099c32d08
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/PrintConfig.cpp
View file

@ -1732,9 +1732,9 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(15.); def->default_value = new ConfigOptionFloat(15.);
def = this->add("wipe_tower_rotation_angle", coFloat); def = this->add("wipe_tower_rotation_angle", coFloat);
def->label = "Wipe tower rotation angle"; def->label = _L("Wipe tower rotation angle");
def->tooltip = "Wipe tower rotation angle with respect to x-axis "; def->tooltip = _L("Wipe tower rotation angle with respect to x-axis ");
def->sidetext = "degrees"; def->sidetext = _L("degrees");
def->cli = "wipe-tower-rotation-angle=f"; def->cli = "wipe-tower-rotation-angle=f";
def->default_value = new ConfigOptionFloat(0.); def->default_value = new ConfigOptionFloat(0.);

3
xs/src/slic3r/GUI/Tab.cpp
View file

@ -446,6 +446,7 @@ void TabPrint::build()
optgroup->append_single_option_line("wipe_tower_y"); optgroup->append_single_option_line("wipe_tower_y");
optgroup->append_single_option_line("wipe_tower_width"); optgroup->append_single_option_line("wipe_tower_width");
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 = page->new_optgroup(_L("Advanced")); optgroup = page->new_optgroup(_L("Advanced"));
optgroup->append_single_option_line("interface_shells"); optgroup->append_single_option_line("interface_shells");
@ -762,7 +763,7 @@ void TabPrint::update()
bool have_wipe_tower = m_config->opt_bool("wipe_tower"); bool have_wipe_tower = m_config->opt_bool("wipe_tower");
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe"}; vec_enable = { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe", "wipe_tower_rotation_angle"};
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_wipe_tower); get_field(el)->toggle(have_wipe_tower);