Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix calls to Page::new_optgroup() #8569

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

Fix calls to Page::new_optgroup() #8569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/slic3r/GUI/Tab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3511,10 +3511,10 @@ void TabFilament::build()
optgroup->append_single_option_line(option);

page = add_options_page(L("Multimaterial"), "custom-gcode_multi_material"); // ORCA: icon only visible on placeholders
optgroup = page->new_optgroup(L("Wipe tower parameters"), "param_tower");
optgroup = page->new_optgroup(L("Wipe tower parameters"), L"param_tower");
optgroup->append_single_option_line("filament_minimal_purge_on_wipe_tower");

optgroup = page->new_optgroup(L("Toolchange parameters with single extruder MM printers"), "param_toolchange");
optgroup = page->new_optgroup(L("Toolchange parameters with single extruder MM printers"), L"param_toolchange");
optgroup->append_single_option_line("filament_loading_speed_start", "semm");
optgroup->append_single_option_line("filament_loading_speed", "semm");
optgroup->append_single_option_line("filament_unloading_speed_start", "semm");
Expand Down Expand Up @@ -3776,7 +3776,7 @@ void TabPrinter::build_fff()
static_cast<const ConfigOptionFloats*>(parent_preset->config.option("nozzle_diameter"))->values.size();

auto page = add_options_page(L("Basic information"), "custom-gcode_object-info"); // ORCA: icon only visible on placeholders
auto optgroup = page->new_optgroup(L("Printable space"), "param_printable_space");
auto optgroup = page->new_optgroup(L("Printable space"), L"param_printable_space");

create_line_with_widget(optgroup.get(), "printable_area", "custom-svg-and-png-bed-textures_124612", [this](wxWindow* parent) {
return create_bed_shape_widget(parent);
Expand Down Expand Up @@ -3843,25 +3843,25 @@ void TabPrinter::build_fff()
// optgroup->append_single_option_line("spaghetti_detector");
optgroup->append_single_option_line("time_cost");

optgroup = page->new_optgroup(L("Cooling Fan"), "param_cooling_fan");
optgroup = page->new_optgroup(L("Cooling Fan"), L"param_cooling_fan");
Line line = Line{ L("Fan speed-up time"), optgroup->get_option("fan_speedup_time").opt.tooltip };
line.append_option(optgroup->get_option("fan_speedup_time"));
line.append_option(optgroup->get_option("fan_speedup_overhangs"));
optgroup->append_line(line);
optgroup->append_single_option_line("fan_kickstart");

optgroup = page->new_optgroup(L("Extruder Clearance"), "param_extruder_clearence");
optgroup = page->new_optgroup(L("Extruder Clearance"), L"param_extruder_clearence");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this should be L"param_extruder_clearance", but I am not sure where else this name should be fixed.

optgroup->append_single_option_line("extruder_clearance_radius");
optgroup->append_single_option_line("extruder_clearance_height_to_rod");
optgroup->append_single_option_line("extruder_clearance_height_to_lid");

optgroup = page->new_optgroup(L("Adaptive bed mesh"), "param_adaptive_mesh");
optgroup = page->new_optgroup(L("Adaptive bed mesh"), L"param_adaptive_mesh");
optgroup->append_single_option_line("bed_mesh_min", "adaptive-bed-mesh");
optgroup->append_single_option_line("bed_mesh_max", "adaptive-bed-mesh");
optgroup->append_single_option_line("bed_mesh_probe_distance", "adaptive-bed-mesh");
optgroup->append_single_option_line("adaptive_bed_mesh_margin", "adaptive-bed-mesh");

optgroup = page->new_optgroup(L("Accessory"), "param_accessory");
optgroup = page->new_optgroup(L("Accessory"), L"param_accessory");
optgroup->append_single_option_line("nozzle_type");
optgroup->append_single_option_line("nozzle_hrc");
optgroup->append_single_option_line("auxiliary_fan", "auxiliary-fan");
Expand Down Expand Up @@ -3907,7 +3907,7 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option);


optgroup = page->new_optgroup(L("Before layer change G-code"),"param_gcode", 0);
optgroup = page->new_optgroup(L("Before layer change G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
};
Expand Down Expand Up @@ -3983,7 +3983,7 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option);

page = add_options_page(L("Notes"), "custom-gcode_note"); // ORCA: icon only visible on placeholders
optgroup = page->new_optgroup(L("Notes"), "note", 0);
optgroup = page->new_optgroup(L("Notes"), L"note", 0);
option = optgroup->get_option("printer_notes");
option.opt.full_width = true;
option.opt.height = notes_field_height;//250;
Expand Down Expand Up @@ -4121,7 +4121,7 @@ PageShp TabPrinter::build_kinematics_page()

optgroup->append_line(line);
}
auto optgroup = page->new_optgroup(L("Advanced"), "param_advanced");
auto optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
optgroup->append_single_option_line("emit_machine_limits_to_gcode");

const std::vector<std::string> speed_axes{
Expand All @@ -4130,21 +4130,21 @@ PageShp TabPrinter::build_kinematics_page()
"machine_max_speed_z",
"machine_max_speed_e"
};
optgroup = page->new_optgroup(L("Speed limitation"), "param_speed");
optgroup = page->new_optgroup(L("Speed limitation"), L"param_speed");
for (const std::string &speed_axis : speed_axes) {
append_option_line(optgroup, speed_axis);
}

const std::vector<std::string> axes{ "x", "y", "z", "e" };
optgroup = page->new_optgroup(L("Acceleration limitation"), "param_acceleration");
optgroup = page->new_optgroup(L("Acceleration limitation"), L"param_acceleration");
for (const std::string &axis : axes) {
append_option_line(optgroup, "machine_max_acceleration_" + axis);
}
append_option_line(optgroup, "machine_max_acceleration_extruding");
append_option_line(optgroup, "machine_max_acceleration_retracting");
append_option_line(optgroup, "machine_max_acceleration_travel");

optgroup = page->new_optgroup(L("Jerk limitation"), "param_jerk");
optgroup = page->new_optgroup(L("Jerk limitation"), L"param_jerk");
for (const std::string &axis : axes) {
append_option_line(optgroup, "machine_max_jerk_" + axis);
}
Expand Down Expand Up @@ -4200,7 +4200,7 @@ if (is_marlin_flavor)
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"), "custom-gcode_multi_material", true); // ORCA: icon only visible on placeholders
auto optgroup = page->new_optgroup(L("Single extruder multi-material setup"), "param_multi_material");
auto optgroup = page->new_optgroup(L("Single extruder multi-material setup"), L"param_multi_material");
optgroup->append_single_option_line("single_extruder_multi_material", "semm");
ConfigOptionDef def;
def.type = coInt, def.set_default_value(new ConfigOptionInt((int) m_extruders_count));
Expand Down Expand Up @@ -4289,7 +4289,7 @@ if (is_marlin_flavor)
optgroup->append_single_option_line("enable_filament_ramming", "semm");


optgroup = page->new_optgroup(L("Single extruder multi-material parameters"), "param_settings");
optgroup = page->new_optgroup(L("Single extruder multi-material parameters"), L"param_settings");
optgroup->append_single_option_line("cooling_tube_retraction", "semm");
optgroup->append_single_option_line("cooling_tube_length", "semm");
optgroup->append_single_option_line("parking_pos_retraction", "semm");
Expand Down
Loading