Merge branch 'master' of github.com:Ultimaker/cura

This commit is contained in:
Aleksei S 2018-02-05 17:06:11 +01:00
commit 1701cbd011
33 changed files with 2012 additions and 2243 deletions

View file

@ -540,6 +540,8 @@ class CuraEngineBackend(QObject, Backend):
#
# \param message The protobuf message containing sliced layer data.
def _onOptimizedLayerMessage(self, message):
if self._start_slice_job_build_plate not in self._stored_optimized_layer_data:
self._stored_optimized_layer_data[self._start_slice_job_build_plate] = []
self._stored_optimized_layer_data[self._start_slice_job_build_plate].append(message)
## Called when a progress message is received from the engine.

View file

@ -287,7 +287,6 @@ class PluginBrowser(QObject, Extension):
@pyqtProperty(QObject, notify=pluginsMetadataChanged)
def pluginsModel(self):
print("Updating plugins model...", self._view)
self._plugins_model = PluginsModel(self._view)
# self._plugins_model.update()
@ -367,7 +366,6 @@ class PluginBrowser(QObject, Extension):
# Add metadata to the manager:
self._plugins_metadata = json_data
print(self._plugins_metadata)
self._plugin_registry.addExternalPlugins(self._plugins_metadata)
self.pluginsMetadataChanged.emit()
except json.decoder.JSONDecodeError:

View file

@ -164,7 +164,7 @@ Component {
Button {
id: removeButton
text: "Uninstall"
visible: model.external && model.status == "installed"
visible: model.can_uninstall && model.status == "installed"
enabled: !manager.isDownloading
style: ButtonStyle {
background: Rectangle {

View file

@ -23,7 +23,7 @@ class UFPWriter(MeshWriter):
def _createSnapshot(self, *args):
# must be called from the main thread because of OpenGL
Logger.log("d", "Creating thumbnail image...")
self._snapshot = Snapshot.snapshot()
self._snapshot = Snapshot.snapshot(width = 300, height = 300)
def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode):
archive = VirtualFile()