GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6473 from Ultimaker/CURA-6632_intent_in_stats

Browse Source 
CURA-6632 Add intent into stats
This commit is contained in:
Jaime van Kessel 2019-10-08 16:19:19 +02:00 committed by GitHub
commit 11f9992ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/Settings/GlobalStack.py
View File

@ -131,6 +131,14 @@ class GlobalStack(CuraContainerStack):
return "machine_stack" return "machine_stack"
return configuration_type return configuration_type
def getIntentCategory(self) -> str:
intent_category = "default"
for extruder in self.extruderList:
category = extruder.intent.getMetaDataEntry("intent_category", "default")
if category != "default" and category != intent_category:
intent_category = category
return intent_category
def getBuildplateName(self) -> Optional[str]: def getBuildplateName(self) -> Optional[str]:
name = None name = None
if self.variant.getId() != "empty_variant": if self.variant.getId() != "empty_variant":

8
cura/Settings/MachineManager.py
View File

@ -627,13 +627,7 @@ class MachineManager(QObject):
if not global_container_stack: if not global_container_stack:
return "" return ""
intent_category = "default" return global_container_stack.getIntentCategory()
for extruder in global_container_stack.extruderList:
category = extruder.intent.getMetaDataEntry("intent_category", "default")
if category != "default" and category != intent_category:
intent_category = category
return intent_category
# Provies a list of extruder positions that have a different intent from the active one. # Provies a list of extruder positions that have a different intent from the active one.
@pyqtProperty("QStringList", notify=activeIntentChanged) @pyqtProperty("QStringList", notify=activeIntentChanged)

1
plugins/SliceInfoPlugin/SliceInfo.py
View File

@ -174,6 +174,7 @@ class SliceInfo(QObject, Extension):
extruder_dict["extruder_settings"] = extruder_settings extruder_dict["extruder_settings"] = extruder_settings
data["extruders"].append(extruder_dict) data["extruders"].append(extruder_dict)
data["intent_category"] = global_stack.getIntentCategory()
data["quality_profile"] = global_stack.quality.getMetaData().get("quality_type") data["quality_profile"] = global_stack.quality.getMetaData().get("quality_type")
data["user_modified_setting_keys"] = self._getUserModifiedSettingKeys() data["user_modified_setting_keys"] = self._getUserModifiedSettingKeys()

1
plugins/SliceInfoPlugin/example_data.html
View File

@ -4,6 +4,7 @@
<b>Operating System:</b> Windows 10<br/> <b>Operating System:</b> Windows 10<br/>
<b>Language:</b> en_US<br/> <b>Language:</b> en_US<br/>
<b>Machine Type:</b> Ultimaker S5<br/> <b>Machine Type:</b> Ultimaker S5<br/>
<b>Intent Profile:</b> Default<br/>
<b>Quality Profile:</b> Fast<br/> <b>Quality Profile:</b> Fast<br/>
<b>Using Custom Settings:</b> No <b>Using Custom Settings:</b> No