3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007

Browse source
This commit is contained in:
Jack Ha 2016-08-24 11:36:10 +02:00
parent 0268bf3f56
commit 9521a85318
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -13,7 +13,6 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
from UM.Mesh.ReadMeshJob import ReadMeshJob from UM.Mesh.ReadMeshJob import ReadMeshJob
from UM.Logger import Logger from UM.Logger import Logger
from UM.Preferences import Preferences from UM.Preferences import Preferences
from UM.Platform import Platform
from UM.JobQueue import JobQueue from UM.JobQueue import JobQueue
from UM.SaveFile import SaveFile from UM.SaveFile import SaveFile
from UM.Scene.Selection import Selection from UM.Scene.Selection import Selection
@ -50,12 +49,12 @@ from PyQt5.QtGui import QColor, QIcon
from PyQt5.QtWidgets import QMessageBox from PyQt5.QtWidgets import QMessageBox
from PyQt5.QtQml import qmlRegisterUncreatableType, qmlRegisterSingletonType, qmlRegisterType from PyQt5.QtQml import qmlRegisterUncreatableType, qmlRegisterSingletonType, qmlRegisterType
import platform
import sys import sys
import os.path import os.path
import numpy import numpy
import copy import copy
import urllib import urllib
numpy.seterr(all="ignore") numpy.seterr(all="ignore")
try: try:
@ -929,5 +928,4 @@ class CuraApplication(QtApplication):
@pyqtSlot(str) @pyqtSlot(str)
def log(self, msg): def log(self, msg):
from UM.Logger import Logger
Logger.log("d", msg) Logger.log("d", msg)

2
resources/qml/Settings/SettingTextField.qml
View file

@ -107,7 +107,7 @@ SettingItem
target: input target: input
property: "text" property: "text"
value: { value: {
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0)) { if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
// We have a resolve function. Indicates that the setting is not settable per extruder and that // We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value // we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this). // (if user has explicitly set this).

2
resources/qml/Settings/SettingView.qml
View file

@ -125,7 +125,7 @@ ScrollView
id: inheritStackProvider id: inheritStackProvider
containerStackId: Cura.MachineManager.activeMachineId containerStackId: Cura.MachineManager.activeMachineId
key: model.key key: model.key
watchedProperties: [ "global_inherits_stack", "value" ] watchedProperties: [ "global_inherits_stack" ]
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider