3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '15.10'

Browse source 
* 15.10:
  Properly clear stored layer data
  Render SupportInfillType so support is rendered correctly again.
  Fix issues with crash handler and log file creation on Windows
  Bump version
  Make the UMO upgrade selection page work properly
  Update preference dialog to the changed API
  Disable crash handler if debug mode is not enabled
  Prevent crashes when centering an object
  Also disable output device selection when main save button is disabled
  Fix name of Low Quality profile
  Fix stdout/stderr output location so we do not output to UM but to cura
This commit is contained in:
Arjen Hiemstra 2015-10-06 12:21:09 +02:00
commit ae3705514f
10 changed files with 70 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cura/CuraApplication.py
View file

@ -68,7 +68,7 @@ class CuraApplication(QtApplication):
if not hasattr(sys, "frozen"):
Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
super().__init__(name = "cura", version = "15.09.85")
super().__init__(name = "cura", version = "15.09.90")
self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))
@ -132,6 +132,7 @@ class CuraApplication(QtApplication):
def addCommandLineOptions(self, parser):
super().addCommandLineOptions(parser)
parser.add_argument("file", nargs="*", help="Files to load after starting the application.")
parser.add_argument("--debug", dest="debug-mode", action="store_true", default=False, help="Enable detailed crash reports.")
def run(self):
self._i18n_catalog = i18nCatalog("cura");
@ -259,16 +260,16 @@ class CuraApplication(QtApplication):
## Remove an object from the scene
@pyqtSlot("quint64")
def deleteObject(self, object_id):
object = self.getController().getScene().findObject(object_id)
node = self.getController().getScene().findObject(object_id)
if not object and object_id != 0: #Workaround for tool handles overlapping the selected object
object = Selection.getSelectedObject(0)
if object:
if object.getParent():
group_node = object.getParent()
if not node and object_id != 0: #Workaround for tool handles overlapping the selected object
node = Selection.getSelectedObject(0)
if node:
if node.getParent():
group_node = node.getParent()
if not group_node.callDecoration("isGroup"):
op = RemoveSceneNodeOperation(object)
op = RemoveSceneNodeOperation(node)
else:
while group_node.getParent().callDecoration("isGroup"):
group_node = group_node.getParent()
@ -302,10 +303,15 @@ class CuraApplication(QtApplication):
@pyqtSlot("quint64")
def centerObject(self, object_id):
node = self.getController().getScene().findObject(object_id)
if node.getParent() and node.getParent().callDecoration("isGroup"):
node = node.getParent()
if not node and object_id != 0: #Workaround for tool handles overlapping the selected object
node = Selection.getSelectedObject(0)
if not node:
return
if node.getParent() and node.getParent().callDecoration("isGroup"):
node = node.getParent()
if node:
op = SetTransformOperation(node, Vector())
op.push()