Commit graph

29423 commits

Author SHA1 Message Date
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
a548e13db3 add bundled paths log 2022-06-15 11:25:47 +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
Ghostkeeper
6b6f41bfe9
Add a horizontal line between sections of recommended set-up
This delimits the selecting of the profile from the few basic settings.

Contributes to issue CURA-8849.
2022-06-14 16:07:05 +02:00
Ghostkeeper
83ea5c2944
Fix triggering first pulse
Before the first pulse, the _previousResolution property was still bound to the activeQualityType property of the MachineManager. When it then checks if it changed, it finds that it didn't change because it checks against that same property, but the _previousResolution automatically updated with it. After that it loses its binding because it's set in the function itself to a fixed value.
Instead, we'll now give it its initial value with the Component.onCompleted function so that it doesn't bind, and then doesn't change along with the first change.

Contributes to issue CURA-8849.
2022-06-14 16:00:14 +02:00
Ghostkeeper
e095d41f0b
Implement pulse animation option for ComboBox widget
You can now call pulse() on it and it'll pulse in the warning colour.

Contributes to issue CURA-8849.
2022-06-14 16:00:14 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
2022-06-14 16:00:13 +02:00
j.delarago
40d473c243 Add circle with letter inside for non default intents
CURA-8849
2022-06-14 15:44:11 +02:00
Ghostkeeper
074e9a8607
Show profile group name in bold
That highlights it relative to the layer height.

Contributes to issue CURA-8849.
2022-06-14 15:36:29 +02:00
Ghostkeeper
28c1291feb
Allow configuring combobox with whether they allow styled text or not
For some models we'd like to have the possibility to have rich text in the combobox. For some we'd like to prevent that, for instance to prevent the user from using colours in their profile names, or boldface, or even images.

Contributes to issue CURA-8849.
2022-06-14 15:36:28 +02:00
j.delarago
5cfb6f94e3 Update the resolution dropdown model whenever a custom profile is enabled. Otherwise it won't reflect the custom profiles parent resolution.
CURA-8849
2022-06-14 15:03:47 +02:00
Jelle Spijker
93e58d55fa Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-14 11:44:18 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix.
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
2022-06-14 11:41:38 +02:00
j.spijker@ultimaker.com
ffca22971e Use different icon formats depending on OS
Contributes to CURA-9365
2022-06-14 11:37:43 +02:00
j.delarago
6f88adab8e Add new theme colors from figma
CURA-8849
2022-06-14 11:27:50 +02:00
j.delarago
e7d4038461 Add new icons for intents
CURA-8849
2022-06-14 09:59:52 +02:00
j.delarago
ed7ec6ab8f Add intent change signal so intent changes can trigger updates in resolution drop down.
CURA-8849
2022-06-14 09:59:22 +02:00
j.spijker@ultimaker.com
3e67566aad Use relative path for the entrypoint
Contributes to CURA-9365
2022-06-14 09:18:08 +02:00
j.spijker@ultimaker.com
ca83874f65 Add sip as dev requirement
Although net technically needed by Cura, our other Python binding
modules (such as pynest2d, pyArcus, pySavitar) might need it if
the need to be build on the host machine

Contributes to CURA-9365
2022-06-14 08:42:23 +02:00
j.spijker@ultimaker.com
296dd40da7 Add Shapely and other transitive deps
Contributes to CURA-9365
2022-06-14 08:41:01 +02:00
j.spijker@ultimaker.com
4ac4190eae Make VirtualPythonEnv optional
Contributes to CURA-9365
2022-06-14 07:41:16 +02:00
j.spijker@ultimaker.com
3ff1dec631 Use dev version as no version is set
Contributes to CURA-9365
2022-06-14 07:23:15 +02:00
p.kuiper
808bb9b5fb Merge remote-tracking branch 'origin/PP-108_Improved_support_settings' into PP-108_Improved_support_settings
# Conflicts:
#	resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
2022-06-13 21:55:25 +02:00
p.kuiper
bfc25b8350 Processed review comments of Rijk van Manen + cleanup redundant support_z related settings
Relates to PP-108
2022-06-13 21:41:46 +02:00
p.kuiper
55f1b9efca Cleanup support_xy_distance_overhang settings in UM2 quality files
Relates to PP-108
2022-06-13 21:03:23 +02:00
j.spijker@ultimaker.com
f193a7ce1f Don't use buildmetadata for conandata version
Contributes to CURA-9365
2022-06-13 19:15:27 +02:00
j.spijker@ultimaker.com
9ec39a9c7e Moved handling of the sources to the generate function
When running `conan source .` on ubuntu the `.git` folder
was removed, happens with cona 1.47 ... 1.49
This seems to be a bug in Conan, I will try to reproduce
it and create an issue in their repo.

Contributes to CURA-9365
2022-06-13 17:03:41 +02:00
j.spijker@ultimaker.com
3a8a04669b Bump-up scipy to version 1.8.1
We were still using a RC.

Contributes to CURA-9365
2022-06-13 16:51:03 +02:00
Jaime van Kessel
90bb02acae
Merge pull request #12485 from 4DPrinters/patch-1
Update PauseAtHeight.py
2022-06-13 15:50:54 +02:00
j.spijker@ultimaker.com
5190742850 Add relative uranium, libcharon and cura to PYTHONPATH
Needed because not everything is a conan package yet

Contributes to CURA-9365
2022-06-13 15:46:10 +02:00
j.spijker@ultimaker.com
22e17dd040 Generate the pyinstaller spec file
This will be generated if you do a conan install with devtools

It assumes that the projects `cura-binary-data`, `fdm_materials`,
`uranium`, `libcharon` are installed along side the `cura` project.

It will automatically install the fdm_materials when running
conan source.

The pyinstall dist can be created with:

```
# Windows Powershell
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
.\venv\Scripts\Activate.ps1
pyinstaller Ultimaker-Cura.spec
```

```
# bash
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
source venv\bin\activate
pyinstaller Ultimaker-Cura.spec
```

Contributes to CURA-9365
2022-06-13 15:15:09 +02:00
j.spijker@ultimaker.com
04f16bfcad Use dev as development version
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`

Contributes to CURA-9365
2022-06-13 15:08:00 +02:00
j.delarago
964c566ffb Add spacing option between icon and text in IconWithText.qml 2022-06-13 14:43:23 +02:00