GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 13:09:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,576 Commits 290 Branches 263 Tags
Commit Graph

21576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
1f7c653368
Capitalise the S 
We need to seize this opportunity and capitalise on that sort of market opportunity.
 2019-09-19 10:47:16 +02:00
Jaime van Kessel
884a3ea819
Fix selection for intents if only one of the extruders has an intent 
CURA-6598
 2019-09-19 09:54:47 +02:00
Jaime van Kessel
49276db073
Fix display of intent in profile selection 
CURA-6598
 2019-09-19 09:39:52 +02:00
Jaime van Kessel
cc65bc8213
Fix scrollbar for object selector 2019-09-18 17:05:00 +02:00
Jaime van Kessel
78ab218cc2
No longer reset to default intent when configuration changed 
This caused the intent to be reset every time a change was made.

CURA-6600
 2019-09-18 14:52:51 +02:00
Jaime van Kessel
ede007b860
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-09-18 14:39:30 +02:00
Jaime van Kessel
7693de325a
Add loggin when user tries to change intent 
CURA-6598
 2019-09-18 14:39:06 +02:00
Ghostkeeper
05de920c21
Once more with feeling 
Sorry, I didn't see the other review comment until after I pushed the previous commit.

Contributes to issue CURA-6600.
 2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files 
This naming is more consistent with the naming of the metadata entry and most of the other code.

Contributes to issue CURA-6600.
 2019-09-18 14:27:04 +02:00
Jaime van Kessel
84e5114566
Fix minor review comments 
CURA-6598
 2019-09-18 14:17:26 +02:00
Jaime van Kessel
fade8d3644
No longer make border width hardcoded 
CURA-6598
 2019-09-18 14:10:52 +02:00
Ghostkeeper
2571f54d3c
Simplify looping over quality groups 
Contributes to issue CURA-6600.
 2019-09-18 14:01:23 +02:00
Nino van Hooff
53ea6ce1a7 POS: Fix: currentMeshType reference 
CURA-6683
 2019-09-18 11:39:58 +02:00
Jaime van Kessel
549eb21a5a
Simplify the machinesettings qml 2019-09-18 11:24:11 +02:00
Nino van Hooff
9fa2b26897 Styling: do not use thick_lining for selected tool icons. 
Affects Per Object Settings and rotate Lay Flat

CURA-6683
 2019-09-18 11:23:10 +02:00
Nino van Hooff
7d66409494 POS: Refactor settings dialog into its own file 
CURA-6683
 2019-09-18 11:23:10 +02:00
Nino van Hooff
fbba39cb63 POS: Correct label text 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
be7bd59e30 Code Style: camelCase for qnl properties, brackets, commas 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
c3bbd884b5 Use Cura.SecondaryButton for POS select settings button per design 
CURA-6683
 2019-09-18 11:07:18 +02:00
Jaime van Kessel
75c7a6fa62
Change default font for numericTextfield to default instead of medium 2019-09-18 10:55:18 +02:00
Jaime van Kessel
db0428ceec
Remove anchors that were causing qml warnings 2019-09-18 10:32:47 +02:00
Ghostkeeper
b460ffeb9b
Use removeMaterial from MaterialManagementModel 
Contributes to issue CURA-6600.
 2019-09-17 17:59:50 +02:00
Ghostkeeper
8710bb77a7
Use MaterialManagementModel to rename materials 
It's the replacement for the deprecation.

Contributes to issue CURA-6600.
 2019-09-17 17:57:32 +02:00
Ghostkeeper
9392a3553c
Use implementation from MaterialManagementModel 
The material manager is deprecated now.

Contributes to issue CURA-6600.
 2019-09-17 17:54:26 +02:00
Ghostkeeper
0eb3c5c0d6
Refer material manager functions through to material management model 
That's where the materials are duplicated now. So we only maintain one implementation of that.

Contributes to issue CURA-6600.
 2019-09-17 17:50:38 +02:00
Ghostkeeper
963f5e6dd7
Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter 
Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks.

Contributes to issue CURA-6600.
 2019-09-17 17:03:05 +02:00
