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

Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-06 09:09:20 +02:00
commit d1eb8231a1
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/LayerPolygon.py
View File

@ -16,7 +16,7 @@ class LayerPolygon:
MoveRetractionType = 9 MoveRetractionType = 9
SupportInterfaceType = 10 SupportInterfaceType = 10
__jump_map = numpy.logical_or( numpy.arange(10) == NoneType, numpy.arange(10) >= MoveCombingType ) __jump_map = numpy.logical_or( numpy.arange(11) == NoneType, numpy.arange(11) >= MoveRetractionType )
def __init__(self, mesh, extruder, line_types, data, line_widths): def __init__(self, mesh, extruder, line_types, data, line_widths):
self._mesh = mesh self._mesh = mesh

2
cura/Settings/MachineManager.py
View File

@ -890,7 +890,7 @@ class MachineManager(QObject):
return containers[0] return containers[0]
# Notify user that we were unable to find a matching quality # Notify user that we were unable to find a matching quality
message = Message(catalog.i18nc("@info:status", "Unable to find a quality profile for this combination, using an empty one instead.")) message = Message(catalog.i18nc("@info:status", "Unable to find a quality profile for this combination. Default settings will be used instead."))
message.show() message.show()
return self._empty_quality_container return self._empty_quality_container

4
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -229,7 +229,7 @@ class CuraEngineBackend(Backend):
if job.getResult() == StartSliceJob.StartJobResult.SettingError: if job.getResult() == StartSliceJob.StartJobResult.SettingError:
if Application.getInstance().getPlatformActivity: if Application.getInstance().getPlatformActivity:
self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. Please check your setting values for errors.")) self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice with the current settings. Please check your settings for errors."))
self._error_message.show() self._error_message.show()
self.backendStateChange.emit(BackendState.Error) self.backendStateChange.emit(BackendState.Error)
else: else:
@ -238,7 +238,7 @@ class CuraEngineBackend(Backend):
if job.getResult() == StartSliceJob.StartJobResult.NothingToSlice: if job.getResult() == StartSliceJob.StartJobResult.NothingToSlice:
if Application.getInstance().getPlatformActivity: if Application.getInstance().getPlatformActivity:
self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. No suitable models found.")) self._error_message = Message(catalog.i18nc("@info:status", "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit."))
self._error_message.show() self._error_message.show()
self.backendStateChange.emit(BackendState.Error) self.backendStateChange.emit(BackendState.Error)
else: else:

1
resources/qml/Cura.qml
View File

@ -346,6 +346,7 @@ UM.MainWindow
bottom: parent.bottom; bottom: parent.bottom;
right: parent.right; right: parent.right;
} }
z: 1
onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint
width: UM.Theme.getSize("sidebar").width; width: UM.Theme.getSize("sidebar").width;
} }