GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 01:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 289 Branches 260 Tags
Commit Graph

2372 Commits

Author SHA1 Message Date
c.lamboo
8af3de2178 Fix getInitialExtruder code 
For the `skirt_brim_extruder_nr` setting it is possible for the setting to be -1; this means that we have no preference for extruder. This allowed us to implement the "multi-material brim". When we were requesting the initial extruder, and this value was set to -1 we were default to the 0-th extruder. However, this was incorrect in the situation where the first extruder is not used.

Fixes #17501
 2024-01-23 20:48:02 +01:00
c.lamboo
cf27163934 Update bot to reference 2023-11-29 12:25:51 +01:00
c.lamboo
a9dcfaa032 specify bot id type 2023-11-27 15:32:55 +01:00
c.lamboo
495079f3d9 Clean up bot LUT 
We had a lot of Look up Tables scattered around in the cura repository. This can be solved by adding a `bot_id` entry to metadata of the various makerbot extruders/materials/definitions
 2023-11-24 16:49:31 +01:00
Jelle Spijker
efafe1503d
Merge branch '5.6' 
# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
 2023-11-15 13:53:39 +01:00
c.lamboo
61b33691e5 Fix nozzle selection checkmark 
CURA-11299
 2023-11-10 15:21:18 +01:00
c.lamboo
75feb5ae38 Don't create abstract printers if visibility is set to false 
CURA-11138
 2023-10-31 15:35:56 +01:00
c.lamboo
fa1f5a7c89 Boyscouting 
CURA-11189
 2023-10-20 15:10:39 +02:00
saumya.jain
215a893c39 putting the code in right location 
checked: this code only checks for support type and adhesion type and make them lowercase

CURA-11048
 2023-10-04 11:19:20 +02:00
saumya.jain
5b6fea9734 if value is a string make it lowercase 
CURA-11048
 2023-10-04 11:05:33 +02:00
Erwan MATHIEU
3ebeb0a661 Set a brand to empty material to avoid later crash 
CURA-11089
 2023-09-26 13:59:45 +02:00
c.lamboo
6e045e8b37 Put back getAnyExtruderPositionWithOrDefault api function 
CURA-10685
 2023-08-29 14:11:36 +02:00
saumya.jain
ab8b7c3ab5 name changes 
CURA-10685
 2023-08-25 15:46:30 +02:00
saumya.jain
9129a526ba improve number of iterations 
CURA-10685
 2023-08-25 11:58:27 +02:00
Jaime van Kessel
1e240e3229
Let intent selection use the quality_definition instead of direct def 
The issue was that sometimes intents are also shared.

CURA-10788
 2023-07-21 10:57:39 +02:00
Remco Burema
68231c957d Add settings-function to get an extruder based on a property. 
We wanted to select an extruder based on wether or not it has support-material, so that the user doesn't have to think about selecting a support extruder any more and in most cases, can't forget anymore either. The formula present in fdmprinter to do that was not only an unreadable nightmare, but also very slow. We decided to pull most of that functionality into the settings-function machinery instead (but just a bit more generic so other properties can be selected, not just 'material_is_support_material').

done as part of finishing off CURA-10643
 2023-06-13 15:59:24 +02:00
c.lamboo
27cc89ff89 Allow for custom descriptions/icons in packaged intents 
CURA-9709
 2023-05-31 12:54:56 +02:00
Jaime van Kessel
1ada1b04df
Remove unneeded whitespace 
Boyscouting CURA-10342
 2023-02-28 10:35:02 +01:00
Joey de l'Arago
1e6184448c
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-12-12 11:44:21 +01:00
Joey de l'Arago
e6f4055df5 Remove part of hack for fixing extrudersCHanged signal at the wrong time. 
Other things rely on the extruders changed signal so it is better to just emit it again at the correct time.

CURA-9793
 2022-12-08 13:11:14 +01:00
Joey de l'Arago
bcdfa808a8 Switch to checking enabled extruder count for showing print with Component. This is because we want the SingleSettingExtruderBar to be hidden when there are 1 or less extruders, but also when there are 1 or less enabled extruders. 
CURA-9793
 2022-12-07 17:33:13 +01:00
Joey de l'Arago
443252ae10 Use globalStackExtruderIds instead of extruderIds. extruderIds notifys change before the extruders change when doing a machine swap. Fixing this will take a long time so this is a workaround. If you are reading this 🙏 good luck fixing it 🙏 
CURA-9793
 2022-12-07 16:57:35 +01:00
Joey de l'Arago
d8cf234a17 Use different signal for triggering update to extrduderIds. **This is a hack**. Actually fixing this problem could take days. 
CURA-9793
 2022-12-07 12:25:33 +01:00
Joey de l'Arago
93d1f05aec Remove ignored changes list. All changes will now trigger the reset setting button to appear 
CURA-9793
 2022-12-06 12:07:07 +01:00
Joey de l'Arago
3ddebe7a84 The extrudersCHanged signal was incorrectly being emitted before the global stack had updated. This was causing the extruderIds to always return the old extruderIds to connected qml components. 
The setting slider was incorrectly setting the slider value when updating the model.

CURA-9793
 2022-12-06 10:37:06 +01:00
