Commit graph

31861 commits

Author SHA1 Message Date
Ghostkeeper
83bad98ea3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1 2022-06-30 17:48:38 +02:00
Ghostkeeper
e069946c24
Merge branch 'CURA-9365_fix_building_cura_main' of github.com:Ultimaker/Cura into CURA-9365_fix_building_cura_main 2022-06-30 17:48:19 +02:00
Ghostkeeper
585834970d
Update branches of Conan config files to 5.1
We'll want to have it test/build those next.

Contributes to issue CURA-9365.
2022-06-30 17:47:33 +02:00
j.delarago
c08aa5b765 Move icons to icons folder
Update dmg building script

CURA-9365
2022-06-30 17:41:38 +02:00
j.spijker@ultimaker.com
77a72fce25 Use correct paths
Contributes to CURA-9365
2022-06-30 16:55:56 +02:00
j.spijker@ultimaker.com
b4f3d5cbab Use correct paths
Contributes to CURA-9365
2022-06-30 16:40:24 +02:00
Jaime van Kessel
12379b15cd Use correct key for serialized setting to keep
'recommend cleaning after n prints' instead of 'recommended cleaning after n prints'

CURA-9432
2022-06-30 16:37:26 +02:00
j.spijker@ultimaker.com
2739057a97 Copy all shared libs
Contributes to CURA-9365
2022-06-30 16:36:09 +02:00
Jaime van Kessel
5c0f416536
Merge pull request #12638 from Ultimaker/CURA-9432_add_extra_material_settings
Add two recently introduced material settings
2022-06-30 16:31:40 +02:00
j.spijker@ultimaker.com
724f2ab079 Create tcl and tk paths
Needed by the dist

Contributes to CURA-9365
2022-06-30 15:37:24 +02:00
j.delarago
afa899cf21 Add dmg building script 😎
CURA-9365
2022-06-30 15:08:46 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata
Contributes to CURA-9365
2022-06-30 14:49:07 +02:00
Ghostkeeper
72b1097c9a
Add auxiliary files needed for AppImage
AppRun is the file that gets packaged inside of the AppImage that bootstraps the application.
The AppImage can only have one icon, so we use the largest sample we have available.
The appdata.xml contains some metadata.

Contributes to issue CURA-9409.
2022-06-30 14:43:52 +02:00
Ghostkeeper
047d7b1b19
Provision desktop file with Jinja to put in version number
This way the Desktop file for the AppImage knows the version number, and the appimage itself knows it too.

Contributes to issue CURA-9409.
2022-06-30 14:43:51 +02:00
Ghostkeeper
c2f3161fb6
Allow providing dist_path and version via command line arguments
Previously you had to call the script from the dist path specifically, using the cwd as a parameter. Now you can provide a different path, allowing you to call this script from any location.
Also the version number used to be hard-coded. Now that can be provided by the caller.

Contributes to issue CURA-9409.
2022-06-30 14:43:51 +02:00
c.lamboo
394942e2cf Move resources for mac dmg creation
CURA-9365
2022-06-30 14:34:22 +02:00
c.lamboo
5c1b665f25 Move resources for mac dmg creation
CURA-9365
2022-06-30 14:17:26 +02:00
Remco Burema
fab86be909 Keep settings throughout reserilization process.
Save some settings Cura doesn't use, but other consumers of the file might in the metadata during deserilization, so they can be properly re-serialized whenever exported.

part of CURA-9432
2022-06-30 14:14:11 +02:00
c.lamboo
f2717d1906 Add resources for mac dmg creation
CURA-9365
2022-06-30 14:08:37 +02:00
Ghostkeeper
f4b3256e3d
Add resolve value for Raft Base Wall Count
It's also a global setting and there is no particular reason for this to not be settable by a material profile or anything.

Done as a 5 minute fix.
2022-06-30 13:25:13 +02:00
j.spijker@ultimaker.com
a62e5ec1ad Use package for cura as well
Still need to fix the mappings and hidden imports

Contributes to CURA-9365
2022-06-30 12:11:00 +02:00
j.spijker@ultimaker.com
d07c9d64cc Fixed empty source
Contributes to CURA-9365
2022-06-30 11:58:57 +02:00
Ghostkeeper
648c1e95db
Add main function to make it easier to call this
Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
f3fd2d6f80
Fix calling subprocesses
We shouldn't unpack the list. The first argument is allowed to be a list. If we unpack it, it'll override other arguments to the call function that would be the wrong type then (buffer size).

Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
254edfd3ec
Fix deleting old files if they exist
Rmdir crashes when it needs to delete just one file, annoyingly.

Contributes to issue CURA-9409.
2022-06-30 11:48:56 +02:00
Ghostkeeper
970e0d8395
Add script to package and sign AppImages
This has not been tested yet at all.

Contributes to issue CURA-9409.
2022-06-30 11:48:55 +02:00
j.spijker@ultimaker.com
d20976d459 Moved pyinstaller, cura_version generate function
This is used both in source, generate and deploy

Contributes to CURA-9365
2022-06-30 09:49:22 +02:00
Ghostkeeper
795814d50b
Store unmapped settings in a separate set
We don't want to create actual settings for all of these. Just store them in the profile metadata and restore them.
Serialising and deserialising these is a bit more work than what I could do now in 5 minutes so we'll have to do that a bit later, but at least for now we have the complete list.

Contributes to issue CURA-9432.
2022-06-30 09:45:45 +02:00
j.spijker@ultimaker.com
6b51753973 Renamed folder structure to venv structure
Contributes to CURA-9365
2022-06-30 09:39:21 +02:00
j.spijker@ultimaker.com
d47635c0f9 Removed requirement install from deploy steps.
I'm gonna repurpose the VirtualPythonEnv for this

Contributes to CURA-9365
2022-06-30 09:37:17 +02:00
Ghostkeeper
e0c319ed46
Grammar and style
We use word-capitalisation in these setting labels. And we should put a period after sentences in the description.

Contributes to issue CURA-9432.
2022-06-30 09:10:24 +02:00
Jaime van Kessel
ddb87656ff Add two recently introduced material settings
CURA-9432
2022-06-29 16:24:51 +02:00
j.spijker@ultimaker.com
eae13942f3 Add PyQt6 to hidden imports
Contributes to CURA-9365
2022-06-29 16:15:55 +02:00
j.spijker@ultimaker.com
a837827bf3 Added extra Uranium cases
Contributes to CURA-9365
2022-06-29 15:56:18 +02:00
j.spijker@ultimaker.com
f745ab7fbc Add PyQt6 sip to hidden_imports
Contributes to CURA-9365
2022-06-29 15:52:43 +02:00
j.spijker@ultimaker.com
a2413f4a69 Use correct UM qml path
Contributes to CURA-9365
2022-06-29 15:51:14 +02:00
j.spijker@ultimaker.com
ed3f342e7f Search unsecure when not frozen
Also added share/<dep>/resources releative to sys.executable

Contributes to CURA-9365
2022-06-29 15:48:04 +02:00
j.spijker@ultimaker.com
2cee093d0b Map new conan local cache resources
Contributes to CURA-9365
2022-06-29 15:42:24 +02:00
j.spijker@ultimaker.com
1bb1efd429 Store generators in build folder
Contributes to CURA-9365
2022-06-29 15:32:24 +02:00
j.spijker@ultimaker.com
ff3a422890 Fixed mapping for pyinstaller from source install
Some paths in dependencies were moved around due to the new deploy functionality
this should fix it.

Contributes to CURA-9365
2022-06-29 15:12:51 +02:00
j.spijker@ultimaker.com
5062d704c2 Add deploy functionality
Contributes to CURA-9365
2022-06-29 15:12:51 +02:00
Rijk van Manen
b14774292f reduce minimum support xy distance
Setting this value smaller could cause scarring when the nozzle offset calibration is not performed. A higher value causes a too big gap between the model and support, resulting in support not being attached to the model on sloped surfaces. PP-185
2022-06-29 14:42:21 +02:00
Rijk van Manen
a42a15199f increase support horizontal expansion
A bigger horizontal expansion is improving the stability of the support structure. Setting the Support Horizontal Expansion > Support X/Y distance causes the support folding around the object, making it way harder to remove and introducing a lot of additional stringing. PP-185
2022-06-29 14:42:12 +02:00
Rijk van Manen
67d08fdd4d increase retract distance of PVA to default
PVA is stringing a lot due to the too small retract distance. This oozed material is causing under extrusion elsewhere, reducing the strength of the support. Too long retractions could cause reliability issues as well. However, since we reduced the number of retractions by ~40% for the smaller models (for bigger models it is ~0%, but then it is also not relevant since a lot of material is printed in between) with the new settings of PP-108 increasing the retract distance to 6.5mm is safe. PP-185
2022-06-29 14:42:05 +02:00
Rijk van Manen
257056afd2 default ultimaker values result in warnings
With the updated support settings of PP-108 some settings results in warnings. The warning limits are changed to avoid this. PP-185.
2022-06-29 14:41:56 +02:00
Jaime van Kessel
9ca86c9d08
Merge pull request #12636 from Ultimaker/PP-185-improve-support-reliability
PP-185_improve-support-reliability
2022-06-29 14:41:35 +02:00
Jaime van Kessel
a8a2fd8007 Add the "clear" hack to the tableModel for discardOrkeepchanges
It's the same hack that we already use for the other instances where we use the tableModel.
For some reason it wasn't done here, so we also had the not updating bug

CURA-9270
2022-06-29 13:34:41 +02:00
Casper Lamboo
a5d70dca16
Merge pull request #12590 from Ultimaker/CURA-7667_intents_in_packages
Intents in packages
2022-06-29 13:12:51 +02:00
Casper Lamboo
f4ee4ad05d
Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes
[CURA-8849] more intent fixes
2022-06-29 13:01:09 +02:00
Ghostkeeper
8724c8cec9
Merge branch '5.1' into CURA-9365_fix_building_cura_main 2022-06-29 12:06:03 +02:00