3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into recommended_sidebar

Browse source
This commit is contained in:
Jack Ha 2016-12-01 11:34:41 +01:00
commit 4cd940cc5e
13 changed files with 359 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

125
resources/definitions/fdmprinter.def.json
View file

@ -137,6 +137,21 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_shape":
{
"label": "Build plate shape",
"description": "The shape of the build plate without taking unprintable areas into account.",
"default_value": "rectangular",
"type": "enum",
"options":
{
"rectangular": "Rectangular",
"elliptic": "Elliptic"
},
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine height",
@ -946,17 +961,39 @@
"z_seam_type":
{
"label": "Z Seam Alignment",
"description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.",
"description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.",
"type": "enum",
"options":
{
"back": "Back",
"back": "User Specified",
"shortest": "Shortest",
"random": "Random"
},
"default_value": "shortest",
"settable_per_mesh": true
},
"z_seam_x":
{
"label": "Z Seam X",
"description": "The X coordinate of the position near where to start printing each part in a layer.",
"unit": "mm",
"type": "float",
"default_value": 100.0,
"value": "machine_width / 2",
"enabled": "z_seam_type == 'back'",
"settable_per_mesh": true
},
"z_seam_y":
{
"label": "Z Seam Y",
"description": "The Y coordinate of the position near where to start printing each part in a layer.",
"unit": "mm",
"type": "float",
"default_value": 100.0,
"value": "machine_depth / 2",
"enabled": "z_seam_type == 'back'",
"settable_per_mesh": true
},
"skin_no_small_gaps_heuristic":
{
"label": "Ignore Small Z Gaps",
@ -996,7 +1033,7 @@
"default_value": 2,
"minimum_value": "0",
"minimum_value_warning": "infill_line_width",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' else (4 if infill_pattern == 'tetrahedral' else 1)))",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (4 if infill_pattern == 'tetrahedral' else 1)))",
"settable_per_mesh": true
}
}
@ -1012,6 +1049,7 @@
"lines": "Lines",
"triangles": "Triangles",
"cubic": "Cubic",
"cubicsubdiv": "Cubic Subdivision",
"tetrahedral": "Tetrahedral",
"concentric": "Concentric",
"concentric_3d": "Concentric 3D",
@ -1022,6 +1060,32 @@
"value": "'lines' if infill_sparse_density > 25 else 'grid'",
"settable_per_mesh": true
},
"sub_div_rad_mult":
{
"label": "Cubic Subdivision Radius",
"description": "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes.",
"unit": "%",
"type": "float",
"default_value": 100,
"minimum_value": "0",
"minimum_value_warning": "100",
"maximum_value_warning": "200",
"enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
"settable_per_mesh": true
},
"sub_div_rad_add":
{
"label": "Cubic Subdivision Shell",
"description": "An addition to the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to a thicker shell of small cubes near the boundary of the model.",
"unit": "mm",
"type": "float",
"default_value": 0.4,
"value": "wall_line_width_x",
"minimum_value_warning": "-1 * infill_line_distance",
"maximum_value_warning": "5 * infill_line_distance",
"enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
"settable_per_mesh": true
},
"infill_overlap":
{
"label": "Infill Overlap Percentage",
@ -1116,7 +1180,7 @@
"minimum_value": "0",
"maximum_value_warning": "4",
"maximum_value": "20 - math.log(infill_line_distance) / math.log(2)",
"enabled": "infill_sparse_density > 0",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv'",
"settable_per_mesh": true
},
"gradual_infill_step_height":
@ -1129,7 +1193,7 @@
"minimum_value": "0.0001",
"minimum_value_warning": "3 * resolveOrValue('layer_height')",
"maximum_value_warning": "100",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"settable_per_mesh": true
},
"infill_before_walls":
@ -2434,20 +2498,6 @@
"settable_per_extruder": true,
"children":
{
"cool_fan_speed_0":
{
"label": "Initial Fan Speed",
"description": "The speed at which the fans spin at the start of the print. In subsequent layers the fan speed is gradually increased up to the layer corresponding to Regular Fan Speed at Height.",
"unit": "%",
"type": "float",
"minimum_value": "0",
"maximum_value": "100",
"value": "cool_fan_speed",
"default_value": 100,
"enabled": "cool_fan_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"cool_fan_speed_min":
{
"label": "Regular Fan Speed",
@ -2490,6 +2540,19 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"cool_fan_speed_0":
{
"label": "Initial Fan Speed",
"description": "The speed at which the fans spin at the start of the print. In subsequent layers the fan speed is gradually increased up to the layer corresponding to Regular Fan Speed at Height.",
"unit": "%",
"type": "float",
"minimum_value": "0",
"maximum_value": "100",
"default_value": 0,
"enabled": "cool_fan_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"cool_fan_full_at_height":
{
"label": "Regular Fan Speed at Height",
@ -3616,7 +3679,6 @@
"type": "category",
"icon": "category_dual",
"description": "Settings used for printing with multiple extruders.",
"enabled": "machine_extruder_count > 1",
"children":
{
"prime_tower_enable":
@ -3742,17 +3804,6 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"multiple_mesh_overlap":
{
"label": "Dual Extrusion Overlap",
"description": "Make the models printed with different extruder trains overlap a bit. This makes the different materials bond together better.",
"type": "float",
"unit": "mm",
"default_value": 0.15,
"minimum_value": "0",
"maximum_value_warning": "1.0",
"settable_per_mesh": true
},
"ooze_shield_enabled":
{
"label": "Enable Ooze Shield",
@ -3833,6 +3884,17 @@
"default_value": false,
"settable_per_mesh": true
},
"multiple_mesh_overlap":
{
"label": "Merged Meshes Overlap",
"description": "Make meshes which are touching each other overlap a bit. This makes them bond together better.",
"type": "float",
"unit": "mm",
"default_value": 0.15,
"minimum_value": "0",
"maximum_value_warning": "1.0",
"settable_per_mesh": true
},
"carve_multiple_volumes":
{
"label": "Remove Mesh Intersection",
@ -4106,6 +4168,7 @@
"type": "bool",
"default_value": false,
"enabled": "support_enable",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": true
},
"support_conical_angle":

2
resources/qml/Actions.qml
View file

@ -290,7 +290,7 @@ Item
Action
{
id: loadWorkspaceAction
text: catalog.i18nc("@action:inmenu menubar:file","&Open Workspace...");
text: catalog.i18nc("@action:inmenu menubar:file","&Import project...");
}
Action

2
resources/qml/Cura.qml
View file

@ -110,7 +110,7 @@ UM.MainWindow
MenuItem
{
id: saveWorkspaceMenu
text: catalog.i18nc("@title:menu menubar:file","Save Workspace")
text: catalog.i18nc("@title:menu menubar:file","Export project")
onTriggered: UM.OutputDeviceManager.requestWriteToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "file_type": "workspace" });
}

19
resources/qml/Sidebar.qml
View file

@ -166,15 +166,6 @@ Rectangle
anchors.topMargin: UM.Theme.getSize("default_margin").height
}
currentModeIndex:
{
var index = parseInt(UM.Preferences.getValue("cura/active_mode"))
if(index)
{
return index;
}
return 0;
}
onCurrentModeIndexChanged:
{
UM.Preferences.setValue("cura/active_mode", currentModeIndex);
@ -268,7 +259,7 @@ Rectangle
height: settingsModeSelection.height
width: visible ? height : 0
visible: !monitoringPrint && modesListModel.get(base.currentModeIndex).showFilterButton
visible: !monitoringPrint && modesListModel.get(base.currentModeIndex) != undefined && modesListModel.get(base.currentModeIndex).showFilterButton
opacity: visible ? 1 : 0
onClicked: sidebarContents.currentItem.toggleFilterField()
@ -284,7 +275,7 @@ Rectangle
}
label: UM.RecolorImage
{
anchors.verticalCenter: control.verticalCenter
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
@ -420,6 +411,12 @@ Rectangle
modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple, showFilterButton: false })
modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced, showFilterButton: true })
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true });
var index = parseInt(UM.Preferences.getValue("cura/active_mode"))
if(index)
{
currentModeIndex = index;
}
}
UM.SettingPropertyProvider