Просмотр исходного кода

SceneNode settings use native python types

Maël Kerbiriou 2 лет назад
Родитель
Сommit
4b7f18c08c
2 измененных файлов с 3 добавлено и 4 удалено
  1. 1 1
      cura/CuraApplication.py
  2. 2 3
      cura/PlatformPhysics.py

+ 1 - 1
cura/CuraApplication.py

@@ -1445,7 +1445,7 @@ class CuraApplication(QtApplication):
                 bounding_box = node.getBoundingBox()
                 if bounding_box is None or bounding_box.width < self._volume.getBoundingBox().width or bounding_box.depth < self._volume.getBoundingBox().depth:
                     # Arrange only the unlocked nodes and keep the locked ones in place
-                    if UM.Util.parseBool(node.getSetting(SceneNodeSettings.LockPosition)):
+                    if node.getSetting(SceneNodeSettings.LockPosition):
                         locked_nodes.append(node)
                     else:
                         nodes_to_arrange.append(node)

+ 2 - 3
cura/PlatformPhysics.py

@@ -10,7 +10,6 @@ from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
 from UM.Math.Vector import Vector
 from UM.Scene.Selection import Selection
 from UM.Scene.SceneNodeSettings import SceneNodeSettings
-from UM.Util import parseBool
 
 from cura.Scene.ConvexHullDecorator import ConvexHullDecorator
 
@@ -53,7 +52,7 @@ class PlatformPhysics:
 
         app_instance = Application.getInstance()
         app_preferences = app_instance.getPreferences()
-        app_automatic_drop_down = str(app_preferences.getValue("physics/automatic_drop_down"))
+        app_automatic_drop_down = app_preferences.getValue("physics/automatic_drop_down")
         app_automatic_push_free = app_preferences.getValue("physics/automatic_push_free")
 
         root = self._controller.getScene().getRoot()
@@ -81,7 +80,7 @@ class PlatformPhysics:
             # Move it downwards if bottom is above platform
             move_vector = Vector()
 
-            if parseBool(node.getSetting(SceneNodeSettings.AutoDropDown, app_automatic_drop_down)) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down
+            if node.getSetting(SceneNodeSettings.AutoDropDown, app_automatic_drop_down) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down
                 z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
                 move_vector = move_vector.set(y = -bbox.bottom + z_offset)