Commit graph

30004 commits

Author SHA1 Message Date
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
Rijk van Manen
82569c14ac these profiles can simply follow the default values
Looks like these removals have been overlooked. PP-108
2022-06-13 14:11:28 +02:00
Jaime van Kessel
363d828634 Remove the NoIntentIcon
CURA-8623
2022-06-13 13:33:39 +02:00
Jaime van Kessel
525f96db98 Merge branch 'CURA-8610_add_package_metadata' of github.com:Ultimaker/Cura 2022-06-13 13:22:03 +02:00
j.spijker@ultimaker.com
c04fdfef47 add jeepney as dependency on all platforms
Contributes to CURA-9365
2022-06-13 00:21:50 +02:00
j.spijker@ultimaker.com
891fc36658 Add secretstorage and keyring as requirements
Contributes to CURA-9365
2022-06-13 00:15:19 +02:00
j.spijker@ultimaker.com
17a5c45f1a Add jeepney as requirements for linux
Contributes to CURA-9365
2022-06-13 00:08:50 +02:00
j.spijker@ultimaker.com
8d7732353f Allow using lower case true, false options
Workaround for Github Actions passing a lowercase boolean as a string

Contributes to CURA-9365
2022-06-12 23:54:50 +02:00
j.spijker@ultimaker.com
2cab988c63 Manage deps with the conan_data
Contributes to CURA-9365
2022-06-12 20:18:41 +02:00
j.spijker@ultimaker.com
b318be171b Add pyserial as a requirement
Contributes to CURA-9365
2022-06-12 19:18:53 +02:00
Jelle Spijker
823e8f6347 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-12 19:10:52 +02:00
j.spijker@ultimaker.com
5d740d7368 Set the CuraVersion with the conan options
Contributes to CURA-9365
2022-06-12 19:09:22 +02:00
j.spijker@ultimaker.com
e1c384cd92 Add a conanfile
This file should take care of downloading the C++ and Python binding
dependencies. It uses the PythonVirtualRunEnv to generate a Virtual
Python Environment, setting the Paths and installing the requirements
specified in the requirements.txt

Contributes to CURA-9365
2022-06-12 17:30:38 +02:00
j.spijker@ultimaker.com
8c6a5baf35 Define Cura Python requirements
Our requirements.txt was never fully utilized.
For our builds we use a requirements.txt
specified in the cura-build-enviroment repo.
But that file contained all the Python requirements
including, testing and dev tools.

This requirements.txt should contain the bare minimum
for running Python. Since these dependencies are shipped
we need to specify the hashes as well.

These hashes aren't necessary for build and test requirements

Contributes to CURA-9365
2022-06-12 17:24:30 +02:00
Jaime van Kessel
7397497260 Add quality_name and quality_changes_name to replacement patterns
CURA-9375
Fixes #12447
2022-06-10 16:00:23 +02:00
Jaime van Kessel
e57af7556c Remove incorrect maximum_value for bridge_skin_density
Whoops. That should have already been removed.

Fixes #12455
2022-06-10 13:54:03 +02:00
p.kuiper
3e5bacd684 The horizontal expansion can be used to create a more robust support structure when needed. Therefore also expose this setting in the Basic settings view.
Relates to PP-108
2022-06-10 10:29:14 +02:00
4DPrinters
98ed17d2df
Update PauseAtHeight.py
Corrected typo on line 333
2022-06-09 14:34:28 -05:00
3d-hctech
40aa9cad18 Update configurations for these 3 printers of HCTECH
Update configurations for these 3 printers of HCTECH
2022-06-09 17:23:02 +08:00
3d-hctech
9437de8266
Merge branch 'Ultimaker:main' into master 2022-06-09 15:09:40 +08:00
p.kuiper
633e80292d Bug fix for tree support. Wall count should switch to 1 for tree support.
Relates to PP-108
2022-06-08 22:07:24 +02:00
p.kuiper
ba275c546e Renoved settings that already have a good default value in fdmprinter.def.json. Added support_use_towers to the PVA quality files.
Removed support_use_towers for AA and CC cores, they do not add anything to self support structures.

