From 4e6322d94e88b7a1c9c9cb2e91e3908309a9f46c Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 11 Mar 2015 18:10:44 +0100 Subject: [PATCH] Move backend location preference into the backend class and use the new api --- CuraEngineBackend.py | 4 +++- __init__.py | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CuraEngineBackend.py b/CuraEngineBackend.py index 72ad3efcea..70595c69dc 100644 --- a/CuraEngineBackend.py +++ b/CuraEngineBackend.py @@ -17,6 +17,8 @@ class CuraEngineBackend(Backend): def __init__(self): super().__init__() + Preferences.getInstance().addPreference('backend/location', '../PinkUnicornEngine/CuraEngine') + self._scene = Application.getInstance().getController().getScene() self._scene.sceneChanged.connect(self._onSceneChanged) @@ -34,7 +36,7 @@ class CuraEngineBackend(Backend): self._center = None def getEngineCommand(self): - return [Preferences.getPreference("BackendLocation"), '--connect', "127.0.0.1:{0}".format(self._port)] + return [Preferences.getInstance().getValue("backend/location"), '--connect', "127.0.0.1:{0}".format(self._port)] def _onSceneChanged(self, source): if (type(source) is not SceneNode) or (source is self._scene.getRoot()): diff --git a/__init__.py b/__init__.py index 706676c030..7bea4d0113 100644 --- a/__init__.py +++ b/__init__.py @@ -1,8 +1,6 @@ #Shoopdawoop from . import CuraEngineBackend -from UM.Preferences import Preferences - def getMetaData(): return { 'type': 'backend', @@ -12,6 +10,5 @@ def getMetaData(): } def register(app): - Preferences.addPreference("BackendLocation","../PinkUnicornEngine/CuraEngine") return CuraEngineBackend.CuraEngineBackend()