GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-28 16:11:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Beautification of gui options (imo)

Browse Source
This commit is contained in:
supermerill 2018-06-27 13:54:52 +02:00
parent d21c33e9b5
commit aaabc7df67
3 changed files with 74 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
xs/src/libslic3r/PrintConfig.cpp
View File

@ -65,7 +65,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionString("");
def = this->add("bottom_solid_layers", coInt);
def->label = L("Bottom");
def->label = L(" Bottom");
def->category = L("Layers and Perimeters");
def->tooltip = L("Number of solid layers to generate on bottom surfaces.");
def->cli = "bottom-solid-layers=i";
@ -83,7 +83,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(0);
def = this->add("bridge_angle", coFloat);
def->label = L("Bridging angle");
def->label = L("Bridging");
def->category = L("Infill");
def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated "
"automatically. Otherwise the provided angle will be used for all bridges. "
@ -112,7 +112,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionInts{ 100 };
def = this->add("bridge_flow_ratio", coFloat);
def->label = L("Bridge flow ratio");
def->label = L("Bridge");
def->category = L("Advanced");
def->tooltip = L("This factor affects the amount of plastic for bridging. "
"You can decrease it slightly to pull the extrudates and prevent sagging, "
@ -124,15 +124,16 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(1);
def = this->add("over_bridge_flow_ratio", coFloat);
def->label = L("Over-bridge flow ratio");
def->label = L("Above the bridges");
def->category = L("Advanced");
def->tooltip = L("This factor affects the amount of plastic to overextrude "
"when we are filling on top of a bridge surface."
"With a number >1, we can retreive the correct z-height "
"even if the bridged layer has fallen a bit.");
"With a number >1, we can retrieve a correct z-height "
"even if the bridged layer has fallen a bit. "
"It's useful if you want to have a nice flat top layer.");
def->cli = "over-bridge-flow-ratio=f";
def->min = 0;
def->default_value = new ConfigOptionFloat(1);
def->default_value = new ConfigOptionFloat(1.15);
def = this->add("bridge_speed", coFloat);
def->label = L("Bridges");
@ -253,10 +254,10 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(6);
def = this->add("elefant_foot_compensation", coFloat);
def->label = L("Elephant foot compensation");
def->label = L("First layer");
def->category = L("Advanced");
def->tooltip = L("The first layer will be shrunk in the XY plane by the configured value "
"to compensate for the 1st layer squish aka an Elephant Foot effect.");
"to compensate for the 1st layer squish aka an Elephant Foot effect. (must be negative = inwards)");
def->sidetext = L("mm");
def->cli = "elefant-foot-compensation=f";
def->min = 0;
@ -292,7 +293,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionBool(false);
def = this->add("top_fill_pattern", coEnum);
def->label = L("Top fill pattern");
def->label = L(" Top");
def->category = L("Infill");
def->tooltip = L("Fill pattern for top infill. This only affects the top external visible layer, and not its adjacent solid shells.");
def->cli = "top-fill-pattern|solid-fill-pattern=s";
@ -318,7 +319,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);
def = this->add("bottom_fill_pattern", coEnum);
def->label = L("bottom fill pattern");
def->label = L("Bottom");
def->category = L("Infill");
def->tooltip = L("Fill pattern for bottom infill. This only affects the bottom external visible layer, and not its adjacent solid shells.");
def->cli = "bottom-fill-pattern|solid-fill-pattern=s";
@ -336,9 +337,10 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);
def = this->add("enforce_full_fill_volume", coBool);
def->label = L("Enforce full fill volume");
def->label = L("Enforce 100% fill volume");
def->category = L("Infill");
def->tooltip = L("Experimental option wich modify (top/bottom) fill flow to have the exact amount of plastic inside the volume to fill.");
def->tooltip = L("Experimental option wich modify (top/bottom) fill flow to have the exact amount of plastic inside the volume to fill "
"(it generally changes the flow from -7% to +4%, depending on the size of the surface to fill and the overlap parameters).");
def->cli = "enforce-full-fill-volume!";
def->default_value = new ConfigOptionBool(true);
@ -362,7 +364,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloatOrPercent(0, false);
def = this->add("external_perimeter_speed", coFloatOrPercent);
def->label = L("External perimeters");
def->label = L("External");
def->category = L("Speed");
def->tooltip = L("This separate setting will affect the speed of external perimeters (the visible ones). "
"If expressed as percentage (for example: 80%) it will be calculated "
@ -614,7 +616,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionStrings { "" };
def = this->add("fill_angle", coFloat);
def->label = L("Fill angle");
def->label = L("Fill");
def->category = L("Infill");
def->tooltip = L("Default base angle for infill orientation. Cross-hatching will be applied to this. "
"Bridges will be infilled using the best direction Slic3r can detect, so this setting "
@ -628,7 +630,7 @@ PrintConfigDef::PrintConfigDef()
def = this->add("fill_density", coPercent);
def->gui_type = "f_enum_open";
def->gui_flags = "show_value";
def->label = L("Fill density");
def->label = L("Density");
def->category = L("Infill");
def->tooltip = L("Density of internal infill, expressed in the range 0% - 100%.");
def->sidetext = L("%");
@ -666,7 +668,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionPercent(20);
def = this->add("fill_pattern", coEnum);
def->label = L("Fill pattern");
def->label = L("Inside");
def->category = L("Infill");
def->tooltip = L("Fill pattern for general low-density infill.");
def->cli = "fill-pattern=s";
@ -873,7 +875,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloatOrPercent(25, true);
def = this->add("infill_speed", coFloat);
def->label = L("Infill");
def->label = L(" Sparse\t");
def->category = L("Speed");
def->tooltip = L("Speed for printing the internal fill. Set to zero for auto.");
def->sidetext = L("mm/s");
@ -1135,7 +1137,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloatOrPercent(0, false);
def = this->add("perimeter_speed", coFloat);
def->label = L("Perimeters");
def->label = L("Default");
def->category = L("Speed");
def->tooltip = L("Speed for perimeters (contours, aka vertical shells). Set to zero for auto.");
def->sidetext = L("mm/s");
@ -1422,7 +1424,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionInts { 5 };
def = this->add("small_perimeter_speed", coFloatOrPercent);
def->label = L("Small perimeters");
def->label = L("Small");
def->category = L("Speed");
def->tooltip = L("This separate setting will affect the speed of perimeters having radius <= 6.5mm "
"(usually holes). If expressed as percentage (for example: 80%) it will be calculated "
@ -1473,7 +1475,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloatOrPercent(0, false);
def = this->add("solid_infill_speed", coFloatOrPercent);
def->label = L("Solid infill");
def->label = L("Solid");
def->category = L("Speed");
def->tooltip = L("Speed for printing solid regions (top/bottom/internal horizontal shells). "
"This can be expressed as a percentage (for example: 80%) over the default "
@ -1669,7 +1671,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(0);
def = this->add("support_material_interface_speed", coFloatOrPercent);
def->label = L("Support material interface");
def->label = L("Interface");
def->category = L("Support material");
def->tooltip = L("Speed for printing support material interface layers. If expressed as percentage "
"(for example 50%) it will be calculated over support material speed.");
@ -1703,7 +1705,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(2.5);
def = this->add("support_material_speed", coFloat);
def->label = L("Support material");
def->label = L("Default");
def->category = L("Support material");
def->tooltip = L("Speed for printing support material.");
def->sidetext = L("mm/s");
@ -1794,7 +1796,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloatOrPercent(0, false);
def = this->add("top_solid_infill_speed", coFloatOrPercent);
def->label = L("Top solid infill");
def->label = L("Top solid");
def->category = L("Speed");
def->tooltip = L("Speed for printing top solid layers (it only applies to the uppermost "
"external layers and not to their internal solid layers). You may want "
@ -1891,14 +1893,14 @@ PrintConfigDef::PrintConfigDef()
140.f, 140.f, 140.f, 140.f, 0.f };
def = this->add("wipe_tower_x", coFloat);
def->label = L("Position X");
def->label = L("X");
def->tooltip = L("X coordinate of the left front corner of a wipe tower");
def->sidetext = L("mm");
def->cli = "wipe-tower-x=f";
def->default_value = new ConfigOptionFloat(180.);
def = this->add("wipe_tower_y", coFloat);
def->label = L("Position Y");
def->label = L("Y");
def->tooltip = L("Y coordinate of the left front corner of a wipe tower");
def->sidetext = L("mm");
def->cli = "wipe-tower-y=f";
@ -1926,7 +1928,7 @@ PrintConfigDef::PrintConfigDef()
def->default_value = new ConfigOptionFloat(10.);
def = this->add("xy_size_compensation", coFloat);
def->label = L("XY Size Compensation");
def->label = L("All layers");
def->category = L("Advanced");
def->tooltip = L("The object will be grown/shrunk in the XY plane by the configured value "
"(negative = inwards, positive = outwards). This might be useful "

2
xs/src/libslic3r/PrintObject.cpp
View File

@ -1465,7 +1465,7 @@ end:
// Apply size compensation and perform clipping of multi-part objects.
float delta = float(scale_(this->config.xy_size_compensation.value));
if (layer_id == 0)
delta -= float(scale_(this->config.elefant_foot_compensation.value));
delta += float(scale_(this->config.elefant_foot_compensation.value));
bool scale = delta != 0.f;
bool clip = this->config.clip_multipart_objects.value || delta > 0.f;
if (layer->regions.size() == 1) {

60
xs/src/slic3r/GUI/Tab.cpp
View File

@ -832,6 +832,7 @@ void TabPrint::build()
line.append_option(optgroup->get_option("top_solid_layers"));
line.append_option(optgroup->get_option("bottom_solid_layers"));
optgroup->append_line(line);
optgroup->append_single_option_line("enforce_full_fill_volume");
optgroup = page->new_optgroup(_(L("Quality (slower slicing)")));
optgroup->append_single_option_line("extra_perimeters");
@ -847,11 +848,14 @@ void TabPrint::build()
page = add_options_page(_(L("Infill")), "infill.png");
optgroup = page->new_optgroup(_(L("Infill")));
optgroup->append_single_option_line("fill_density");
optgroup->append_single_option_line("fill_pattern");
optgroup->append_single_option_line("top_fill_pattern");
optgroup->append_single_option_line("bottom_fill_pattern");
optgroup->append_single_option_line("enforce_full_fill_volume");
line = { _(L("Fill inside pattern")), "" };
line.append_option(optgroup->get_option("fill_density"));
line.append_option(optgroup->get_option("fill_pattern"));
optgroup->append_line(line);
line = { _(L("Fill external pattern")), "" };
line.append_option(optgroup->get_option("top_fill_pattern"));
line.append_option(optgroup->get_option("bottom_fill_pattern"));
optgroup->append_line(line);
optgroup = page->new_optgroup(_(L("Reducing printing time")));
optgroup->append_single_option_line("infill_every_layers");
@ -859,10 +863,12 @@ void TabPrint::build()
optgroup = page->new_optgroup(_(L("Advanced")));
optgroup->append_single_option_line("solid_infill_every_layers");
optgroup->append_single_option_line("fill_angle");
optgroup->append_single_option_line("solid_infill_below_area");
line = { _(L("Angle")), "" };
line.append_option(optgroup->get_option("fill_angle"));
line.append_option(optgroup->get_option("bridge_angle"));
optgroup->append_line(line);
optgroup->append_single_option_line("external_infill_margin");
optgroup->append_single_option_line("bridge_angle");
optgroup->append_single_option_line("only_retract_when_crossing_perimeters");
optgroup->append_single_option_line("infill_first");
@ -902,14 +908,20 @@ void TabPrint::build()
page = add_options_page(_(L("Speed")), "time.png");
optgroup = page->new_optgroup(_(L("Speed for print moves")));
optgroup->append_single_option_line("perimeter_speed");
optgroup->append_single_option_line("small_perimeter_speed");
optgroup->append_single_option_line("external_perimeter_speed");
optgroup->append_single_option_line("infill_speed");
optgroup->append_single_option_line("solid_infill_speed");
optgroup->append_single_option_line("top_solid_infill_speed");
optgroup->append_single_option_line("support_material_speed");
optgroup->append_single_option_line("support_material_interface_speed");
line = { _(L("Perimeter speed")), "" };
line.append_option(optgroup->get_option("perimeter_speed"));
line.append_option(optgroup->get_option("external_perimeter_speed"));
line.append_option(optgroup->get_option("small_perimeter_speed"));
optgroup->append_line(line);
line = { _(L("Infill speed")), "" };
line.append_option(optgroup->get_option("infill_speed"));
line.append_option(optgroup->get_option("solid_infill_speed"));
line.append_option(optgroup->get_option("top_solid_infill_speed"));
optgroup->append_line(line);
line = { _(L("Support speed")), "" };
line.append_option(optgroup->get_option("support_material_speed"));
line.append_option(optgroup->get_option("support_material_interface_speed"));
optgroup->append_line(line);
optgroup->append_single_option_line("bridge_speed");
optgroup->append_single_option_line("gap_fill_speed");
@ -946,8 +958,10 @@ void TabPrint::build()
optgroup = page->new_optgroup(_(L("Wipe tower")));
optgroup->append_single_option_line("wipe_tower");
optgroup->append_single_option_line("wipe_tower_x");
optgroup->append_single_option_line("wipe_tower_y");
line = { _(L("Wipe tower position")), "" };
line.append_option(optgroup->get_option("wipe_tower_x"));
line.append_option(optgroup->get_option("wipe_tower_y"));
optgroup->append_line(line);
optgroup->append_single_option_line("wipe_tower_width");
optgroup->append_single_option_line("wipe_tower_rotation_angle");
optgroup->append_single_option_line("wipe_tower_bridging");
@ -970,13 +984,17 @@ void TabPrint::build()
optgroup->append_single_option_line("infill_overlap");
optgroup = page->new_optgroup(_(L("Flow")));
optgroup->append_single_option_line("bridge_flow_ratio");
optgroup->append_single_option_line("over_bridge_flow_ratio");
line = { _(L("Bridge flow ratio")), "" };
line.append_option(optgroup->get_option("bridge_flow_ratio"));
line.append_option(optgroup->get_option("over_bridge_flow_ratio"));
optgroup->append_line(line);
optgroup = page->new_optgroup(_(L("Other")));
optgroup->append_single_option_line("clip_multipart_objects");
optgroup->append_single_option_line("elefant_foot_compensation");
optgroup->append_single_option_line("xy_size_compensation");
line = { _(L("XY compensation")), "" };
line.append_option(optgroup->get_option("xy_size_compensation"));
line.append_option(optgroup->get_option("elefant_foot_compensation"));
optgroup->append_line(line);
// # optgroup->append_single_option_line("threads");
optgroup->append_single_option_line("resolution");