mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 16:27:51 -06:00
Removed old perobject setting code, so plugin is actually loaded (instead of crashing)
CURA-1278
This commit is contained in:
parent
846dbc881e
commit
bcff683fb0
3 changed files with 16 additions and 15 deletions
|
@ -7,8 +7,8 @@ from UM.Application import Application
|
||||||
from UM.Qt.ListModel import ListModel
|
from UM.Qt.ListModel import ListModel
|
||||||
from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
|
from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
|
||||||
from UM.Scene.SceneNode import SceneNode
|
from UM.Scene.SceneNode import SceneNode
|
||||||
from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
|
#from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
|
||||||
from UM.Settings.ProfileOverrideDecorator import ProfileOverrideDecorator
|
#from UM.Settings.ProfileOverrideDecorator import ProfileOverrideDecorator
|
||||||
|
|
||||||
from . import SettingOverrideModel
|
from . import SettingOverrideModel
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class PerObjectSettingsModel(ListModel):
|
||||||
self.setProperty(self.find("id", object_id), "profile", profile_name)
|
self.setProperty(self.find("id", object_id), "profile", profile_name)
|
||||||
|
|
||||||
profile = None
|
profile = None
|
||||||
if profile_name != "global":
|
'''if profile_name != "global":
|
||||||
profile = Application.getInstance().getMachineManager().findProfile(profile_name)
|
profile = Application.getInstance().getMachineManager().findProfile(profile_name)
|
||||||
|
|
||||||
node = self._scene.findObject(object_id)
|
node = self._scene.findObject(object_id)
|
||||||
|
@ -45,7 +45,7 @@ class PerObjectSettingsModel(ListModel):
|
||||||
node.callDecoration("setProfile", profile)
|
node.callDecoration("setProfile", profile)
|
||||||
else:
|
else:
|
||||||
if node.getDecorator(ProfileOverrideDecorator):
|
if node.getDecorator(ProfileOverrideDecorator):
|
||||||
node.removeDecorator(ProfileOverrideDecorator)
|
node.removeDecorator(ProfileOverrideDecorator)'''
|
||||||
|
|
||||||
@pyqtSlot("quint64", str)
|
@pyqtSlot("quint64", str)
|
||||||
def addSettingOverride(self, object_id, key):
|
def addSettingOverride(self, object_id, key):
|
||||||
|
@ -54,8 +54,8 @@ class PerObjectSettingsModel(ListModel):
|
||||||
return
|
return
|
||||||
|
|
||||||
node = self._scene.findObject(object_id)
|
node = self._scene.findObject(object_id)
|
||||||
if not node.getDecorator(SettingOverrideDecorator):
|
#if not node.getDecorator(SettingOverrideDecorator):
|
||||||
node.addDecorator(SettingOverrideDecorator())
|
# node.addDecorator(SettingOverrideDecorator())
|
||||||
|
|
||||||
node.callDecoration("addSetting", key)
|
node.callDecoration("addSetting", key)
|
||||||
|
|
||||||
|
@ -64,8 +64,8 @@ class PerObjectSettingsModel(ListModel):
|
||||||
node = self._scene.findObject(object_id)
|
node = self._scene.findObject(object_id)
|
||||||
node.callDecoration("removeSetting", key)
|
node.callDecoration("removeSetting", key)
|
||||||
|
|
||||||
if len(node.callDecoration("getAllSettings")) == 0:
|
#if len(node.callDecoration("getAllSettings")) == 0:
|
||||||
node.removeDecorator(SettingOverrideDecorator)
|
# node.removeDecorator(SettingOverrideDecorator)
|
||||||
|
|
||||||
def _updateModel(self):
|
def _updateModel(self):
|
||||||
self.clear()
|
self.clear()
|
||||||
|
|
|
@ -5,7 +5,7 @@ from PyQt5.QtCore import Qt, pyqtSlot, QUrl
|
||||||
|
|
||||||
from UM.Application import Application
|
from UM.Application import Application
|
||||||
from UM.Qt.ListModel import ListModel
|
from UM.Qt.ListModel import ListModel
|
||||||
from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
|
#from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
|
||||||
|
|
||||||
class SettingOverrideModel(ListModel):
|
class SettingOverrideModel(ListModel):
|
||||||
KeyRole = Qt.UserRole + 1
|
KeyRole = Qt.UserRole + 1
|
||||||
|
@ -29,9 +29,9 @@ class SettingOverrideModel(ListModel):
|
||||||
self._node.decoratorsChanged.connect(self._onDecoratorsChanged)
|
self._node.decoratorsChanged.connect(self._onDecoratorsChanged)
|
||||||
self._onDecoratorsChanged(None)
|
self._onDecoratorsChanged(None)
|
||||||
|
|
||||||
self._activeProfile = Application.getInstance().getMachineManager().getWorkingProfile() #To be able to get notified when a setting changes.
|
#self._activeProfile = Application.getInstance().getMachineManager().getWorkingProfile() #To be able to get notified when a setting changes.
|
||||||
self._activeProfile.settingValueChanged.connect(self._onProfileSettingValueChanged)
|
#self._activeProfile.settingValueChanged.connect(self._onProfileSettingValueChanged)
|
||||||
Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onProfileChanged)
|
#Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onProfileChanged)
|
||||||
|
|
||||||
self.addRoleName(self.KeyRole, "key")
|
self.addRoleName(self.KeyRole, "key")
|
||||||
self.addRoleName(self.LabelRole, "label")
|
self.addRoleName(self.LabelRole, "label")
|
||||||
|
@ -53,7 +53,8 @@ class SettingOverrideModel(ListModel):
|
||||||
self._decorator.setSettingValue(key, value)
|
self._decorator.setSettingValue(key, value)
|
||||||
|
|
||||||
def _onDecoratorsChanged(self, node):
|
def _onDecoratorsChanged(self, node):
|
||||||
if not self._node.getDecorator(SettingOverrideDecorator):
|
return
|
||||||
|
'''if not self._node.getDecorator(SettingOverrideDecorator):
|
||||||
self.clear()
|
self.clear()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -61,7 +62,7 @@ class SettingOverrideModel(ListModel):
|
||||||
self._decorator.settingAdded.connect(self._onSettingsChanged)
|
self._decorator.settingAdded.connect(self._onSettingsChanged)
|
||||||
self._decorator.settingRemoved.connect(self._onSettingsChanged)
|
self._decorator.settingRemoved.connect(self._onSettingsChanged)
|
||||||
self._decorator.settingValueChanged.connect(self._onSettingValueChanged)
|
self._decorator.settingValueChanged.connect(self._onSettingValueChanged)
|
||||||
self._onSettingsChanged()
|
self._onSettingsChanged()'''
|
||||||
|
|
||||||
def _createOptionsModel(self, options):
|
def _createOptionsModel(self, options):
|
||||||
if not options:
|
if not options:
|
||||||
|
|
|
@ -13,7 +13,7 @@ def getMetaData():
|
||||||
"author": "Ultimaker",
|
"author": "Ultimaker",
|
||||||
"version": "1.0",
|
"version": "1.0",
|
||||||
"description": i18n_catalog.i18nc("@info:whatsthis", "Provides the Per Object Settings."),
|
"description": i18n_catalog.i18nc("@info:whatsthis", "Provides the Per Object Settings."),
|
||||||
"api": 2
|
"api": 3
|
||||||
},
|
},
|
||||||
"tool": {
|
"tool": {
|
||||||
"name": i18n_catalog.i18nc("@label", "Per Object Settings"),
|
"name": i18n_catalog.i18nc("@label", "Per Object Settings"),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue