3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25644 commits 340 branches 299 tags 734 MiB
Commit graph

6608 commits

Author SHA1 Message Date
Lipu Fei
c030328b7f Fix intent profile selection 
CURA-6810
 2019-10-01 15:21:01 +02:00
Lipu Fei
ad7b58e460 Get diameter from material container 
CURA-6821
 2019-10-01 15:05:35 +02:00
Lipu Fei
aaca4bb9a1 Fix KeyError in root material ID check 
CURA-6827
 2019-10-01 11:58:54 +02:00
Nino van Hooff
2df0d96923 Consider user preference when opening project files from cli. 
The logic using just a "skip_project_file_check" boolean was too obscure
imho, so used a string value with more explicit values
to improve readability

CURA-6824
 2019-10-01 11:54:53 +02:00
Lipu Fei
51c96aecde Fix for-loop in updateMaterialWithVariant 
CURA-6821
 2019-10-01 11:43:46 +02:00
Lipu Fei
55a5464ed3 Fix missing import 2019-10-01 11:41:17 +02:00
Lipu Fei
bc524b2c14 Fix unit test due to QualityGroup parent changes 2019-10-01 11:26:10 +02:00
Lipu Fei
961e1e0d7e Fix material node update for empty_material 
CURA-6821
 2019-10-01 10:56:17 +02:00
Lipu Fei
df105bc822 Fix update material due to compatible material diameter change 
CURA-6821
 2019-10-01 10:40:16 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
Ghostkeeper
7bf2fa3b43
Add typing and documentation and remove unused code 
Contributes to issue CURA-6785.
 2019-09-30 16:50:35 +02:00
Ghostkeeper
69028bf279
Remove unused import 
Contributes to issue CURA-6785.
 2019-09-30 16:24:53 +02:00
Jaime van Kessel
916bb5a32b
Select correct intent when quality_changes has an intent category 2019-09-30 12:55:10 +02:00
Thomas Karl Pietrowski
f57528ef1a
CuraApplication: Some formatting around messageBox functions 
Just preventing some long lines.
 2019-09-29 21:20:11 +02:00
Nino van Hooff
2c12d713e3 Revert "Do not show the "load project or models" dialog when opening a file from a command line argument" 
This reverts commit abfd7e92, because the desired behavior has still tbd
 2019-09-27 16:50:28 +02:00
Nino van Hooff
abfd7e9266 Do not show the "load project or models" dialog when opening a file from 
a command line argument
 2019-09-27 16:37:41 +02:00
Ghostkeeper
900761b373
Fix documentation of quality node class 
It's a quality container, not a material container. This was a copy-paste mistake.
Also added that this may be a global quality container, not always a per-extruder quality container.

Found during testing & tooling.
 2019-09-27 15:31:58 +02:00
Nino van Hooff
c4c62cbba2 Take nozzle offset into account in _getHeadAndFans() 
CURA-6785
 2019-09-27 15:26:46 +02:00
Ghostkeeper
f33937eb7b
Use extruderList instead of extruders 
The extruders attribute is deprecated.

Found during testing and tooling.
 2019-09-27 15:25:41 +02:00
Lipu Fei
e5d94fd2e4 Change to "name" property 
CURA-6599
 2019-09-26 17:19:15 +02:00
Jaime van Kessel
f5639192ee
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-26 16:27:19 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Remco Burema
3c2467b6d6 Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent 2019-09-26 14:02:32 +02:00
Remco Burema
e452c640d4 Set empty intent if quality is empty. 
... instead of crashing.
Not _really_ part of a ticket, but I'm solving  this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807
 2019-09-26 14:02:21 +02:00
Jaime van Kessel
eced1fe907
Fix updating a profile with changed settings 2019-09-26 14:02:11 +02:00
Nino van Hooff
e9965ab2a6 Revert the OneAtATimeIterator to the pre 06-2018 implementation. 
This seems like a better starting point to fix print head collisions,
because we got less bug reports for it compared to the 2018 rewrite.

CURA-6785
 2019-09-26 10:42:54 +02:00
Jaime van Kessel
241ca56e6e
Fix stupid derp issue 
I really need coffee before coding
 2019-09-26 09:46:02 +02:00
Jaime van Kessel
dbbeeef9a5
Don't render buildvolume if it's set to invisible 2019-09-26 09:11:54 +02:00
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML 
CURA-6599
 2019-09-25 14:38:38 +02:00
Lipu Fei
d1330e5ffa Fix updating custom quality menu model 
CURA-6599
 2019-09-25 14:36:46 +02:00
Lipu Fei
f395c92732 Fix custom profile menu 
CURA-6599
 2019-09-25 08:28:24 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Jaime van Kessel
a741530db2
Also ensure that the container tree is used when selecting an intent 
CURA-6807
 2019-09-24 13:17:36 +02:00
Jaime van Kessel
f469b99471
Create intent nodes based on the selected quality type 
Previously it would use the material type from the material, but since
the material from the node can be different to that of the quality, we need
to use the one from quality instead (This is due to the fallback system)

CURA-6807
 2019-09-24 11:57:50 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Jaime van Kessel
56c7fb9f7d
Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-24 10:34:21 +02:00
Jaime van Kessel
2d1dec098b
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 09:27:23 +02:00
Jaime van Kessel
3ab0b5decf
Add extra exception handling for UFPwriter 2019-09-24 09:24:36 +02:00
Ghostkeeper
557746a832
Partial fix for intent manager not finding correct profile in test 
Only in test.
 2019-09-23 15:17:15 +02:00
Jaime van Kessel
7e3f265068
Add a function to add a MachineNode to the tree. 
This solves the issue that machines created by the stack builder broke the material updating

CURA-6791
 2019-09-23 13:18:11 +02:00
Lipu Fei
ddab8e204a Add typing 
CURA-6800
 2019-09-23 11:43:50 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Ghostkeeper
cb045fb0c2
Update default SDK version 
Just in time.
 2019-09-23 11:24:20 +02:00
Lipu Fei
1aa6708677 Fix typing 2019-09-23 10:59:31 +02:00
Remco Burema
cb7d99d2dc Revert "Make 3MF-reader aware of setting-version for introduction Intent." 
This reverts commit 16ea437255.

Should have been (and is now) done in the version upgrade instead.
 2019-09-20 11:56:08 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager 
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
12043df367
Don't use material manager to find or remove materials 
That remove function in the material manager was very weird...

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
cc9115b3d3
Don't use material manager to reset material 
Use the container tree.

Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00
Ghostkeeper
105e782e75
Remove unused imports to MaterialManager 
Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00