From 62487e8ea2dc3603bffaa76989b79179342d46ee Mon Sep 17 00:00:00 2001
From: Jack Ha <jackha@gmail.com>
Date: Wed, 3 Jan 2018 15:41:08 +0100
Subject: [PATCH] CURA-4525 cleanups and change comment and added new-lines

---
 cura/Operations/SetBuildPlateNumberOperation.py     |  2 +-
 plugins/CuraEngineBackend/CuraEngineBackend.py      | 13 -------------
 plugins/CuraEngineBackend/ProcessSlicedLayersJob.py |  2 --
 plugins/CuraEngineBackend/StartSliceJob.py          |  1 -
 plugins/ImageReader/ImageReader.py                  |  1 -
 plugins/X3DReader/X3DReader.py                      |  1 -
 resources/qml/Menus/ContextMenu.qml                 |  2 ++
 7 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/cura/Operations/SetBuildPlateNumberOperation.py b/cura/Operations/SetBuildPlateNumberOperation.py
index bbef4caf84..c14d737f93 100644
--- a/cura/Operations/SetBuildPlateNumberOperation.py
+++ b/cura/Operations/SetBuildPlateNumberOperation.py
@@ -6,7 +6,7 @@ from UM.Operations.Operation import Operation
 
 from cura.Settings.SettingOverrideDecorator import SettingOverrideDecorator
 
-##  Simple operation to set the extruder a certain object should be printed with.
+##  Simple operation to set the buildplate number of a scenenode.
 class SetBuildPlateNumberOperation(Operation):
     def __init__(self, node: SceneNode, build_plate_nr: int) -> None:
         self._node = node
diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index 473dbee31a..74dd515951 100755
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -357,19 +357,6 @@ class CuraEngineBackend(QObject, Backend):
             else:
                 self.backendStateChange.emit(BackendState.NotStarted)
 
-        # Doesn't occur anymore, is handled in slice()
-        # if job.getResult() == StartSliceJob.StartJobResult.NothingToSlice:
-        #     if Application.getInstance().platformActivity:
-        #         self._error_message = Message(catalog.i18nc("@info:status", "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit."),
-        #                                       title = catalog.i18nc("@info:title", "Unable to slice"))
-        #         self._error_message.show()
-        #         #self.backendStateChange.emit(BackendState.Error)
-        #     else:
-        #         #self.backendStateChange.emit(BackendState.NotStarted)
-        #         pass
-        #     self._invokeSlice()
-        #     return
-
         # Preparation completed, send it to the backend.
         self._socket.sendMessage(job.getSliceMessage())
 
diff --git a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
index 5f632768ec..be9c3f73f0 100644
--- a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
+++ b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
@@ -4,7 +4,6 @@
 import gc
 
 from UM.Job import Job
-from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 from UM.Scene.SceneNode import SceneNode
 from UM.Application import Application
 from UM.Mesh.MeshData import MeshData
@@ -22,7 +21,6 @@ from cura.Settings.ExtruderManager import ExtruderManager
 from cura import LayerDataBuilder
 from cura import LayerDataDecorator
 from cura import LayerPolygon
-# from cura.Scene.CuraSceneNode import CuraSceneNode
 
 import numpy
 from time import time
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 9a61c4c8a2..a9618c5472 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -10,7 +10,6 @@ from UM.Job import Job
 from UM.Application import Application
 from UM.Logger import Logger
 
-#from UM.Scene.SceneNode import SceneNode
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 
 from UM.Settings.Validator import ValidatorState
diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py
index 2529abf2d8..3a98abccf5 100644
--- a/plugins/ImageReader/ImageReader.py
+++ b/plugins/ImageReader/ImageReader.py
@@ -8,7 +8,6 @@ from PyQt5.QtCore import Qt
 
 from UM.Mesh.MeshReader import MeshReader
 from UM.Mesh.MeshBuilder import MeshBuilder
-#from UM.Scene.SceneNode import SceneNode
 from UM.Math.Vector import Vector
 from UM.Job import Job
 from UM.Logger import Logger
diff --git a/plugins/X3DReader/X3DReader.py b/plugins/X3DReader/X3DReader.py
index 883ed7b0b6..b0b9e00a5b 100644
--- a/plugins/X3DReader/X3DReader.py
+++ b/plugins/X3DReader/X3DReader.py
@@ -11,7 +11,6 @@ from UM.Math.Matrix import Matrix
 from UM.Math.Vector import Vector
 from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Mesh.MeshReader import MeshReader
-#from UM.Scene.SceneNode import SceneNode
 from cura.Scene.CuraSceneNode import CuraSceneNode as SceneNode
 
 MYPY = False
diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml
index 910f0a951a..1a4b421572 100644
--- a/resources/qml/Menus/ContextMenu.qml
+++ b/resources/qml/Menus/ContextMenu.qml
@@ -42,6 +42,7 @@ Menu
     MenuSeparator {
         visible: UM.Preferences.getValue("cura/use_multi_build_plate")
     }
+
     Instantiator
     {
         model: Cura.BuildPlateModel
@@ -55,6 +56,7 @@ Menu
         onObjectAdded: base.insertItem(index, object);
         onObjectRemoved: base.removeItem(object);
     }
+
     MenuItem {
         text: "New build plate";
         onTriggered: {