Commit graph

29423 commits

Author SHA1 Message Date
j.spijker@ultimaker.com
c61ecfa00e Also run workflow when reussable workflow changes
Contributes to CURA-9365
2022-06-21 10:39:13 +02:00
j.spijker@ultimaker.com
c11865d1ca switched the conan-config with/out branch statement
Contributes to CURA-9365
2022-06-21 10:37:37 +02:00
j.spijker@ultimaker.com
4467491c36 Move the Conan cache step before in conan-config install
It looks like the new conan configuration isn't applied, the
ordering of the cache might influence this. At the very least
it doens't hurt to do this step at the beginning of the workflow

Contributes to CURA-9365
2022-06-21 10:23:38 +02:00
j.spijker@ultimaker.com
2f95fd2616 Remove old CI workflow
No longer relevant or needed

Contributes to CURA-9365
2022-06-21 10:19:25 +02:00
j.spijker@ultimaker.com
227b106927 Use the new JFrog Artifactory server
Only upload binaries to cura repo,
the cura-ce should contain only recipes and sources

Contributes to CURA-9365
2022-06-21 10:15:43 +02:00
Jelle Spijker
6d509e1094 Revert "Workaround for no remote atm"
This reverts commit 215f487978.
2022-06-21 09:56:15 +02:00
j.spijker@ultimaker.com
0ced137432 Also trigger workflow on changing runner pip req
Contributes to CURA-9365
2022-06-21 09:52:59 +02:00
j.spijker@ultimaker.com
57e991e214 Add runner pip requirements
Contributes to CURA-9365
2022-06-21 09:50:58 +02:00
Jelle Spijker
cd12d24584 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-21 07:52:58 +02:00
j.spijker@ultimaker.com
d275ad37f8 Remove user and channel
Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.

Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.

Contributes to CURA-9365
2022-06-21 07:52:27 +02:00
j.delarago
4ee4a781f4 Change flashing yellow warning on resolution combobox to blue flashing lining.
Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations.

CURA-8849
2022-06-20 11:33:28 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
2022-06-20 11:04:14 +02:00
j.delarago
9c16e200e0 Update reset settings icon in print settings to match new color used in recommeded settings
CURA-8849
2022-06-20 10:56:00 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml,
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
2022-06-20 10:52:31 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
2022-06-20 10:48:13 +02:00
j.spijker@ultimaker.com
a31124673b Compile libffi and mpdecimal statically on Windows
Contributes to CURA-9365
2022-06-19 19:08:24 +02:00
j.spijker@ultimaker.com
0fb8d62825 Use patched recipes for cpython, mpdecimal, tk, tcl
Once upstream recipes are fixed these can be removed again.
export the changes for now
```
# Export patched conan-center-index recipes, I will open PR's for all of those
git clone https://github.com/jellespijker/conan-center-index.git
pushd .
cd conan-center-index

git checkout fix_tcl_recipe_env_info
conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing

git checkout fix_tk_recipe_env_info
conan export recipes/tk/all tk/8.6.10@ultimaker/testing

git checkout fix_mpdecimale_recipe_not_use_msys
conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing

git checkout add_3_10_4_version_cpython
conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing
```

Contributes to CURA-9365
2022-06-19 14:59:36 +02:00
j.spijker@ultimaker.com
05191af96f set mpdecimal cxx option to false on windows
the combination of compiling it shared and with cxx is invalid
on Windows. We don't use the cxx capabilities of mpdecimal

Contributes to CURA-9365
2022-06-19 14:34:26 +02:00
j.spijker@ultimaker.com
74bd183869 Use cpython 3.10.4
See branch in fork conan-center-index
https://github.com/jellespijker/conan-center-index/tree/add_3_10_4_version_cpython

Contributes to CURA-9365
2022-06-19 14:03:16 +02:00
j.spijker@ultimaker.com
23501a8fdb Update README
- Add banners
- remove old chat channels
- Mention ExtensiveSupportLogging plugin

Contributes to CURA-9365
2022-06-18 20:01:42 +02:00
j.spijker@ultimaker.com
229e548e1d Add Conan generated deps graph for documentation
Contributes to CURA-9365
2022-06-18 17:20:45 +02:00
j.spijker@ultimaker.com
bfa5c440bf Use Conan CPython
This should make things more agnostic.
although technically not needed for Uranium
and already implicitly defined as a requirement
of pyArcus. I think it is good to include this
requirement here as well. For Unit Testing etc.

Contributes to CURA-9365
2022-06-18 16:49:34 +02:00
j.spijker@ultimaker.com
ac6f939db3 Use Conan CPython package
Now all our deps are compiled with the same flags.
This should help to make it more agnostic over the
systems.

Contributes to CURA-9365
2022-06-18 16:44:07 +02:00
j.spijker@ultimaker.com
dce96a6abd Add a custom export-pkg option
Repo's such as fdm_materials and cura-binary-data don't
need to build we can just export pre-build binaries
and files with the recipe

