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

semm

Browse source
This commit is contained in:
SoftFever 2023-09-09 09:13:30 +08:00
parent ee4705d6b7
commit e624632969
142 changed files with 741 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

209
src/slic3r/GUI/Tab.cpp
View file

@ -1591,15 +1591,15 @@ void Tab::activate_option(const std::string& opt_key, const wxString& category)
wxPostEvent(m_page_view, evt);
}
}
//else if (category == "Single extruder MM setup") {
// // When we show and hide "Single extruder MM setup" page,
// // related options are still in the search list
// // So, let's hightlighte a "single_extruder_multi_material" option,
// // as a "way" to show hidden page again
// field = get_field("single_extruder_multi_material");
// if (field)
// set_focus(field->getWindow());
//}
else if (category == "Single extruder MM setup") {
// When we show and hide "Single extruder MM setup" page,
// related options are still in the search list
// So, let's hightlighte a "single_extruder_multi_material" option,
// as a "way" to show hidden page again
field = get_field("single_extruder_multi_material");
if (field)
set_focus(field->getWindow());
}
m_highlighter.init(get_custom_ctrl_with_blinking_ptr(opt_key));
}
@ -2078,7 +2078,7 @@ void TabPrint::build()
optgroup->append_single_option_line("wipe_tower_cone_angle");
optgroup->append_single_option_line("wipe_tower_extra_spacing");
optgroup->append_single_option_line("wipe_tower_no_sparse_layers");
optgroup->append_single_option_line("single_extruder_multi_material_priming");
// optgroup->append_single_option_line("single_extruder_multi_material_priming");
optgroup = page->new_optgroup(L("Flush options"), L"param_flush");
@ -2822,12 +2822,6 @@ void TabFilament::build()
//BBS
add_filament_overrides_page();
#if 0
//page = add_options_page(L("Advanced"), "advanced");
// optgroup = page->new_optgroup(L("Wipe tower parameters"));
// optgroup->append_single_option_line("filament_minimal_purge_on_wipe_tower");
#endif
const int gcode_field_height = 15; // 150
const int notes_field_height = 25; // 250
@ -2852,8 +2846,8 @@ void TabFilament::build()
option.opt.height = gcode_field_height;// 150;
optgroup->append_single_option_line(option);
page = add_options_page(L("MMU"), "advanced");
optgroup = page->new_optgroup(L("Wipe tower parameters"));
page = add_options_page(L("Multimaterial"), "advanced");
optgroup = page->new_optgroup(L("Wipe tower parameters"));
optgroup->append_single_option_line("filament_minimal_purge_on_wipe_tower");
optgroup = page->new_optgroup(L("Toolchange parameters with single extruder MM printers"));
@ -2886,13 +2880,15 @@ void TabFilament::build()
return sizer;
});
// Orca: multi tool is not supported yet.
#ifdef ORCA_MULTI_TOOL
optgroup = page->new_optgroup(L("Toolchange parameters with multi extruder MM printers"));
optgroup->append_single_option_line("filament_multitool_ramming");
optgroup->append_single_option_line("filament_multitool_ramming_volume");
optgroup->append_single_option_line("filament_multitool_ramming_flow");
#endif
page = add_options_page(L("Notes"), "note");
page = add_options_page(L("Notes"), "note");
optgroup = page->new_optgroup(L("Notes"),"note", 0);
optgroup->label_width = 0;
option = optgroup->get_option("filament_notes");
@ -2965,7 +2961,7 @@ void TabFilament::toggle_options()
wxGetApp().preset_bundle->is_bbl_vendor();
}
if (m_active_page->title() == "Cooling") {
if (m_active_page->title() == L("Cooling")) {
bool cooling = m_config->opt_bool("slow_down_for_layer_cooling", 0);
toggle_option("slow_down_min_speed", cooling);
@ -2977,7 +2973,7 @@ void TabFilament::toggle_options()
"additional_cooling_fan_speed",
m_preset_bundle->printers.get_edited_preset().config.option<ConfigOptionBool>("auxiliary_fan")->value);
}
if (m_active_page->title() == "Filament")
if (m_active_page->title() == L("Filament"))
{
bool pa = m_config->opt_bool("enable_pressure_advance", 0);
toggle_option("pressure_advance", pa);
@ -2987,8 +2983,17 @@ void TabFilament::toggle_options()
toggle_line("textured_plate_temp_initial_layer", is_BBL_printer);
toggle_option("chamber_temperature", !is_BBL_printer);
}
if (m_active_page->title() == "Setting Overrides")
if (m_active_page->title() == L("Setting Overrides"))
update_filament_overrides_page();
if (m_active_page->title() == L("Multimaterial")) {
// Orca: hide specific settings for BBL printers
for (auto el :
{"filament_minimal_purge_on_wipe_tower", "filament_loading_speed_start", "filament_loading_speed",
"filament_unloading_speed_start", "filament_unloading_speed", "filament_load_time", "filament_unload_time",
"filament_toolchange_delay", "filament_cooling_moves", "filament_cooling_initial_speed", "filament_cooling_final_speed"})
toggle_option(el, !is_BBL_printer);
}
}
void TabFilament::update()
@ -3089,12 +3094,12 @@ void TabPrinter::build_fff()
// optgroup->append_single_option_line("printable_area");
optgroup->append_single_option_line("printable_height");
optgroup->append_single_option_line("nozzle_volume");
// BBS
#if 0
//optgroup->append_single_option_line("z_offset");
#endif
//optgroup = page->new_optgroup(L("Capabilities"));
//ConfigOptionDef def;
// ConfigOptionDef def;
// def.type = coInt,
// def.set_default_value(new ConfigOptionInt(1));
// def.label = L("Extruders");
@ -3103,87 +3108,8 @@ void TabPrinter::build_fff()
// def.max = 256;
// //BBS
// def.mode = comDevelop;
//Option option(def, "extruders_count");
//optgroup->append_single_option_line(option);
//optgroup->append_single_option_line("single_extruder_multi_material");
//optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value) {
// // optgroup->get_value() return int for def.type == coInt,
// // Thus, there should be boost::any_cast<int> !
// // Otherwise, boost::any_cast<size_t> causes an "unhandled unknown exception"
// size_t extruders_count = size_t(boost::any_cast<int>(optgroup->get_value("extruders_count")));
// wxTheApp->CallAfter([this, opt_key, value, extruders_count]() {
// if (opt_key == "extruders_count" || opt_key == "single_extruder_multi_material") {
// extruders_count_changed(extruders_count);
// init_options_list(); // m_options_list should be updated before UI updating
// update_dirty();
// if (opt_key == "single_extruder_multi_material") { // the single_extruder_multimaterial was added to force pages
// on_value_change(opt_key, value); // rebuild - let's make sure the on_value_change is not skipped
// if (boost::any_cast<bool>(value) && m_extruders_count > 1) {
// SuppressBackgroundProcessingUpdate sbpu;
// std::vector<double> nozzle_diameters = static_cast<const ConfigOptionFloats*>(m_config->option("nozzle_diameter"))->values;
// const double frst_diam = nozzle_diameters[0];
// for (auto cur_diam : nozzle_diameters) {
// // if value is differs from first nozzle diameter value
// if (fabs(cur_diam - frst_diam) > EPSILON) {
// const wxString msg_text = _(L("Single Extruder Multi Material is selected, \n"
// "and all extruders must have the same diameter.\n"
// "Do you want to change the diameter for all extruders to first extruder nozzle diameter value?"));
// //wxMessageDialog dialog(parent(), msg_text, _(L("Nozzle diameter")), wxICON_WARNING | wxYES_NO);
// MessageDialog dialog(parent(), msg_text, _(L("Nozzle diameter")), wxICON_WARNING | wxYES_NO);
// DynamicPrintConfig new_conf = *m_config;
// if (dialog.ShowModal() == wxID_YES) {
// for (size_t i = 1; i < nozzle_diameters.size(); i++)
// nozzle_diameters[i] = frst_diam;
// new_conf.set_key_value("nozzle_diameter", new ConfigOptionFloats(nozzle_diameters));
// }
// else
// new_conf.set_key_value("single_extruder_multi_material", new ConfigOptionBool(false));
// load_config(new_conf);
// break;
// }
// }
// }
// }
// }
// else {
// update_dirty();
// on_value_change(opt_key, value);
// }
// });
//};
//optgroup = page->new_optgroup(L("Firmware"));
//optgroup->append_single_option_line("silent_mode");
//optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value) {
// wxTheApp->CallAfter([this, opt_key, value]() {
// if (opt_key == "silent_mode") {
// bool val = boost::any_cast<bool>(value);
// if (m_use_silent_mode != val) {
// m_rebuild_kinematics_page = true;
// m_use_silent_mode = val;
// }
// }
// if (opt_key == "gcode_flavor") {
// bool supports_travel_acceleration = (boost::any_cast<int>(value) == int(gcfMarlinFirmware));
// if (supports_travel_acceleration != m_supports_travel_acceleration) {
// m_rebuild_kinematics_page = true;
// m_supports_travel_acceleration = supports_travel_acceleration;
// }
// }
// build_unregular_pages();
// update_dirty();
// on_value_change(opt_key, value);
// });
//};
#endif
// Option option(def, "extruders_count");
// optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
optgroup->append_single_option_line("gcode_flavor");
@ -3500,35 +3426,31 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/)
n_before_extruders++;
size_t n_after_single_extruder_MM = 2; // Count of pages after single_extruder_multi_material page
//if (m_extruders_count_old == m_extruders_count ||
// (m_has_single_extruder_MM_page && m_extruders_count == 1))
//{
// // if we have a single extruder MM setup, add a page with configuration options:
// for (size_t 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;
// }
// m_has_single_extruder_MM_page = false;
//}
if (from_initial_build) {
// 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("Multimaterial"), "printer", true);
auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup"));
optgroup->append_single_option_line("single_extruder_multi_material");
optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) {
wxTheApp->CallAfter([this, opt_key, value]() {
if (opt_key == "single_extruder_multi_material") {
build_unregular_pages();
}
});
};
optgroup = page->new_optgroup(L("Wipe tower"));
optgroup->append_single_option_line("purge_in_prime_tower");
optgroup->append_single_option_line("enable_filament_ramming");
//BBS: please add our single extruder multimaterial parameters here. Currently
//comment this part because we have no such config in this page.
#if 0
//if (from_initial_build ||
// (m_extruders_count > 1 && m_config->opt_bool("single_extruder_multi_material") && !m_has_single_extruder_MM_page)) {
// // 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", true);
// auto optgroup = page->new_optgroup(L("Single extruder multimaterial parameters"));
//
// if (from_initial_build)
// page->clear();
// else {
// m_pages.insert(m_pages.end() - n_after_single_extruder_MM, page);
// m_has_single_extruder_MM_page = true;
// }
//}
#endif
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");
optgroup->append_single_option_line("extra_loading_move");
optgroup->append_single_option_line("high_current_on_filament_swap");
m_pages.insert(m_pages.end() - n_after_single_extruder_MM, page);
}
// BBS. Just create one extruder page because BBL machine has only on physical extruder.
// Build missed extruder pages
@ -3688,6 +3610,7 @@ void TabPrinter::on_preset_loaded()
// update the GUI field according to the number of nozzle diameters supplied
extruders_count_changed(extruders_count);
#endif
build_unregular_pages();
}
void TabPrinter::update_pages()
@ -3770,8 +3693,7 @@ void TabPrinter::toggle_options()
//if (m_active_page->title() == "Custom G-code") {
// toggle_option("change_filament_gcode", have_multiple_extruders);
//}
if (m_active_page->title() == "Basic information") {
toggle_option("single_extruder_multi_material", have_multiple_extruders);
if (m_active_page->title() == L("Basic information")) {
// SoftFever: hide BBL specific settings
for (auto el :
@ -3783,9 +3705,18 @@ void TabPrinter::toggle_options()
toggle_line(el, !is_BBL_printer);
}
if (m_active_page->title() == L("Multimaterial")) {
// toggle_option("single_extruder_multi_material", have_multiple_extruders);
// SoftFever: hide specific settings for BBL printer
for (auto el :
{"purge_in_prime_tower", "enable_filament_ramming", "cooling_tube_retraction", "cooling_tube_length", "parking_pos_retraction", "extra_loading_move", "high_current_on_filament_swap", })
toggle_option(el, !is_BBL_printer);
}
wxString extruder_number;
long val = 1;
if ( m_active_page->title().IsSameAs("Extruder") ||
if ( m_active_page->title().IsSameAs(L("Extruder")) ||
(m_active_page->title().StartsWith("Extruder ", &extruder_number) && extruder_number.ToLong(&val) &&
val > 0 && (size_t)val <= m_extruders_count))
{
@ -3852,7 +3783,7 @@ void TabPrinter::toggle_options()
toggle_option("retract_restart_extra_toolchange", have_multiple_extruders && toolchange_retraction, i);
}
if (m_active_page->title() == "Motion ability") {
if (m_active_page->title() == L("Motion ability")) {
auto gcf = m_config->option<ConfigOptionEnum<GCodeFlavor>>("gcode_flavor")->value;
assert(gcf == gcfMarlinLegacy || gcf == gcfMarlinFirmware || gcf == gcfKlipper);
bool silent_mode = m_config->opt_bool("silent_mode");