3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 21
34169 commits 305 branches 272 tags 787 MiB
Commit graph

7605 commits

Author SHA1 Message Date
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
jspijker
8058c16f00 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 16:45:33 +01:00
Jelle Spijker
b8b433ed5c
Merge pull request #13938 from Ultimaker/CURA-9347_safe_to_profile_button 
[CURA-9347] Easier 'compare-and-safe' for (new or custom) profiles
 2022-12-05 15:34:57 +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
Remco Burema
c74e7be602 Appease reviewers. 
- Ditch state in favour of enum.
- Comment explaining 'extraInfo'.

part of CURA-9347
 2022-12-02 19:52:37 +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
Remco Burema
8f65af61e5 Connect compare-and-safe profile dialog buttons to actions. 
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.

part of CURA-9347
 2022-11-30 18:48:07 +01:00
Remco Burema
c13deba1ea Build correct states for safe profiles flow (except actual safe). 
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.

part of CURA-9347
 2022-11-30 12:40:07 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself. 
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
 2022-11-29 22:54:30 +01:00
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker 
CURA 9808 UltiMaker
 2022-11-29 16:36:07 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +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
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
0bb59acdf8 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:14:51 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +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 7e84082aff.
 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
Joey de l'Arago
dd0411f171 isOnline was incorrectly being used instead of isNetworked. This caused offline printers not to show an Icon. 
Fixed

CURA-9424
 2022-11-15 14:56:25 +01:00
Joey de l'Arago
e947959ca9 Merge branch 'main' into CURA-9424_update_loading_projects_design 2022-11-14 12:56:47 +01:00
Joey de l'Arago
57e1c7a4ce Commit suggestion by Jelle 
CURA-9424
 2022-11-11 17:08:45 +01:00
Joey de l'Arago
62274c4dac Revert Some of "Fix show/hide button in WorkSpaceDialog printer selector" 
This reverts commit 0c79ec73
 2022-11-11 17:04:39 +01:00
Joey de l'Arago
bbadc9c887
Apply suggestions from code review 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-11-11 13:44:37 +01:00
c.lamboo
0c79ec738e Fix show/hide button in WorkSpaceDialog printer selector 
CURA-9424
 2022-11-09 23:05:06 +01:00
c.lamboo
06a2886139 Clean up section property logic 
CURA-9424
 2022-11-09 17:11:31 +01:00
Joey de l'Arago
1ebf5bb650 Update MachineListModel to optionally take a list of global stack to show in list instead of searching the container registry. 
Add option not to listen to container change events in MachineListModel.

CURA-9424
 2022-11-04 16:42:07 +01:00
c.lamboo
5cb67ab8c4 Add new pages in add-printer flow 
Pages added
- Page to select Ultimaker or third party printer
- Page with information how to add Ultimaker printer(s)

contributes to CURA-8689
 2022-11-01 16:11:34 +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
Remco Burema
b4405d886b Reverse sorting, newer machines on top. 
Same brand or name, but with a higher number should generally be first, so reverse sorting.

CURA-9769
 2022-10-20 10:24:01 +02:00
c.lamboo
4a30bbaf2b Merge branch '5.2' 2022-10-14 16:39:05 +02:00
Remco Burema
ce6f7c20ca Abstract printer types: Sort newer ones on top. 
Partial (manual) revert of initial implementatio of CURA-9748 -- that first commit deleted the 'reverse = True' needed to make sure (read hack) the most recent abstract printer types on top, instead of the other way around.
 2022-10-12 16:14:32 +02:00
Remco Burema
d3305585fc Merge branch '5.2' 2022-10-12 15:33:26 +02:00
c.lamboo
9bacbb5825 Sort cloud printers in printer selection dropdown menu 
CURA-9748
 2022-10-12 14:37:26 +02:00
Remco Burema
7dd37c6a53 Filter material lists for compatible printers. 
So that only one identical entry shows up per material, per extruder (per printer).

CURA-9689
 2022-10-12 12:02:20 +02:00
Jelle Spijker
48ea4cee9f Merge branch '5.2' 
# Conflicts:
#	conanfile.py
 2022-10-10 10:23:01 +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
c.lamboo
2079bd5a6e Sort "other printers" list 
CURA-9687
 2022-10-05 13:26:12 +02:00
Remco Burema
9a4500f847 Update SDK to 8.2.0 for release 5.2 2022-09-28 10:37:08 +02:00
Jaime van Kessel
f52a9ad0fe
Add missing return 
CURA-9663
 2022-09-26 10:25:42 +02:00
Jaime van Kessel
ea16597dd6
Merge branch 'machine-actions-improvement' of github.com:julianCast/Cura 2022-09-26 10:22:18 +02:00
Julian
df16108938 Fixes for better decorators using pyqtProperty 2022-09-23 11:49:30 +02:00