Relates to PP-108
2022-06-08 21:33:14 +02:00
p.kuiper
6b30273686 Made xy support distance to the wall 1mm iso support_offset (support_offset was 0mm when no support interface was used).
Restored the default 0.1mm z distance for the UM2 familie.

Relates to PP-108
2022-06-08 16:08:46 +02:00
j.delarago
aeb7f33c62 We were previously both scaling down the buildplate and scaling up the disallowed areas of the models with shrinkage compensation. Doing both reduces the max usable area when scaling.
The solution is to do only one of these options.

Removing the disallowed area works fine when scaling models from their center. However we scale 2 or more models from the buildplate center rather than the model center. This means that the models can go outside the buildplate without it being obvious from the visualization.

The better solution is to remove the buildplate x/y scaling and keep the disallowed areas.

Removed shrinkage factor build volume scaling on x and y. This information is shown already by scaling the allowed areas around the objects.

Kept the bounding box scaling for z. This shows the max height a model can be. The objects disallowed area does not show this information.

Also removed scaling on non model disallowed areas on the build plate since this does not need to scale with the build plate anymore.

CURA-9271
2022-06-08 15:25:03 +02:00
p.kuiper
8e3ec5655a Added PVA robustness improvements. Turn of fan when used as support material, will improve strength. Dump extra material in the skirt to purge the hotend with fresh PVA.
Relates to PP-108
2022-06-08 15:10:41 +02:00
p.kuiper
8ef3444b4a Enable interface layer for BAM (also for PVA, but this was already enabled via the BB core variant).
Relates to PP-108
2022-06-08 12:40:28 +02:00
j.delarago
d5511a078c Dialog was immediately being destroyed because a reference to it was not being stored in memory. Added a missingPackageDialog variable to WorkspaceDialog to fix this.
Swapped the loading order of Marketplace extensions so SyncOrchestractor is not fetched by PluginRegistry.getInstance().getPluginObject("Marketplace") in WorkspaceDialog.

CURA-8610
2022-06-08 12:19:36 +02:00
j.delarago
25250a8205 Merge remote-tracking branch 'origin/main' 2022-06-08 11:52:01 +02:00
j.delarago
f9ea517e05 If package.json metadata file is missing from 3mf file output warning instead of error.
CURA-8610
2022-06-08 11:51:54 +02:00
Ghostkeeper
4a08b88f31
Allow setting metadata subentries that don't exist yet
Otherwise it crashes here. The ContainerManager should be flexible enough to allow that sort of thing.
It works with plain entries, but crashed with subentries (like 'properties/diameter') if those weren't present yet in the metadata.

Fixes Sentry issue CURA-3FH.
2022-06-08 11:24:46 +02:00
j.delarago
ddb49ddba4 Add comment
CURA-8610
2022-06-08 11:20:51 +02:00
j.delarago
71a817697b Before this change packages were only being checked if they were bundled after loading the package_id. However only installed packages were being loaded so this would always be false.
The solution here is to check first if a material file is inside "secure_paths" (these are install directory resource paths). If it is, it must be a bundled material.

CURA-8610
2022-06-08 10:22:24 +02:00
Ghostkeeper
0f12b012cf
Create InstallMissingPackageDialog with newly-exposed function from Marketplace
This adds a new function to the API of the Marketplace plug-in.
It's not pretty, but it's going to be how it is for a while.

Done to fix a critical build issue. The 'import plugins' thing works from source but not on the build.
2022-06-08 10:19:51 +02:00
Ghostkeeper
de8a58f0d7
Fix imports, especially not using plugins folder as module
When running from source, 'import plugins' works since it's working from the directory where the plug-ins directory is located. However in a build this doesn't work since the source code is in a different location there.
2022-06-08 09:50:44 +02:00
p.kuiper
8a9c202aef Merge branch 'main' into PP-108_Improved_support_settings 2022-06-08 08:42:34 +02:00
p.kuiper
ea929fdf46 Fixed typo in minium_support_area formula
Relates to PP-108
2022-06-08 08:42:00 +02:00