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

Codestyle & removal unused imports

Browse Source
This commit is contained in:
Jaime van Kessel 2017-03-22 11:38:55 +01:00
parent 808df4c228
commit 94c6b23418
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cura/Layer.py
View File

@ -1,10 +1,8 @@
from .LayerPolygon import LayerPolygon
from UM.Math.Vector import Vector
from UM.Mesh.MeshBuilder import MeshBuilder from UM.Mesh.MeshBuilder import MeshBuilder
import numpy import numpy
class Layer: class Layer:
def __init__(self, layer_id): def __init__(self, layer_id):
self._id = layer_id self._id = layer_id
@ -80,8 +78,7 @@ class Layer:
else: else:
for polygon in self._polygons: for polygon in self._polygons:
line_count += polygon.jumpCount line_count += polygon.jumpCount
# Reserve the neccesary space for the data upfront # Reserve the neccesary space for the data upfront
builder.reserveFaceAndVertexCount(2 * line_count, 4 * line_count) builder.reserveFaceAndVertexCount(2 * line_count, 4 * line_count)
@ -94,7 +91,7 @@ class Layer:
# Line types of the points we want to draw # Line types of the points we want to draw
line_types = polygon.types[index_mask] line_types = polygon.types[index_mask]
# Shift the z-axis according to previous implementation. # Shift the z-axis according to previous implementation.
if make_mesh: if make_mesh:
points[polygon.isInfillOrSkinType(line_types), 1::3] -= 0.01 points[polygon.isInfillOrSkinType(line_types), 1::3] -= 0.01
else: else:
@ -106,13 +103,14 @@ class Layer:
# Scale all normals by the line width of the current line so we can easily offset. # Scale all normals by the line width of the current line so we can easily offset.
normals *= (polygon.lineWidths[index_mask.ravel()] / 2) normals *= (polygon.lineWidths[index_mask.ravel()] / 2)
# Create 4 points to draw each line segment, points +- normals results in 2 points each. Reshape to one point per line # Create 4 points to draw each line segment, points +- normals results in 2 points each.
# After this we reshape to one point per line.
f_points = numpy.concatenate((points-normals, points+normals), 1).reshape((-1, 3)) f_points = numpy.concatenate((points-normals, points+normals), 1).reshape((-1, 3))
# __index_pattern defines which points to use to draw the two faces for each lines egment, the following linesegment is offset by 4
# __index_pattern defines which points to use to draw the two faces for each lines egment, the following linesegment is offset by 4
f_indices = ( self.__index_pattern + numpy.arange(0, 4 * len(normals), 4, dtype=numpy.int32).reshape((-1, 1)) ).reshape((-1, 3)) f_indices = ( self.__index_pattern + numpy.arange(0, 4 * len(normals), 4, dtype=numpy.int32).reshape((-1, 1)) ).reshape((-1, 3))
f_colors = numpy.repeat(polygon.mapLineTypeToColor(line_types), 4, 0) f_colors = numpy.repeat(polygon.mapLineTypeToColor(line_types), 4, 0)
builder.addFacesWithColor(f_points, f_indices, f_colors) builder.addFacesWithColor(f_points, f_indices, f_colors)
return builder.build() return builder.build()

3
cura/LayerData.py
View File

@ -2,11 +2,12 @@
# Cura is released under the terms of the AGPLv3 or higher. # Cura is released under the terms of the AGPLv3 or higher.
from UM.Mesh.MeshData import MeshData from UM.Mesh.MeshData import MeshData
## Class to holds the layer mesh and information about the layers. ## Class to holds the layer mesh and information about the layers.
# Immutable, use LayerDataBuilder to create one of these. # Immutable, use LayerDataBuilder to create one of these.
class LayerData(MeshData): class LayerData(MeshData):
def __init__(self, vertices = None, normals = None, indices = None, colors = None, uvs = None, file_name = None, def __init__(self, vertices = None, normals = None, indices = None, colors = None, uvs = None, file_name = None,
center_position = None, layers=None, element_counts=None, attributes=None): center_position = None, layers=None, element_counts=None, attributes=None):
super().__init__(vertices=vertices, normals=normals, indices=indices, colors=colors, uvs=uvs, super().__init__(vertices=vertices, normals=normals, indices=indices, colors=colors, uvs=uvs,
file_name=file_name, center_position=center_position, attributes=attributes) file_name=file_name, center_position=center_position, attributes=attributes)
self._layers = layers self._layers = layers

1
cura/LayerDataBuilder.py
View File

@ -8,6 +8,7 @@ from .LayerData import LayerData
import numpy import numpy
## Builder class for constructing a LayerData object ## Builder class for constructing a LayerData object
class LayerDataBuilder(MeshBuilder): class LayerDataBuilder(MeshBuilder):
def __init__(self): def __init__(self):