Ghostkeeper
80e79f6e7e
Remove TODO 
Was done in previous commit, but I already pushed so no more --amend now.

Contributes to issue CURA-6600.
 2019-09-17 16:58:12 +02:00
Ghostkeeper
fc679758ef
Optimise getting intent categories 
It's in the container tree, so there's no need for separate queries to the container registry.

Contributes to issue CURA-6600.
 2019-09-17 16:57:16 +02:00
Ghostkeeper
3712f9c1f8
Correct parameter name 
It's the base file, not the ID.

Contributes to issue CURA-6600.
 2019-09-17 16:56:00 +02:00
maukcc
b5ba673ffb HMS434 quality updates 2 2019-09-17 16:51:35 +02:00
maukcc
b652035696 HMS434 quality updates 2019-09-17 16:48:34 +02:00
Ghostkeeper
5f4051ab5c
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
There was a function to round it for us already.

Contributes to issue CURA-6600.
 2019-09-17 16:41:32 +02:00
Ghostkeeper
37d54071f0
Don't use material manager any more to sync with printers 
Or to change material from a base file ID.

Contributes to issue CURA-6600.
 2019-09-17 16:35:39 +02:00
Ghostkeeper
5f2e2d5320
Use correct material diameter, rather than always 3 
This function shouldn't be called any more anyway, though.

Contributes to issue CURA-6600.
 2019-09-17 15:58:10 +02:00
Ghostkeeper
614c2970ea
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
So we don't need to round it again.
Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes.

Contributes to issue CURA-6600.
 2019-09-17 15:50:38 +02:00
Diego Prado Gesto
0b9052b068 Clean up and code style fixing 
Contributes to CURA-6683.
 2019-09-17 15:12:46 +02:00
Diego Prado Gesto
4dd6c5b03a Merge branch 'master' into CURA--6683_icons_per_object_settings 2019-09-17 14:16:51 +02:00
Diego Prado Gesto
b9ed619c9a Reuse the Cura ToolTip while showing long object item 
It will only show the tooltip when the text is longer than the elided text.

Contributes to CURA-6666.
 2019-09-17 13:52:37 +02:00
Ghostkeeper
fd452e74b3
Merge branch 'mb-fix-small-feature-blurb-spello' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-small-feature-blurb-spello 2019-09-17 13:15:57 +02:00
Ghostkeeper
d0b7a52ef5
Remove unused definition ID field 2019-09-17 13:10:25 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Ghostkeeper
cd4f6ff3f4
Add tooltip to object list 
Contributes to issue CURA-6666.
 2019-09-17 10:42:36 +02:00
Diego Prado Gesto
f2fa8fd1f5
Merge pull request #6362 from radfahrer/master 
Correction for build volume.
 2019-09-17 10:37:43 +02:00
Diego Prado Gesto
5a95788493 Use the setting's default value when the global variant instance container is empty 
Otherwise it will never show as a matching configuration in the configuration list.
 2019-09-17 09:52:44 +02:00
Ghostkeeper
e4c3ab33f8
Fix message saying all is good if it isn't 2019-09-17 09:37:18 +02:00
Ghostkeeper
e4edd5732f
Fix success code in MyPy script 
The 'return' variable was used for two things, shadowing each other. Because of that, it would fill the variable with a subprocess.run result which would evaluate to True so it would always say that the test failed.
 2019-09-17 09:35:12 +02:00
Ghostkeeper
eaf649023a
Fix setting default material after g-code flavour changes has_materials 
Don't use the material manager here any more.

Contributes to issue CURA-6600.
 2019-09-17 09:23:33 +02:00
Ghostkeeper
977beb8dbb
Re-build container tree if has_materials changes during runtime 
A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager.

Contributes to issue CURA-6600.
 2019-09-17 08:55:29 +02:00
F-Fischer
3606ac8bd6 Hellbot printers definitions added 2019-09-16 16:23:35 -03:00
Diego Prado Gesto
b4d4a0e291 Add the Trimesh Reader to the list of bundled plugins 2019-09-16 16:49:12 +02:00