3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
cura/ConvexHullNode.py
View file

@ -24,7 +24,7 @@ class ConvexHullNode(SceneNode):
self._original_parent = parent
# 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.
self._mesh_height = 0.1
@ -73,8 +73,6 @@ class ConvexHullNode(SceneNode):
return True
def _onNodeDecoratorsChanged(self, node):
self._color = Color(*Application.getInstance().getTheme().getColor("convex_hull").getRgb())
convex_hull_head = self._node.callDecoration("getConvexHullHead")
if convex_hull_head:
convex_hull_head_builder = MeshBuilder()

4
cura/PlatformPhysics.py
View file

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

1
plugins/VersionUpgrade/VersionUpgrade24to25/__init__.py
View file

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

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

@ -2556,6 +2556,17 @@
"settable_per_mesh": false,
"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":
{
"label": "Layer Start X",

6
resources/qml/Preferences/MaterialsPage.qml
View file

@ -128,7 +128,11 @@ UM.ManagementPage
text: catalog.i18nc("@action:button", "Activate");
iconName: "list-activate";
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
{

3
resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
View file

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

3
resources/quality/abax_pri3/apri3_pla_high.inst.cfg
View file

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

3
resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
View file

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

3
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
View file

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

3
resources/quality/abax_pri5/apri5_pla_high.inst.cfg
View file

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

3
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
View file

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

3
resources/quality/abax_titan/atitan_pla_fast.inst.cfg
View file

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

4
resources/quality/abax_titan/atitan_pla_high.inst.cfg
View file

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

3
resources/quality/abax_titan/atitan_pla_normal.inst.cfg
View file

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

2
resources/quality/high.inst.cfg
View file

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

2
resources/quality/low.inst.cfg
View file

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

2
resources/quality/normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_PVA_Not_Supported_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Quality.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
View file

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

2
resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
View file

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

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