mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-01 16:24:41 +08:00
Merge remote-tracking branch 'origin/feature_benchmarking'
This commit is contained in:
commit
872a029f99
@ -106,6 +106,7 @@ import copy
|
|||||||
import os
|
import os
|
||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
|
import time
|
||||||
|
|
||||||
|
|
||||||
numpy.seterr(all="ignore")
|
numpy.seterr(all="ignore")
|
||||||
@ -143,6 +144,7 @@ class CuraApplication(QtApplication):
|
|||||||
Q_ENUMS(ResourceTypes)
|
Q_ENUMS(ResourceTypes)
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
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
|
# 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"]:
|
for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
|
||||||
Resources.addExpectedDirNameInData(dir_name)
|
Resources.addExpectedDirNameInData(dir_name)
|
||||||
@ -697,6 +699,7 @@ class CuraApplication(QtApplication):
|
|||||||
|
|
||||||
self.started = True
|
self.started = True
|
||||||
self.initializationFinished.emit()
|
self.initializationFinished.emit()
|
||||||
|
Logger.log("d", "Booting Cura took %s seconds", time.time() - self._boot_loading_time)
|
||||||
self.exec_()
|
self.exec_()
|
||||||
|
|
||||||
initializationFinished = pyqtSignal()
|
initializationFinished = pyqtSignal()
|
||||||
|
@ -609,6 +609,7 @@ class CuraEngineBackend(QObject, Backend):
|
|||||||
|
|
||||||
self._slicing = False
|
self._slicing = False
|
||||||
Logger.log("d", "Slicing took %s seconds", time() - self._slice_start_time )
|
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.
|
# See if we need to process the sliced layers job.
|
||||||
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
||||||
|
Loading…
x
Reference in New Issue
Block a user