Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jack Ha 2017-03-16 15:27:55 +01:00
commit 60c5112824
130 changed files with 157 additions and 130 deletions

View File

@ -24,7 +24,7 @@ class ConvexHullNode(SceneNode):
self._original_parent = parent self._original_parent = parent
# Color of the drawn convex hull # Color of the drawn convex hull
self._color = None self._color = Color(*Application.getInstance().getTheme().getColor("convex_hull").getRgb())
# The y-coordinate of the convex hull mesh. Must not be 0, to prevent z-fighting. # The y-coordinate of the convex hull mesh. Must not be 0, to prevent z-fighting.
self._mesh_height = 0.1 self._mesh_height = 0.1
@ -73,8 +73,6 @@ class ConvexHullNode(SceneNode):
return True return True
def _onNodeDecoratorsChanged(self, node): def _onNodeDecoratorsChanged(self, node):
self._color = Color(*Application.getInstance().getTheme().getColor("convex_hull").getRgb())
convex_hull_head = self._node.callDecoration("getConvexHullHead") convex_hull_head = self._node.callDecoration("getConvexHullHead")
if convex_hull_head: if convex_hull_head:
convex_hull_head_builder = MeshBuilder() convex_hull_head_builder = MeshBuilder()

View File

@ -171,6 +171,10 @@ class PlatformPhysics:
self._enabled = False self._enabled = False
def _onToolOperationStopped(self, tool): def _onToolOperationStopped(self, tool):
# Selection tool should not trigger an update.
if tool.getPluginId() == "SelectionTool":
return
if tool.getPluginId() == "TranslateTool": if tool.getPluginId() == "TranslateTool":
for node in Selection.getAllSelectedObjects(): for node in Selection.getAllSelectedObjects():
if node.getBoundingBox().bottom < 0: if node.getBoundingBox().bottom < 0:

View File

@ -41,4 +41,5 @@ def getMetaData():
} }
def register(app): def register(app):
return {}
return { "version_upgrade": upgrade } return { "version_upgrade": upgrade }

View File

@ -2556,6 +2556,17 @@
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
"start_layers_at_same_position":
{
"label": "Start Layers with the Same Part",
"description": "In each layer start with printing the object near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time.",
"type": "bool",
"default_value": false,
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"layer_start_x": "layer_start_x":
{ {
"label": "Layer Start X", "label": "Layer Start X",

View File

@ -128,7 +128,11 @@ UM.ManagementPage
text: catalog.i18nc("@action:button", "Activate"); text: catalog.i18nc("@action:button", "Activate");
iconName: "list-activate"; iconName: "list-activate";
enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId && Cura.MachineManager.hasMaterials enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId && Cura.MachineManager.hasMaterials
onClicked: Cura.MachineManager.setActiveMaterial(base.currentItem.id) onClicked:
{
Cura.MachineManager.setActiveMaterial(base.currentItem.id)
currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
}
}, },
Button Button
{ {

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_titan definition = abax_titan

View File

@ -1,8 +1,8 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_titan definition = abax_titan
[metadata] [metadata]
type = quality type = quality
material = generic_pla material = generic_pla

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_titan definition = abax_titan

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Low Quality name = Low Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Superdraft Print name = Superdraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Verydraft Print name = Verydraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Superdraft Print name = Superdraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Verydraft Print name = Verydraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

Some files were not shown because too many files have changed in this diff Show More