mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-01 06:41:06 -07:00
Merge branch '4.1'
This commit is contained in:
Ghostkeeper
commit
154efdf14d
13 changed files with 315 additions and 199 deletions
|
|
@ -71,7 +71,7 @@ Window
|
|||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
text: catalog.i18nc("@text:window", "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent.")
|
||||
text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is sent:")
|
||||
wrapMode: Text.WordWrap
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
|
@ -89,6 +89,8 @@ Window
|
|||
}
|
||||
|
||||
textArea.text: manager.getExampleData()
|
||||
textArea.textFormat: Text.RichText
|
||||
textArea.wrapMode: Text.Wrap
|
||||
textArea.readOnly: true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class SliceInfo(QObject, Extension):
|
|||
if not plugin_path:
|
||||
Logger.log("e", "Could not get plugin path!", self.getPluginId())
|
||||
return None
|
||||
file_path = os.path.join(plugin_path, "example_data.json")
|
||||
file_path = os.path.join(plugin_path, "example_data.html")
|
||||
if file_path:
|
||||
with open(file_path, "r", encoding = "utf-8") as f:
|
||||
self._example_data_content = f.read()
|
||||
|
|
|
|||
65
plugins/SliceInfoPlugin/example_data.html
Normal file
65
plugins/SliceInfoPlugin/example_data.html
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
<html>
|
||||
<body>
|
||||
<b>Cura Version:</b> 4.0<br/>
|
||||
<b>Operating System:</b> Windows 10<br/>
|
||||
<b>Language:</b> en_US<br/>
|
||||
<b>Machine Type:</b> Ultimaker S5<br/>
|
||||
<b>Quality Profile:</b> Fast<br/>
|
||||
<b>Using Custom Settings:</b> No
|
||||
|
||||
<h3>Extruder 1:</h3>
|
||||
<ul>
|
||||
<li><b>Material Type:</b> PLA</li>
|
||||
<li><b>Print Core:</b> AA 0.4</li>
|
||||
<li><b>Material Used:</b> 1240 mm</li>
|
||||
</ul>
|
||||
|
||||
<h3>Extruder 2:</h3>
|
||||
<ul>
|
||||
<li><b>Material Type:</b> PVA</li>
|
||||
<li><b>Print Core:</b> BB 0.4</li>
|
||||
<li><b>Material Used:</b> 432 mm</li>
|
||||
</ul>
|
||||
|
||||
<h3>Print Settings:</h3>
|
||||
<ul>
|
||||
<li><b>Layer Height:</b> 0.15</li>
|
||||
<li><b>Wall Line Count:</b> 3</li>
|
||||
<li><b>Enable Retraction:</b> no</li>
|
||||
<li><b>Infill Density:</b> 20%</li>
|
||||
<li><b>Infill Pattern:</b> triangles</li>
|
||||
<li><b>Gradual Infill Steps:</b> 0</li>
|
||||
<li><b>Printing Temperature:</b> 220 °C</li>
|
||||
<li><b>Generate Support:</b> yes</li>
|
||||
<li><b>Support Extruder:</b> 1</li>
|
||||
<li><b>Build Plate Adhesion Type:</b> brim</li>
|
||||
<li><b>Enable Prime Tower:</b> yes</li>
|
||||
<li><b>Print Sequence:</b> All at once</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
|
||||
<h3>Model Information:</h3>
|
||||
<ul>
|
||||
<li>
|
||||
<b>Model 1</b>
|
||||
<ul>
|
||||
<li><b>Hash:</b> b72789b9b...</li>
|
||||
<li><b>Transformation:</b> [transformation matrix]</li>
|
||||
<li><b>Bounding Box:</b> [minimum x, y, z; maximum x, y, z]</li>
|
||||
<li><b>Is Helper Mesh:</b> no</li>
|
||||
<li><b>Helper Mesh Type:</b> support mesh</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h3>Print Times:</h3>
|
||||
<ul>
|
||||
<li>Infill: 61200 sec.</li>
|
||||
<li>Support: 25480 sec.</li>
|
||||
<li>Travel: 6224 sec.</li>
|
||||
<li>Walls: 10225 sec.</li>
|
||||
<li>Total: 103129 sec.</li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
{
|
||||
"time_stamp": 1523973715.486928,
|
||||
"schema_version": 0,
|
||||
"cura_version": "3.3",
|
||||
"active_mode": "custom",
|
||||
"machine_settings_changed_by_user": true,
|
||||
"language": "en_US",
|
||||
"os": {
|
||||
"type": "Linux",
|
||||
"version": "#43~16.04.1-Ubuntu SMP Wed Mar 14 17:48:43 UTC 2018"
|
||||
},
|
||||
"active_machine": {
|
||||
"definition_id": "ultimaker3",
|
||||
"manufacturer": "Ultimaker B.V."
|
||||
},
|
||||
"extruders": [
|
||||
{
|
||||
"active": true,
|
||||
"material": {
|
||||
"GUID": "506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9",
|
||||
"type": "PLA",
|
||||
"brand": "Generic"
|
||||
},
|
||||
"material_used": 0.84,
|
||||
"variant": "AA 0.4",
|
||||
"nozzle_size": 0.4,
|
||||
"extruder_settings": {
|
||||
"wall_line_count": 3,
|
||||
"retraction_enable": true,
|
||||
"infill_sparse_density": 30,
|
||||
"infill_pattern": "triangles",
|
||||
"gradual_infill_steps": 0,
|
||||
"default_material_print_temperature": 200,
|
||||
"material_print_temperature": 200
|
||||
}
|
||||
},
|
||||
{
|
||||
"active": false,
|
||||
"material": {
|
||||
"GUID": "86a89ceb-4159-47f6-ab97-e9953803d70f",
|
||||
"type": "PVA",
|
||||
"brand": "Generic"
|
||||
},
|
||||
"material_used": 0.5,
|
||||
"variant": "BB 0.4",
|
||||
"nozzle_size": 0.4,
|
||||
"extruder_settings": {
|
||||
"wall_line_count": 3,
|
||||
"retraction_enable": true,
|
||||
"infill_sparse_density": 20,
|
||||
"infill_pattern": "triangles",
|
||||
"gradual_infill_steps": 0,
|
||||
"default_material_print_temperature": 215,
|
||||
"material_print_temperature": 220
|
||||
}
|
||||
}
|
||||
],
|
||||
"quality_profile": "fast",
|
||||
"user_modified_setting_keys": ["layer_height", "wall_line_width", "infill_sparse_density"],
|
||||
"models": [
|
||||
{
|
||||
"hash": "b72789b9beb5366dff20b1cf501020c3d4d4df7dc2295ecd0fddd0a6436df070",
|
||||
"bounding_box": {
|
||||
"minimum": {
|
||||
"x": -10.0,
|
||||
"y": 0.0,
|
||||
"z": -5.0
|
||||
},
|
||||
"maximum": {
|
||||
"x": 9.999999046325684,
|
||||
"y": 40.0,
|
||||
"z": 5.0
|
||||
}
|
||||
},
|
||||
"transformation": {
|
||||
"data": "[[ 1. 0. 0. 0.] [ 0. 1. 0. 20.] [ 0. 0. 1. 0.] [ 0. 0. 0. 1.]]"
|
||||
},
|
||||
"extruder": 0,
|
||||
"model_settings": {
|
||||
"support_enabled": true,
|
||||
"support_extruder_nr": 1,
|
||||
"infill_mesh": false,
|
||||
"cutting_mesh": false,
|
||||
"support_mesh": false,
|
||||
"anti_overhang_mesh": false,
|
||||
"wall_line_count": 3,
|
||||
"retraction_enable": true,
|
||||
"infill_sparse_density": 30,
|
||||
"infill_pattern": "triangles",
|
||||
"gradual_infill_steps": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"print_times": {
|
||||
"travel": 187,
|
||||
"support": 825,
|
||||
"infill": 351,
|
||||
"total": 7234
|
||||
},
|
||||
"print_settings": {
|
||||
"layer_height": 0.15,
|
||||
"support_enabled": true,
|
||||
"support_extruder_nr": 1,
|
||||
"adhesion_type": "brim",
|
||||
"wall_line_count": 3,
|
||||
"retraction_enable": true,
|
||||
"prime_tower_enable": true,
|
||||
"infill_sparse_density": 20,
|
||||
"infill_pattern": "triangles",
|
||||
"gradual_infill_steps": 0,
|
||||
"print_sequence": "all_at_once"
|
||||
},
|
||||
"output_to": "LocalFileOutputDevice"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue