29056 Commits

Author SHA1 Message Date
Jelle Spijker
93e58d55fa Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-14 11:44:18 +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.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
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
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
4DPrinters
98ed17d2df
Update PauseAtHeight.py
Corrected typo on line 333
2022-06-09 14:34:28 -05: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
j.spijker@ultimaker.com
40990d686f Set cmake policies for MSVC flags
Although not used in this project.
This policy is needed by our cura-build-environment
because the conan_toolchain requires this to be set.
Since we use CMake for all our repo's even pure
Python or resource repos such as this, we need to
set in regardless.

Contributes to CURA-9365
2022-06-07 16:28:55 +02:00
Ghostkeeper
fb3f065fe0
Catch ValueErrors from removing callbacks that were already removed
This can happen from asynchronous access.

Fixes Sentry issue CURA-3YV.
2022-06-07 13:55:56 +02:00
j.delarago
efeb29c734 Fix call to plugin that was causing errors when building
CURA-8610
2022-06-07 13:41:54 +02:00
Remco Burema
d2381f129f
Merge pull request #12434 from Ultimaker/CURA-6990
Use "required packages" metadata to load a project file with a third party material
2022-06-07 13:26:31 +02:00
c.lamboo
76180eee01 Show warning on-close of the install missing packaged dialog
CURA-6990
2022-06-06 22:49:49 +02:00
c.lamboo
bee4da6368 Re-use Marketplace Component in the InstallMissingPackagesDialog
CURA-6990
2022-06-06 22:27:31 +02:00
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
c.lamboo
781723fbbc Fix typing
CURA-6990
2022-06-06 21:27:32 +02:00
c.lamboo
34004df7af Un-capitalise materials
CURA-6990
2022-06-03 16:25:43 +02:00
c.lamboo
eccef62dc7 Add typing
CURA-6990
2022-06-03 15:22:29 +02:00
c.lamboo
2230269ab3 Simplify variable assignment
CURA-6990
2022-06-03 15:17:32 +02:00
c.lamboo
8d3b3ae411 Use themed border width
CURA-6990
2022-06-03 11:13:19 +02:00
c.lamboo
4492e3fba2 Add warning border to PackageCard if information is missing
CURA-6990
2022-06-03 10:39:01 +02:00