GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 18:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict in print information - CURA-4581

Browse Source
This commit is contained in:
Aleksei S 2017-11-17 15:22:29 +01:00 committed by ChrisTerBeke
parent 6d2bcd9b3e
commit 571ebccb89
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/PrintInformation.py
View File

@ -308,8 +308,11 @@ class PrintInformation(QObject):
# name is "" when I first had some meshes and afterwards I deleted them so the naming should start again # name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
is_empty = name == "" is_empty = name == ""
if is_empty or (self._base_name == "" and self._base_name != name): if is_empty or (self._base_name == "" and self._base_name != name):
# remove ".curaproject" suffix from (imported) the file name
if name.endswith(".curaproject"):
name = name[:name.rfind(".curaproject")]
self._base_name = name self._base_name = name
self._updateJobName( empty_name = is_empty) self._updateJobName(empty_name = is_empty)
## Created an acronymn-like abbreviated machine name from the currently active machine name ## Created an acronymn-like abbreviated machine name from the currently active machine name
# Called each time the global stack is switched # Called each time the global stack is switched