GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,026 Commits 293 Branches 266 Tags
Commit Graph

2355 Commits

Author SHA1 Message Date
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
joeydelarago
ee7c8d1f02 Move creatFlattenedContainerInstnance into CuraStackBuilder so it can be reused. 
CURA-9224
 2022-09-05 10:42:48 +02:00
Jaime van Kessel
4b2d03fe1d
Don't show warning message if creating abstract printer failed 2022-09-05 10:27:03 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like). 
done as part of CURA-9422
 2022-08-31 14:15:05 +02:00
Remco Burema
4ea437ba28 Make send to DF in monitor for abstract printer work (again-ish). 
Already moslty implemented, but a new approach of the base feature (abstract cloud printers) made a more? elegant and functioning implementation possible.

(re)implements CURA-9422
 2022-08-31 14:13:47 +02:00
Jaime van Kessel
4c55befad7
Merge branch 'main' of github.com:Ultimaker/Cura into CURA-8463_cloud_configuration 2022-08-31 10:39:05 +02:00
Jaime van Kessel
506f2b9820
Remove code duplication in createAbstractMachine 
This also caused a crash when an abstract machine with multiple extruders was selected

CURA-8463
 2022-08-26 14:08:03 +02:00
Jaime van Kessel
46532828a4
Add logging for when setting the active machine failed 
CURA-8463
 2022-08-26 13:46:01 +02:00
Remco Burema
95f234679c Placeholder; the selected printer to monitor is abstract, but cloud-capable. 
forms the base of CURA-9422
 2022-08-26 13:10:09 +02:00
c.lamboo
f000b75661 Move getMachinesWithDefinition to MachinesManager 
CURA-9514, CURA-9277
 2022-08-26 11:16:10 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine 
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-26 10:45:45 +02:00
joeydelarago
04580b8fdc Simplify logic by having abstract printers always be online. 
CURA-9221
 2022-08-24 14:33:04 +02:00
joeydelarago
b4e5fd8526 Remove debug statement 
CURA-9514
 2022-08-24 10:24:53 +02:00
joeydelarago
52b2a8322c Include LAN printers in abstract printers list 
Make filtering clearer by splitting it up into multiple lines.

CURA-9514
 2022-08-24 10:06:51 +02:00
joeydelarago
eea8935741 Set minimum width, so that drop down is still readable on small screens 
CURA-9514
 2022-08-23 16:20:04 +02:00
joeydelarago
93e2bef303 Group printers by section (Connected Printers/Other Printers) 
Cleanup redundant code.

CURA-9514
 2022-08-23 15:44:16 +02:00
joeydelarago
bedb76d516 Update comment 
CURA-9514
 2022-08-23 13:11:17 +02:00
joeydelarago
7ffa770fb4 Searching container registry returns ContainerStacks. 
Made typing more generic to work with an ContainerStack to compensate.

Made AbstractMachine getMachines a classmethod so it can be called with ContainerStacks.

CURA-9514
 2022-08-23 10:35:00 +02:00