Merge pull request #866 from thopiekar/master-CURA-1445-only

CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
This commit is contained in:
Thomas Karl Pietrowski 2016-07-25 13:42:26 +02:00 committed by GitHub
commit 93a0637b23

View file

@ -10,6 +10,7 @@ from UM.Message import Message
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
from UM.Platform import Platform from UM.Platform import Platform
from UM.Qt.Duration import DurationFormat
import collections import collections
import json import json
@ -90,7 +91,7 @@ class SliceInfo(Extension):
"settings": global_container_stack.serialize(), # global_container with references on used containers "settings": global_container_stack.serialize(), # global_container with references on used containers
"version": Application.getInstance().getVersion(), "version": Application.getInstance().getVersion(),
"modelhash": "None", "modelhash": "None",
"printtime": print_information.currentPrintTime.getDisplayString(), "printtime": print_information.currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601),
"filament": material_used, "filament": material_used,
"language": Preferences.getInstance().getValue("general/language"), "language": Preferences.getInstance().getValue("general/language"),
} }