3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 14:44:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updated "Machine limits"(Kinematics) page according to the new config

Browse source
This commit is contained in:
YuSanka 2018-06-20 16:30:55 +02:00
parent e0bd97ab9c
commit b6ebbdb94a
3 changed files with 68 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1720,27 +1720,71 @@ void TabPrinter::extruders_count_changed(size_t extruders_count){
PageShp TabPrinter::create_kinematics_page()
{
auto page = add_options_page(_(L("Kinematics")), "cog.png", true);
auto page = add_options_page(_(L("Machine limits")), "cog.png", true);
auto optgroup = page->new_optgroup(_(L("Maximum accelerations")));
// optgroup->append_single_option_line("max_acceleration_x");
// optgroup->append_single_option_line("max_acceleration_y");
// optgroup->append_single_option_line("max_acceleration_z");
auto line = Line{ _(L("Standard/Silent mode")), "" };
line.append_option(optgroup->get_option("machine_max_acceleration_x", 0));
line.append_option(optgroup->get_option("machine_max_acceleration_x", 1));
optgroup->append_line(line);
line = Line{ "", "" };
line.append_option(optgroup->get_option("machine_max_acceleration_y", 0));
line.append_option(optgroup->get_option("machine_max_acceleration_y", 1));
optgroup->append_line(line);
line = Line{ _(L("Standard/Silent mode")), "" };
line.append_option(optgroup->get_option("machine_max_acceleration_z", 0));
line.append_option(optgroup->get_option("machine_max_acceleration_z", 1));
optgroup->append_line(line);
line = Line{ _(L("Standard/Silent mode")), "" };
line.append_option(optgroup->get_option("machine_max_acceleration_e", 0));
line.append_option(optgroup->get_option("machine_max_acceleration_e", 1));
optgroup->append_line(line);
// optgroup->append_single_option_line("machine_max_acceleration_x", 0);
// optgroup->append_single_option_line("machine_max_acceleration_y", 0);
// optgroup->append_single_option_line("machine_max_acceleration_z", 0);
// optgroup->append_single_option_line("machine_max_acceleration_e", 0);
optgroup = page->new_optgroup(_(L("Maximum feedrates")));
// optgroup->append_single_option_line("max_feedrate_x");
// optgroup->append_single_option_line("max_feedrate_y");
// optgroup->append_single_option_line("max_feedrate_z");
optgroup->append_single_option_line("machine_max_feedrate_x", 0);
optgroup->append_single_option_line("machine_max_feedrate_y", 0);
optgroup->append_single_option_line("machine_max_feedrate_z", 0);
optgroup->append_single_option_line("machine_max_feedrate_e", 0);
optgroup = page->new_optgroup(_(L("Starting Acceleration")));
// optgroup->append_single_option_line("start_acceleration");
// optgroup->append_single_option_line("start_retract_acceleration");
optgroup->append_single_option_line("machine_max_acceleration_extruding", 0);
optgroup->append_single_option_line("machine_max_acceleration_retracting", 0);
optgroup = page->new_optgroup(_(L("Advanced")));
// optgroup->append_single_option_line("min_feedrate_for_print_moves");
// optgroup->append_single_option_line("min_feedrate_for_travel_moves");
// optgroup->append_single_option_line("max_jerk_x");
// optgroup->append_single_option_line("max_jerk_y");
// optgroup->append_single_option_line("max_jerk_z");
optgroup->append_single_option_line("machine_min_extruding_rate", 0);
optgroup->append_single_option_line("machine_min_travel_rate", 0);
optgroup->append_single_option_line("machine_max_jerk_x", 0);
optgroup->append_single_option_line("machine_max_jerk_y", 0);
optgroup->append_single_option_line("machine_max_jerk_z", 0);
optgroup->append_single_option_line("machine_max_jerk_e", 0);
//for silent mode
// optgroup = page->new_optgroup(_(L("Maximum accelerations")));
// optgroup->append_single_option_line("machine_max_acceleration_x", 1);
// optgroup->append_single_option_line("machine_max_acceleration_y", 1);
// optgroup->append_single_option_line("machine_max_acceleration_z", 1);
// optgroup->append_single_option_line("machine_max_acceleration_e", 1);
optgroup = page->new_optgroup(_(L("Maximum feedrates (Silent mode)")));
optgroup->append_single_option_line("machine_max_feedrate_x", 1);
optgroup->append_single_option_line("machine_max_feedrate_y", 1);
optgroup->append_single_option_line("machine_max_feedrate_z", 1);
optgroup->append_single_option_line("machine_max_feedrate_e", 1);
optgroup = page->new_optgroup(_(L("Starting Acceleration (Silent mode)")));
optgroup->append_single_option_line("machine_max_acceleration_extruding", 1);
optgroup->append_single_option_line("machine_max_acceleration_retracting", 1);
optgroup = page->new_optgroup(_(L("Advanced (Silent mode)")));
optgroup->append_single_option_line("machine_min_extruding_rate", 1);
optgroup->append_single_option_line("machine_min_travel_rate", 1);
optgroup->append_single_option_line("machine_max_jerk_x", 1);
optgroup->append_single_option_line("machine_max_jerk_y", 1);
optgroup->append_single_option_line("machine_max_jerk_z", 1);
optgroup->append_single_option_line("machine_max_jerk_e", 1);
return page;
}
@ -1754,7 +1798,7 @@ void TabPrinter::build_extruder_pages()
// Add/delete Kinematics page according to is_marlin_flavor
size_t existed_page = 0;
for (int i = n_before_extruders; i < m_pages.size(); ++i) // first make sure it's not there already
if (m_pages[i]->title().find(_(L("Kinematics"))) != std::string::npos) {
if (m_pages[i]->title().find(_(L("Machine limits"))) != std::string::npos) {
if (!is_marlin_flavor)
m_pages.erase(m_pages.begin() + i);
else