Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension

CURA-5570 More decision points in material and quality lookup!
This commit is contained in:
Diego Prado Gesto 2018-08-13 12:06:29 +02:00 committed by GitHub
commit 152005ab14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 790 additions and 241 deletions

View file

@ -118,11 +118,12 @@ if TYPE_CHECKING:
numpy.seterr(all = "ignore")
try:
from cura.CuraVersion import CuraVersion, CuraBuildType, CuraDebugMode
from cura.CuraVersion import CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion
except ImportError:
CuraVersion = "master" # [CodeStyle: Reflecting imported value]
CuraBuildType = ""
CuraDebugMode = False
CuraSDKVerion = ""
class CuraApplication(QtApplication):
@ -913,6 +914,7 @@ class CuraApplication(QtApplication):
engine.rootContext().setContextProperty("CuraApplication", self)
engine.rootContext().setContextProperty("PrintInformation", self._print_information)
engine.rootContext().setContextProperty("CuraActions", self._cura_actions)
engine.rootContext().setContextProperty("CuraSDKVersion", CuraSDKVersion)
qmlRegisterUncreatableType(CuraApplication, "Cura", 1, 0, "ResourceTypes", "Just an Enum type")