3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
29127 commits 313 branches 275 tags 718 MiB
Commit graph

29127 commits

This branch
This branch
All branches
Author SHA1 Message Date
j.delarago
1e0236e317 Remove left margins which don't align with the intended design. 
CURA-8849
 2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change. 
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
 2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design 
CURA-8849
 2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together. 
Fix is to have the children fill their width

CURA-8849
 2022-06-16 13:12:36 +02:00
Joey de l'Arago
88168bc0e1
Merge pull request #12532 from Ultimaker/PP-116_clean-up-DD-variant-profile 
Pp 166 clean up dd variant profile
 2022-06-16 11:08:50 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata 
[CURA-8610] save required packages metadata
 2022-06-16 10:47:06 +02:00
j.delarago
8c92ebfccd Add missing import 
CURA-8849
 2022-06-16 10:41:06 +02:00
Jaime van Kessel
d30afb6647
Merge pull request #12534 from StuSerious/main 
Enhance CITATION.cff
 2022-06-16 09:29:10 +02:00
Stefano Serioli
25a7c3e263
Merge branch 'Ultimaker:main' into main 2022-06-15 18:31:23 +02:00
StuSerious
a83daee8da update CITATION to latest version (.cff and Cura) 
this brings citation file format to 1.2 and Cura version to 5.0.0.

some other changes and important fields were also added.
 2022-06-15 18:30:11 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849 
[CURA-8849] Improve intent profile selection
 2022-06-15 18:24:18 +02:00
j.delarago
f9dda40409 Better typing 
CURA-8849
 2022-06-15 17:41:21 +02:00
j.delarago
6f8470167f Suggested changes 
CURA-8849
 2022-06-15 17:40:07 +02:00
Joey de l'Arago
142f1823b3
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:31:40 +02:00
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:59 +02:00
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:26 +02:00
Joey de l'Arago
b4152d29d6
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:16 +02:00
Joey de l'Arago
87afb117d0
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:22 +02:00
Joey de l'Arago
760976159c
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:13 +02:00
Joey de l'Arago
caa0c255aa
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:06 +02:00
j.delarago
cd34294914 Revert "disable travel_avoid_supports" 
This reverts commit 8f2dff712e.
 2022-06-15 17:19:03 +02:00
Jaime van Kessel
1a0b095f8d
Merge pull request #11721 from Haxk20/patch-1 
voron2_base.def.json: Do not limit travel speeds to 300mm/s
 2022-06-15 16:08:09 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials. 
CURA-8610
 2022-06-15 15:47:17 +02:00
Remco Burema
188b63703b
Merge pull request #12531 from Ultimaker/CURA-8555_link_ufp_to_3mf_in_digital_library 
Cura 8555 link ufp to 3mf in digital library
 2022-06-15 15:16:11 +02:00
Rijk van Manen
d4095e7e1d set correct nozzle tip outer diameter 
This is the size of the ruby. PP-116
 2022-06-15 15:12:34 +02:00
Rijk van Manen
311b5e94ce add machine nozzle tip size 
PP-116
 2022-06-15 14:58:34 +02:00
Rijk van Manen
5db8567bff cleanup variant profile 
In the ppCCB we decided to clean up to DD variant profiles, since we plan to do that with all variant profiles in the future. PP-116
 2022-06-15 14:58:16 +02:00
Ghostkeeper
bb058d18cb
Merge branch 'main' of github.com:Ultimaker/Cura 2022-06-15 14:40:42 +02:00
Ghostkeeper
20607b219a
Merge branch 'split-removable-output-write-function' of https://github.com/zxc8027/Cura into zxc8027-split-removable-output-write-function 2022-06-15 14:37:39 +02:00
Remco Burema
a82b90fd96
Merge pull request #12488 from Ultimaker/PP-108_Improved_support_settings 
PP-108 improved support settings
 2022-06-15 14:24:09 +02:00
