Merge remote-tracking branch 'origin/feature_benchmarking'

This commit is contained in:
Lipu Fei 2018-04-06 10:47:00 +02:00
commit 872a029f99
2 changed files with 4 additions and 0 deletions

View File

@ -106,6 +106,7 @@ import copy
import os
import argparse
import json
import time
numpy.seterr(all="ignore")
@ -143,6 +144,7 @@ class CuraApplication(QtApplication):
Q_ENUMS(ResourceTypes)
def __init__(self, **kwargs):
self._boot_loading_time = time.time()
# this list of dir names will be used by UM to detect an old cura directory
for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
Resources.addExpectedDirNameInData(dir_name)
@ -697,6 +699,7 @@ class CuraApplication(QtApplication):
self.started = True
self.initializationFinished.emit()
Logger.log("d", "Booting Cura took %s seconds", time.time() - self._boot_loading_time)
self.exec_()
initializationFinished = pyqtSignal()

View File

@ -609,6 +609,7 @@ class CuraEngineBackend(QObject, Backend):
self._slicing = False
Logger.log("d", "Slicing took %s seconds", time() - self._slice_start_time )
Logger.log("d", "Number of models per buildplate: %s", dict(self._numObjectsPerBuildPlate()))
# See if we need to process the sliced layers job.
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate