GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 23:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
fieldOfView 2016-08-25 17:07:45 +02:00
commit 9f2c5a4c92
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View File

@ -239,7 +239,6 @@ class MachineManager(QObject):
self.activeQualityChanged.emit() self.activeQualityChanged.emit()
def _onPropertyChanged(self, key, property_name): def _onPropertyChanged(self, key, property_name):
# HACK CURA-2173
if property_name == "value": if property_name == "value":
# If a setting is not settable per extruder but at the same time settable per mesh, the engine needs a value in the extruder stack # If a setting is not settable per extruder but at the same time settable per mesh, the engine needs a value in the extruder stack
# This is mainly the case for the "support_enable" setting. # This is mainly the case for the "support_enable" setting.
@ -250,7 +249,6 @@ class MachineManager(QObject):
for extruder_stack in stacks: for extruder_stack in stacks:
if extruder_stack.getProperty(key, "value") != new_value: if extruder_stack.getProperty(key, "value") != new_value:
extruder_stack.getTop().setProperty(key, "value", new_value) extruder_stack.getTop().setProperty(key, "value", new_value)
# /HACK
if property_name == "validationState": if property_name == "validationState":
if self._active_stack_valid: if self._active_stack_valid:

4
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -207,6 +207,9 @@ class CuraEngineBackend(Backend):
except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this.
Logger.log("d", "Exception occurred while trying to kill the engine %s", str(e)) Logger.log("d", "Exception occurred while trying to kill the engine %s", str(e))
else:
# Process is none, but something did went wrong here. Try and re-create the socket
self._createSocket()
## Event handler to call when the job to initiate the slicing process is ## Event handler to call when the job to initiate the slicing process is
# completed. # completed.
@ -387,7 +390,6 @@ class CuraEngineBackend(Backend):
# \param tool The tool that the user was using. # \param tool The tool that the user was using.
def _onToolOperationStopped(self, tool): def _onToolOperationStopped(self, tool):
self._enabled = True # Tool stop, start listening for changes again. self._enabled = True # Tool stop, start listening for changes again.
self._terminate()
## Called when the user changes the active view mode. ## Called when the user changes the active view mode.
def _onActiveViewChanged(self): def _onActiveViewChanged(self):

2
plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
View File

@ -99,7 +99,7 @@ class RemovableDriveOutputDevice(OutputDevice):
self._writing = False self._writing = False
self.writeFinished.emit(self) self.writeFinished.emit(self)
if job.getResult(): if job.getResult():
message = Message(catalog.i18nc("@info:status", "Saved to Removable Drive {0} as {1}").format(self.getName(), os.path.basename(job.getFileName()))) message = Message(catalog.i18nc("@info:status", "Saved to Removable Drive {0} as {1}").format(self.getName(), os.path.basename(job.getFileName())), lifetime = 0)
message.addAction("eject", catalog.i18nc("@action:button", "Eject"), "eject", catalog.i18nc("@action", "Eject removable device {0}").format(self.getName())) message.addAction("eject", catalog.i18nc("@action:button", "Eject"), "eject", catalog.i18nc("@action", "Eject removable device {0}").format(self.getName()))
message.actionTriggered.connect(self._onActionTriggered) message.actionTriggered.connect(self._onActionTriggered)
message.show() message.show()