Joey de l'Arago
0738f996d0 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 11:39:51 +01:00
Joey de l'Arago
29172014ad Add all new recommended items to ignored custom settings keys. This stops the reset setting button from appearing even though we have changed these settings. 
CURA-9793
 2022-12-05 11:37:18 +01:00
Jelle Spijker
eb4451f25c
Don't test with is not for a literal 2022-11-30 22:23:17 +01:00
Jelle Spijker
46df77543b
Don't test with is not for a literal 2022-11-30 22:22:28 +01:00
c.lamboo
be40920042 Fix cura crashing 
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property

Cura-9773
 2022-11-28 13:14:47 +01:00
c.lamboo
8e8437eab0 Split of getStringParts function 
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.

Cura-9773
 2022-11-28 13:10:52 +01:00
Joey de l'Arago
8dcccd941b Add dataclass for ActiveQuality. Move some logic out of MachineManager into ActiveQuality. 
CURA-9793
 2022-11-28 12:40:35 +01:00
Casper Lamboo
f297909a82
Fix type signature of function 
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-11-28 11:23:53 +01:00
Casper Lamboo
a645fa7d96
Use bracket to initialise list 
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-11-28 11:22:53 +01:00
c.lamboo
4fa024cd31 Group intent and quality 
Bit of an ugly hack. At later point in the code it is assumed the first element of the list is the main part and the remaining elements form the suffix. Intent and the profile form both the main part so these need to be grouped together.

Cura-9773
 2022-11-25 16:48:06 +01:00
c.lamboo
52ee149edc Unify activeQualityDisplayNameMap string creation 
Generation quality display names in `CustomPrintSetup.qml` and `PrintSetupSelectorHeader.qml` were so similar that I decided to combine the logic.

Cura-9773
 2022-11-25 16:09:55 +01:00
c.lamboo
e8f6786e97 Revert "Add quality type to ufp files" 
This reverts commit 7e84082aff26195d82b8d3c9239dee863949c099.
 2022-11-24 22:56:35 +01:00
c.lamboo
7e84082aff Add quality type to ufp files 
Cura-9773
 2022-11-24 13:55:31 +01:00
Remco Burema
24bb1e96fa Fix unlinked brim settings behaviour. 
Some brim settings seemed to behave as if they where linked, when in fact for any extruder set to -1 the 'default extruder' was set by some hacky code that supposedly fixes a 'dissallowed area' issue, very likely also related to the skirt/brim settings. Since dissalowed area for skirt/brim will not be a thing anymore, at least in the front-end, due to CURA-9066 (the 'parent' jira ticket that was blocked by this bug); it was sinplest just to remove the hack altogether. (Otherwise we'd have to make an artificial distinction between -1 and None as it relates to 'Not Set/Used' versus 'Not Overridden', only to then force it back to -1 in situations that call for it -- like communicating to the engine.)

CURA-9553
 2022-10-30 11:09:12 +01:00
Remco Burema
ab51bd699e Merge branch 'main' into brim_per_material_optimized_order 2022-10-25 17:31:13 +02:00
Joey de l'Arago
8e883cf546 This fixes a crash when loading a 3mf with a printer that has no extruders while the current global stack also has no extruders. 
This was caused by trying to compare "extruders_enabled_count" which was None with an integer.

CURA-9714
 2022-10-06 11:44:30 +02:00
Jaime van Kessel
ce71cbb57b
Merge pull request #13209 from Ultimaker/CURA-9224_approver_settings_json 
[CURA-9224] Approver settings json
 2022-09-13 14:07:42 +02:00
Jaime van Kessel
8dc2eaf783
Move CreateFlattendContainerInstance to InstanceContainer 
It didn't really belong in the stack builder, as it's not a containerstack

CURA-9224
 2022-09-13 13:35:37 +02:00
c.lamboo
d97dddcfe2 Revert "More agressivly check online printers" 
This reverts commit 92b371cd508ebf5102aa5ae979865d2bac591b7e.
 2022-09-13 10:41:46 +02:00
c.lamboo
92b371cd50 More agressivly check online printers 
CURA-9278
 2022-09-12 17:34:44 +02:00
c.lamboo
8d9e9a9dbf Use modern python typing 
CURA-9278
 2022-09-12 17:04:40 +02:00
Joey de l'Arago
e95ed93021
Merge pull request #13210 from Ultimaker/CURA-9277_ 
Various fixes for the cloud printer types feature
 2022-09-06 13:57:03 +02:00
c.lamboo
148263a068 Move hasNetworkedConnection to GlobalStack 
From code review

CURA-9277
Co-authored-by: Joey <j.delarago@ultimaker.com>
 2022-09-06 13:52:10 +02:00
digitalfrost
250c038e03
CuraContainerStack.py: iterate directly over IndexTypeMap (#12988) 
* CuraContainerStack.py: iterate directly over IndexTypeMap

There is no need for range(len

Co-authored-by: Jelle Spijker <spijker.jelle@gmail.com>
 2022-09-06 11:41:50 +02:00
c.lamboo
2d3ad84167 Fix extruders enabled button not updating 
The `numberExtrudersEnabled` property was never updated, as such the checks if the property changed based on the new value being different from this value didn't work.

CURA-8463
 2022-09-05 14:31:21 +02:00