Contributes to CURA-9365
2022-06-18 14:44:46 +02:00
j.spijker@ultimaker.com
0713960482 Fixed couple of mistakes in conandata
Contributes to CURA-9365
2022-06-18 11:51:41 +02:00
j.spijker@ultimaker.com
29ddfe1352 Make the entrypoint and icon path relative from source
Contributes to CURA-9365
2022-06-18 11:39:49 +02:00
j.spijker@ultimaker.com
dfc0f9b31f Use UMBaseConanfile for reusable functions
Added a recipe in the conan-ultimaker-index repo,
which contains a conanrecipe that can be loaded
as a python_requires.

This allows us to reuse python code over multiple
recipes, see: https://docs.conan.io/en/latest/extending/python_requires.html

Contributes to CURA-9365
2022-06-18 11:35:20 +02:00
j.spijker@ultimaker.com
4c1262d9d3 Add conan generated files to the .gitignore
Contributes to CURA-9365
2022-06-18 00:31:45 +02:00
j.spijker@ultimaker.com
eb8e119e5c Using node-semver to validate version in conandata
Still not sure if this is the best approach.

Contributes to CURA-9365
2022-06-18 00:29:15 +02:00
j.spijker@ultimaker.com
17d1d95217 Add the conan-package workflow
Contributes to CURA-9365
2022-06-17 18:15:14 +02:00
j.spijker@ultimaker.com
aaed543a22 Add entrypoint info to conandata
With the new PyCharmRunEnv generate conan
should automatically create a pycahrm run
target, setting the paths correctly.

Usage as: `conan instal ....... -g PyCharmRunEnv`

Contributes to CURA-9365
2022-06-17 18:12:22 +02:00
Jaime van Kessel
3101f2aea4 Remove filter_out_tiny_gaps from definitions
This setting doesn't exist anymore.
2022-06-17 15:57:40 +02:00
Jaime van Kessel
3689c097f3 Re-add accidentally removed setting 2022-06-17 15:54:23 +02:00
Jaime van Kessel
f82e49e2dd Merge branch 'fix_material_diameter_profiles' of github.com:fieldOfView/Cura into 5.1 2022-06-17 15:35:32 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
Jaime van Kessel
d05417f7f0 Remove duplicated code
CURA-9352
2022-06-17 15:22:33 +02:00
j.delarago
f650579799 PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg.
There is no additional margin on the left that can be removed, so instead I've given it a small negative margin

CURA-8849
2022-06-17 15:02:45 +02:00
Jelle Spijker
f6aa409701 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-17 10:01:04 +02:00
j.spijker@ultimaker.com
f9447edf47 Remove materials before import
This ensures that there won't be any old materials present
if they're deleted between versions.

Contributes to CURA-9365
2022-06-17 08:22:30 +02:00
j.spijker@ultimaker.com
e6bfea7c81 import fdm_materials
Contributes to CURA-9365
2022-06-17 07:59:05 +02:00
j.spijker@ultimaker.com
8d03f0c665 Use Cura source folder for pyinstaller
Contributes to CURA-9365
2022-06-17 07:33:08 +02:00
j.spijker@ultimaker.com
2044ff2d6a import the fdm_materials
Contributes to CURA-9365
2022-06-17 07:32:18 +02:00
j.spijker@ultimaker.com
cd3bb71f6f Use semver compatible range modifier
https://docs.conan.io/en/latest/versioning/version_ranges.html

It won't match build metadata otherwise.

The order of search for matching versions is as follows:

First, the local conan storage is searched for matching versions, unless the --update flag is provided to conan install.
If a matching version is found, it is used in the dependency graph as a solution.
If no matching version is locally found, it starts to search in the remotes, in order. If some remote is specified with -r=remote, then only that remote will be used.
If the --update parameter is used, then the existing packages in the local conan cache will not be used, and the same search of the previous steps is carried out in the remotes. If new matching versions are found, they will be retrieved, so subsequent calls to install will find them locally and use them.

Contributes to CURA-9365
2022-06-17 07:19:53 +02:00
j.spijker@ultimaker.com
6cbc9aaa38 Use only pip in conan requirements
No longer download and mess with sources from
other repo's.

Created Conan packages for cura-binary-data,
fdm_materials and uranium.

Charon is installed with pip. I had to create
a separate requirement file for that since
you can't mix and match git and hashes.

Contributes to CURA-9365
2022-06-16 19:55:56 +02:00
Casper Lamboo
50a3511496
Merge pull request #12542 from Ultimaker/CURA-8849_intent_selection_fixes
[CURA-8849] Intent selection fixes
2022-06-16 15:55:32 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable
Remove debug print statement

CURA-9321
2022-06-16 15:32:33 +02:00
j.delarago
1a464051d4 On initial startup, when assigning your first printer the ActiveIntentQualitiesModel.py would not be updated. Causing an error unsupported configuration to show.
Fixed by updating the model when the globalContainer is changed as well.

CURA-8849
2022-06-16 14:27:13 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names.
CURA-8849
2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available.
This was caused by visible being overridden.

CURA-8849
2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design.
CURA-8849
2022-06-16 13:56:46 +02:00