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

Fix code style

Browse source
This commit is contained in:
Ghostkeeper 2019-10-10 14:30:39 +02:00
parent 94f1749d58
commit 7b2037fd47
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/AMFReader/AMFReader.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019 fieldOfView # Copyright (c) 2019 fieldOfView, Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
# This AMF parser is based on the AMF parser in legacy cura: # This AMF parser is based on the AMF parser in legacy cura:
@ -39,9 +39,9 @@ class AMFReader(MeshReader):
MimeTypeDatabase.addMimeType( MimeTypeDatabase.addMimeType(
MimeType( MimeType(
name="application/x-amf", name = "application/x-amf",
comment="AMF", comment = "AMF",
suffixes=["amf"] suffixes = ["amf"]
) )
) )
@ -94,7 +94,7 @@ class AMFReader(MeshReader):
if t.tag == "x": if t.tag == "x":
v[0] = float(t.text) * scale v[0] = float(t.text) * scale
elif t.tag == "y": elif t.tag == "y":
v[2] = - float(t.text) * scale v[2] = -float(t.text) * scale
elif t.tag == "z": elif t.tag == "z":
v[1] = float(t.text) * scale v[1] = float(t.text) * scale
amf_mesh_vertices.append(v) amf_mesh_vertices.append(v)
@ -114,7 +114,7 @@ class AMFReader(MeshReader):
f[2] = int(t.text) f[2] = int(t.text)
indices.append(f) indices.append(f)
mesh = trimesh.base.Trimesh(vertices=numpy.array(amf_mesh_vertices, dtype=numpy.float32), faces=numpy.array(indices, dtype=numpy.int32)) mesh = trimesh.base.Trimesh(vertices = numpy.array(amf_mesh_vertices, dtype = numpy.float32), faces = numpy.array(indices, dtype = numpy.int32))
mesh.merge_vertices() mesh.merge_vertices()
mesh.remove_unreferenced_vertices() mesh.remove_unreferenced_vertices()
mesh.fix_normals() mesh.fix_normals()
@ -123,7 +123,7 @@ class AMFReader(MeshReader):
new_node = CuraSceneNode() new_node = CuraSceneNode()
new_node.setSelectable(True) new_node.setSelectable(True)
new_node.setMeshData(mesh_data) new_node.setMeshData(mesh_data)
new_node.setName(base_name if len(nodes)==0 else "%s %d" % (base_name, len(nodes))) new_node.setName(base_name if len(nodes) == 0 else "%s %d" % (base_name, len(nodes)))
new_node.addDecorator(BuildPlateDecorator(CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate)) new_node.addDecorator(BuildPlateDecorator(CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate))
new_node.addDecorator(SliceableObjectDecorator()) new_node.addDecorator(SliceableObjectDecorator())
@ -165,9 +165,9 @@ class AMFReader(MeshReader):
indices.append(face) indices.append(face)
face_count += 1 face_count += 1
vertices = numpy.asarray(vertices, dtype=numpy.float32) vertices = numpy.asarray(vertices, dtype = numpy.float32)
indices = numpy.asarray(indices, dtype=numpy.int32) indices = numpy.asarray(indices, dtype = numpy.int32)
normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count) normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count)
mesh_data = MeshData(vertices=vertices, indices=indices, normals=normals) mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals)
return mesh_data return mesh_data