From 463822f10f8cee38b13adc43892dc2731ef8db71 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 16:50:23 +0100 Subject: Fix some typing issues --- cura/Scene/ConvexHullNode.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cura/Scene') diff --git a/cura/Scene/ConvexHullNode.py b/cura/Scene/ConvexHullNode.py index 90bf536308..e485c13304 100644 --- a/cura/Scene/ConvexHullNode.py +++ b/cura/Scene/ConvexHullNode.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional +from typing import Optional, TYPE_CHECKING from UM.Application import Application from UM.Math.Polygon import Polygon @@ -11,6 +11,9 @@ from UM.Math.Color import Color from UM.Mesh.MeshBuilder import MeshBuilder # To create a mesh to display the convex hull with. from UM.View.GL.OpenGL import OpenGL +if TYPE_CHECKING: + from UM.Mesh.MeshData import MeshData + class ConvexHullNode(SceneNode): shader = None # To prevent the shader from being re-built over and over again, only load it once. @@ -43,7 +46,7 @@ class ConvexHullNode(SceneNode): # The node this mesh is "watching" self._node = node - self._convex_hull_head_mesh = None + self._convex_hull_head_mesh = None # type: Optional[MeshData] self._node.decoratorsChanged.connect(self._onNodeDecoratorsChanged) self._onNodeDecoratorsChanged(self._node) -- cgit v1.2.3 From 4f569194ec4212368be13943e59939e22a5223ac Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 8 Nov 2019 17:36:50 +0100 Subject: Add extra typing --- cura/Scene/BuildPlateDecorator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cura/Scene') diff --git a/cura/Scene/BuildPlateDecorator.py b/cura/Scene/BuildPlateDecorator.py index dfb465b7ad..758f79daaa 100644 --- a/cura/Scene/BuildPlateDecorator.py +++ b/cura/Scene/BuildPlateDecorator.py @@ -4,12 +4,12 @@ from cura.Scene.CuraSceneNode import CuraSceneNode ## Make a SceneNode build plate aware CuraSceneNode objects all have this decorator. class BuildPlateDecorator(SceneNodeDecorator): - def __init__(self, build_plate_number = -1): + def __init__(self, build_plate_number: int = -1) -> None: super().__init__() self._build_plate_number = None self.setBuildPlateNumber(build_plate_number) - def setBuildPlateNumber(self, nr): + def setBuildPlateNumber(self, nr: int) -> None: # Make sure that groups are set correctly # setBuildPlateForSelection in CuraActions makes sure that no single childs are set. self._build_plate_number = nr -- cgit v1.2.3 From 896b73f8b31cbcc4b8404e8f6109bdd20a91319a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Nov 2019 08:57:34 +0100 Subject: Fix typing --- cura/Scene/BuildPlateDecorator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cura/Scene') diff --git a/cura/Scene/BuildPlateDecorator.py b/cura/Scene/BuildPlateDecorator.py index 758f79daaa..cff9f88f62 100644 --- a/cura/Scene/BuildPlateDecorator.py +++ b/cura/Scene/BuildPlateDecorator.py @@ -6,7 +6,7 @@ from cura.Scene.CuraSceneNode import CuraSceneNode class BuildPlateDecorator(SceneNodeDecorator): def __init__(self, build_plate_number: int = -1) -> None: super().__init__() - self._build_plate_number = None + self._build_plate_number = build_plate_number self.setBuildPlateNumber(build_plate_number) def setBuildPlateNumber(self, nr: int) -> None: @@ -19,7 +19,7 @@ class BuildPlateDecorator(SceneNodeDecorator): for child in self._node.getChildren(): child.callDecoration("setBuildPlateNumber", nr) - def getBuildPlateNumber(self): + def getBuildPlateNumber(self) -> int: return self._build_plate_number def __deepcopy__(self, memo): -- cgit v1.2.3