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

Parameters describing cooling tubes position etc moved to separate page in Printer Settings

Browse source
This commit is contained in:
Lukas Matena 2018-03-22 16:13:41 +01:00
parent 985b414c64
commit 3fdd182f0c
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1099,7 +1099,7 @@ void TabPrinter::build()
optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value){ optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value){
size_t extruders_count = boost::any_cast<int>(optgroup->get_value("extruders_count")); size_t extruders_count = boost::any_cast<int>(optgroup->get_value("extruders_count"));
wxTheApp->CallAfter([this, opt_key, value, extruders_count](){ wxTheApp->CallAfter([this, opt_key, value, extruders_count](){
if (opt_key.compare("extruders_count")==0) { if (opt_key.compare("extruders_count")==0 || opt_key.compare("single_extruder_multi_material")==0) {
extruders_count_changed(extruders_count); extruders_count_changed(extruders_count);
update_dirty(); update_dirty();
} }
@ -1110,6 +1110,7 @@ void TabPrinter::build()
}); });
}; };
if (!m_no_controller) if (!m_no_controller)
{ {
optgroup = page->new_optgroup(_(L("USB/Serial connection"))); optgroup = page->new_optgroup(_(L("USB/Serial connection")));
@ -1249,9 +1250,6 @@ void TabPrinter::build()
optgroup->append_single_option_line("use_firmware_retraction"); optgroup->append_single_option_line("use_firmware_retraction");
optgroup->append_single_option_line("use_volumetric_e"); optgroup->append_single_option_line("use_volumetric_e");
optgroup->append_single_option_line("variable_layer_height"); optgroup->append_single_option_line("variable_layer_height");
optgroup->append_single_option_line("cooling_tube_retraction");
optgroup->append_single_option_line("cooling_tube_length");
optgroup->append_single_option_line("parking_pos_retraction");
page = add_options_page(_(L("Custom G-code")), "cog.png"); page = add_options_page(_(L("Custom G-code")), "cog.png");
optgroup = page->new_optgroup(_(L("Start G-code")), 0); optgroup = page->new_optgroup(_(L("Start G-code")), 0);
@ -1374,6 +1372,25 @@ void TabPrinter::build_extruder_pages(){
for (auto page_extruder : m_extruder_pages) for (auto page_extruder : m_extruder_pages)
m_pages.push_back(page_extruder); m_pages.push_back(page_extruder);
m_pages.push_back(page_note); m_pages.push_back(page_note);
{
// if we have a single extruder MM setup, add a page with configuration options:
for (int i=0;i<m_pages.size();++i) // first make sure it's not there already
if (m_pages[i]->title().find(_(L("Single extruder MM setup"))) != std::string::npos) {
m_pages.erase(m_pages.begin()+i);
break;
}
if ( m_extruder_pages.size()>1 && m_config->opt_bool("single_extruder_multi_material")) {
// create a page, but pretend it's an extruder page, so we can add it to m_pages ourselves
auto page = add_options_page(_(L("Single extruder MM setup")), "printer_empty.png",true);
auto optgroup = page->new_optgroup(_(L("Single extruder multimaterial parameters")));
optgroup->append_single_option_line("cooling_tube_retraction");
optgroup->append_single_option_line("cooling_tube_length");
optgroup->append_single_option_line("parking_pos_retraction");
m_pages.insert(m_pages.begin()+1,page);
}
}
rebuild_page_tree(); rebuild_page_tree();
} }