mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-29 09:38:21 +08:00
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
This commit is contained in:
fieldOfView
commit
6d1a848e40
@ -39,7 +39,7 @@ class ConvexHullJob(Job):
|
||||
mesh = self._node.getMeshData()
|
||||
vertex_data = mesh.getTransformed(self._node.getWorldTransformation()).getVertices()
|
||||
# Don't use data below 0. TODO; We need a better check for this as this gives poor results for meshes with long edges.
|
||||
vertex_data = vertex_data[vertex_data[:,1]>0]
|
||||
vertex_data = vertex_data[vertex_data[:,1] >= 0]
|
||||
hull = Polygon(numpy.rint(vertex_data[:, [0, 2]]).astype(int))
|
||||
|
||||
# First, calculate the normal convex hull around the points
|
||||
|
||||
@ -274,8 +274,8 @@ class CuraEngineBackend(Backend):
|
||||
# There is data and we're not slicing at the moment
|
||||
# if we are slicing, there is no need to re-calculate the data as it will be invalid in a moment.
|
||||
if self._stored_layer_data and not self._slicing:
|
||||
job = ProcessSlicedObjectListJob.ProcessSlicedObjectListJob(self._stored_layer_data)
|
||||
job.start()
|
||||
self._process_layers_job = ProcessSlicedObjectListJob.ProcessSlicedObjectListJob(self._stored_layer_data)
|
||||
self._process_layers_job.start()
|
||||
self._stored_layer_data = None
|
||||
else:
|
||||
self._layer_view_active = False
|
||||
|
||||
@ -95,6 +95,8 @@ class ProcessSlicedObjectListJob(Job):
|
||||
points = points.reshape((-1,2)) # We get a linear list of pairs that make up the points, so make numpy interpret them correctly.
|
||||
|
||||
# Create a new 3D-array, copy the 2D points over and insert the right height.
|
||||
# This uses manual array creation + copy rather than numpy.insert since this is
|
||||
# faster.
|
||||
new_points = numpy.empty((len(points), 3), numpy.float32)
|
||||
new_points[:,0] = points[:,0]
|
||||
new_points[:,1] = layer.height
|
||||
|
||||
@ -225,8 +225,8 @@ class _CreateTopLayersJob(Job):
|
||||
layer_data = None
|
||||
for node in DepthFirstIterator(self._scene.getRoot()):
|
||||
layer_data = node.callDecoration("getLayerData")
|
||||
if not layer_data:
|
||||
continue
|
||||
if layer_data:
|
||||
break
|
||||
|
||||
if self._cancel or not layer_data:
|
||||
return
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"id": "rigidbotbig",
|
||||
"id": "rigidbot",
|
||||
"version": 1,
|
||||
"name": "RigidBot",
|
||||
"manufacturer": "Other",
|
||||
@ -51,7 +51,7 @@
|
||||
"speed_infill": { "default": 100.0, "visible": true },
|
||||
"speed_topbottom": { "default": 15.0, "visible": true },
|
||||
"speed_travel": { "default": 150.0, "visible": true },
|
||||
"speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
|
||||
"speed_layer_0": { "min_value": "0.1", "default": 15.0, "visible": true },
|
||||
"infill_overlap": { "default": 10.0 },
|
||||
"cool_fan_enabled": { "default": false, "visible": true },
|
||||
"cool_fan_speed": { "default": 0.0, "visible": true },
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
"speed_infill": { "default": 100.0, "visible": true },
|
||||
"speed_topbottom": { "default": 15.0, "visible": true },
|
||||
"speed_travel": { "default": 150.0, "visible": true },
|
||||
"speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
|
||||
"speed_layer_0": { "min_value": "0.1", "default": 15.0, "visible": true },
|
||||
"infill_overlap": { "default": 10.0 },
|
||||
"cool_fan_enabled": { "default": false, "visible": true},
|
||||
"cool_fan_speed": { "default": 0.0, "visible": true },
|
||||
|
||||
21534
resources/meshes/prusai3_xl_platform.stl
Normal file
21534
resources/meshes/prusai3_xl_platform.stl
Normal file
File diff suppressed because it is too large
Load Diff
@ -18,9 +18,7 @@ speed_print = 20
|
||||
cool_min_speed = 25
|
||||
line_width = 0.22
|
||||
infill_sparse_density = 22
|
||||
bottom_thickness = 0.72
|
||||
machine_nozzle_size = 0.22
|
||||
top_thickness = 0.72
|
||||
speed_wall_0 = 20
|
||||
cool_min_layer_time = 2
|
||||
cool_lift_head = True
|
||||
|
||||
@ -15,11 +15,9 @@ wall_thickness = 0.7
|
||||
speed_infill = 55
|
||||
speed_topbottom = 30
|
||||
cool_min_layer_time = 3
|
||||
bottom_thickness = 0.75
|
||||
cool_min_speed = 20
|
||||
line_width = 0.35
|
||||
infill_sparse_density = 18
|
||||
top_thickness = 0.75
|
||||
machine_nozzle_size = 0.35
|
||||
speed_travel = 150
|
||||
speed_wall_0 = 30
|
||||
|
||||
@ -18,9 +18,7 @@ adhesion_type = brim
|
||||
cool_min_speed = 20
|
||||
line_width = 0.35
|
||||
infill_sparse_density = 22
|
||||
bottom_thickness = 0.72
|
||||
machine_nozzle_size = 0.35
|
||||
top_thickness = 0.72
|
||||
machine_nozzle_size = 0.35
|
||||
speed_wall_0 = 20
|
||||
cool_min_layer_time = 3
|
||||
cool_lift_head = True
|
||||
|
||||
@ -17,9 +17,7 @@ speed_topbottom = 20
|
||||
adhesion_type = brim
|
||||
cool_min_speed = 20
|
||||
line_width = 0.53
|
||||
bottom_thickness = 1.2
|
||||
machine_nozzle_size = 0.53
|
||||
top_thickness = 1.2
|
||||
speed_wall_0 = 20
|
||||
cool_min_layer_time = 3
|
||||
cool_lift_head = True
|
||||
|
||||
@ -17,9 +17,7 @@ speed_topbottom = 20
|
||||
adhesion_type = brim
|
||||
cool_min_speed = 15
|
||||
line_width = 0.7
|
||||
bottom_thickness = 1.2
|
||||
machine_nozzle_size = 0.7
|
||||
top_thickness = 1.2
|
||||
speed_wall_0 = 20
|
||||
cool_min_layer_time = 3
|
||||
cool_lift_head = True
|
||||
|
||||
@ -18,9 +18,7 @@ cool_min_layer_time = 2
|
||||
speed_print = 20
|
||||
line_width = 0.22
|
||||
infill_sparse_density = 22
|
||||
bottom_thickness = 0.72
|
||||
machine_nozzle_size = 0.22
|
||||
top_thickness = 0.72
|
||||
speed_wall_0 = 20
|
||||
adhesion_type = brim
|
||||
cool_lift_head = True
|
||||
|
||||
@ -19,9 +19,7 @@ speed_topbottom = 20
|
||||
speed_travel = 150
|
||||
line_width = 0.35
|
||||
infill_sparse_density = 18
|
||||
bottom_thickness = 0.75
|
||||
machine_nozzle_size = 0.35
|
||||
top_thickness = 0.75
|
||||
speed_wall_0 = 30
|
||||
adhesion_type = brim
|
||||
cool_lift_head = True
|
||||
|
||||
@ -17,9 +17,7 @@ speed_topbottom = 20
|
||||
adhesion_type = brim
|
||||
line_width = 0.35
|
||||
infill_sparse_density = 22
|
||||
bottom_thickness = 0.72
|
||||
machine_nozzle_size = 0.35
|
||||
top_thickness = 0.72
|
||||
speed_wall_0 = 20
|
||||
cool_min_layer_time = 3
|
||||
cool_lift_head = True
|
||||
|
||||
@ -17,9 +17,7 @@ speed_topbottom = 20
|
||||
cool_min_layer_time = 3
|
||||
speed_print = 20
|
||||
line_width = 0.53
|
||||
bottom_thickness = 1.2
|
||||
machine_nozzle_size = 0.53
|
||||
top_thickness = 1.2
|
||||
speed_wall_0 = 20
|
||||
adhesion_type = brim
|
||||
cool_lift_head = True
|
||||
|
||||
@ -17,9 +17,7 @@ speed_topbottom = 20
|
||||
cool_min_layer_time = 3
|
||||
speed_print = 20
|
||||
line_width = 0.7
|
||||
bottom_thickness = 1.2
|
||||
machine_nozzle_size = 0.7
|
||||
top_thickness = 1.2
|
||||
speed_wall_0 = 20
|
||||
adhesion_type = brim
|
||||
cool_lift_head = True
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user