j.delarago
4e80d170d1 Add logs for debugging 
CURA-8610
 2022-06-15 14:09:05 +02:00
Ghostkeeper
68fde8d051
Merge branch 'PP-166-DD-core-variant-files' 2022-06-15 14:08:13 +02:00
Ghostkeeper
4b6995bf24
Correct description for Enable Travel Jerk 
Done as a 5 minute fix.
 2022-06-15 14:04:22 +02:00
c.lamboo
854607a725 Provide source_file_id with print file 
Had to implement this a bit differently as stated in the ticket. This field is returned when uploading the project file.

Logic needed a bit of a change as the new behavior dictates a sequence (we can only upload the print file after the project file is uploaded, and we know the correct `file_id`/`source_file_id`) where before these two api calls were done in parallel.

CURA-8555
 2022-06-15 13:36:34 +02:00
c.lamboo
f67d086182 Boyscouting modern python typing 
CURA-8555
 2022-06-15 13:27:47 +02:00
j.delarago
5d0e4238d5 Use os.path.join instead of appending a "/" since this is os specific. 
Remove possible bad conversion to str for path.
 2022-06-15 13:26:29 +02:00
j.delarago
f7bc55db15 Revert "temu extra logging for debugging" 
This reverts commit febb7f1205.
 2022-06-15 12:53:42 +02:00
j.delarago
febb7f1205 temu extra logging for debugging 2022-06-15 11:55:53 +02:00
j.delarago
8362d4c967 Switch to column layout in RecommendedPrintSetup.qml so that left margins can be put on infill selector and items below it. 
Add warning and reset button when custom profile is select and/or settings have been changed

CURA-8849
 2022-06-15 10:48:04 +02:00
j.delarago
5fa10b0b8a Add campaign link 
CURA-8849
 2022-06-15 09:48:08 +02:00
j.delarago
d293855c65 Remove typo 
CURA-8849
 2022-06-15 09:07:35 +02:00
j.delarago
d19e89325f Stop returning quality types from inactive quality groups. This was causing the resolution drop down to show unavailable resolutions. 
CURA-8849
 2022-06-15 09:06:00 +02:00
Ghostkeeper
3acc7bcb1c
Add actual link to help page for when a profile is not supported 
Doesn't have UTM tags though. Maybe that's not important here.

Contributes to issue CURA-8849.
 2022-06-14 18:20:35 +02:00
Ghostkeeper
b18cb1f649
Show UnsupportedProfileIndication if list of quality types is empty 
And otherwise show the intent and quality level selectors.

This is currently quite broken because the list of quality levels is not correct. It should only show a quality type if it is supported by all extruders.

Contributes to issue CURA-8849.
 2022-06-14 18:20:00 +02:00
Ghostkeeper
5c15ac68b8
Add a design for the notification when there's no recommended profile 
Looks more harsh than it should be, perhaps. I'd prefer if we could add some text that says that you can create your own custom profiles too...

Contributes to issue CURA-8849.
 2022-06-14 16:59:23 +02:00
c.lamboo
a7fcc15197 Re-enable regular expression 
CURA-8555
 2022-06-14 16:49:40 +02:00
c.lamboo
0d4c3fa34d Use modern python typing notation 
CURA-8555
 2022-06-14 16:20:38 +02:00
Ghostkeeper
b8e3793631
Fix QML warning about no variable 'transparent' existing 
It's a colour name. It should be within quotes here.

Contributes to issue CURA-8849.
 2022-06-14 16:19:56 +02:00
c.lamboo
a315171d7c Replace checkboxes in save project to DL dialog with a combobox 
CURA-8555
 2022-06-14 16:19:56 +02:00
Ghostkeeper
aee614ff9b
Hide intent category selector if there's just 'default' intent 
It doesn't make sense to let the user choose then.

Contributes to issue CURA-8849.
 2022-06-14 16:12:10 +02:00