3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-5204_send_anonymous_data

Browse source
This commit is contained in:
Diego Prado Gesto 2018-04-20 10:35:52 +02:00
commit 4e53f219f0
100 changed files with 4143 additions and 4744 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/CuraApplication.py
View file

@ -501,11 +501,6 @@ class CuraApplication(QtApplication):
def getStaticVersion(cls):
return CuraVersion
## Handle removing the unneeded plugins
# \sa PluginRegistry
def _removePlugins(self):
self._plugin_registry.removePlugins()
## Handle loading of all plugin types (and the backend explicitly)
# \sa PluginRegistry
def _loadPlugins(self):
@ -705,7 +700,7 @@ class CuraApplication(QtApplication):
self._post_start_timer.timeout.connect(self._onPostStart)
self._post_start_timer.start()
Logger.log("d", "Booting Cura took %s seconds", time.time() - self._boot_loading_time)
self.exec_()
def _onPostStart(self):
@ -991,7 +986,7 @@ class CuraApplication(QtApplication):
return self._i18n_catalog.i18nc("@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm.", "%(width).1f x %(depth).1f x %(height).1f mm") % {'width' : self._scene_bounding_box.width.item(), 'depth': self._scene_bounding_box.depth.item(), 'height' : self._scene_bounding_box.height.item()}
def updatePlatformActivityDelayed(self, node = None):
if node is not None and node.getMeshData() is not None:
if node is not None and (node.getMeshData() is not None or node.callDecoration("getLayerData")):
self._update_platform_activity_timer.start()
## Update scene bounding box for current build plate