Merge remote-tracking branch 'origin/feature_support_mesh'

This commit is contained in:
Tim Kuipers 2017-04-13 11:13:25 +02:00
commit ef9b705cc4
2 changed files with 16 additions and 4 deletions

View file

@ -2851,8 +2851,8 @@
{ {
"support_enable": "support_enable":
{ {
"label": "Enable Support", "label": "Generate Support",
"description": "Enable support structures. These structures support parts of the model with severe overhangs.", "description": "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"settable_per_mesh": true, "settable_per_mesh": true,
@ -4240,6 +4240,18 @@
"settable_per_meshgroup": false, "settable_per_meshgroup": false,
"settable_globally": false "settable_globally": false
}, },
"support_mesh_drop_down":
{
"label": "Drop Down Support Mesh",
"description": "Make support everywhere below the support mesh, so that there's no overhang in the support mesh.",
"type": "bool",
"default_value": true,
"enabled": "support_mesh",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": false,
"settable_globally": false
},
"anti_overhang_mesh": "anti_overhang_mesh":
{ {
"label": "Anti Overhang Mesh", "label": "Anti Overhang Mesh",

View file

@ -232,7 +232,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter anchors.verticalCenter: enableSupportCheckBox.verticalCenter
width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "Enable Support"); text: catalog.i18nc("@label", "Generate Support");
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
} }
@ -263,7 +263,7 @@ Item
onEntered: onEntered:
{ {
base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportCheckBox.x, 0), base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportCheckBox.x, 0),
catalog.i18nc("@label", "Enable support structures. These structures support parts of the model with severe overhangs.")); catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."));
} }
onExited: onExited:
{ {