GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 00:56:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2017-02-22 17:07:06 +01:00
commit 3039315408
14 changed files with 186 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CameraAnimation.py
View File

@ -6,6 +6,8 @@ from PyQt5.QtCore import QVariantAnimation, QEasingCurve
from PyQt5.QtGui import QVector3D
from UM.Math.Vector import Vector
from UM.Logger import Logger
class CameraAnimation(QVariantAnimation):
def __init__(self, parent = None):

2
cura/ConvexHullDecorator.py
View File

@ -197,7 +197,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
hull = Polygon(vertex_data)
if len(vertex_data) >= 4:
if len(vertex_data) >= 3:
convex_hull = hull.getConvexHull()
offset_hull = self._offsetHull(convex_hull)
else:

2
cura/CuraApplication.py
View File

@ -700,7 +700,7 @@ class CuraApplication(QtApplication):
self.getController().setActiveTool(None)
def _onToolOperationStopped(self, event):
if self._center_after_select:
if self._center_after_select and Selection.getSelectedObject(0) is not None:
self._center_after_select = False
self._camera_animation.setStart(self.getController().getTool("CameraTool").getOrigin())
self._camera_animation.setTarget(Selection.getSelectedObject(0).getWorldPosition())

21
resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg Normal file
View File

@ -0,0 +1,21 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -2
[values]
cool_fan_speed_max = 80
layer_height = 0.2
machine_nozzle_cool_down_speed = 0.9
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 65 / 50)
speed_wall = =math.ceil(speed_print * 50 / 50)
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
wall_thickness = 1

21
resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg Normal file
View File

@ -0,0 +1,21 @@
[general]
version = 2
name = Fast Print
definition = ultimaker3
[metadata]
type = quality
quality_type = fast
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -1
[values]
cool_fan_speed_max = 80
cool_min_speed = 6
layer_height = 0.15
machine_nozzle_cool_down_speed = 0.9
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 55 / 45)
speed_wall = =math.ceil(speed_print * 45 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)

15
resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 2
name = High Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = high
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = 1
[values]
machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature + 2

17
resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
version = 2
name = Normal Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = normal
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = 0
[values]
cool_min_speed = 7
layer_height = 0.1
machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature + 5

16
resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_pc_ultimaker3_AA_0.4
weight = -2
[values]
cool_fan_speed_max = 90
cool_min_speed = 6
layer_height = 0.2

17
resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
version = 2
name = Fast Print
definition = ultimaker3
[metadata]
type = quality
quality_type = fast
material = generic_pc_ultimaker3_AA_0.4
weight = -1
[values]
cool_fan_speed_max = 85
cool_min_speed = 7
infill_overlap = =0
layer_height = 0.15

15
resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 2
name = High Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = high
material = generic_pc_ultimaker3_AA_0.4
weight = 1
[values]
cool_min_speed = 8
material_print_temperature = =default_material_print_temperature - 10

15
resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 2
name = Normal Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = normal
material = generic_pc_ultimaker3_AA_0.4
weight = 0
[values]
layer_height = 0.1
material_print_temperature = =default_material_print_temperature

14
resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_tpu_ultimaker3_AA_0.4
weight = -2
[values]
layer_height = 0.2

15
resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 2
name = Fast Print
definition = ultimaker3
[metadata]
type = quality
quality_type = fast
material = generic_tpu_ultimaker3_AA_0.4
weight = -1
[values]
layer_height = 0.15
retraction_amount = 7

16
resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
version = 2
name = Normal Quality
definition = ultimaker3
[metadata]
type = quality
quality_type = normal
material = generic_tpu_ultimaker3_AA_0.4
weight = 0
[values]
material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =default_material_print_temperature