GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 05:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,778 Commits 295 Branches 268 Tags
Commit Graph

29778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f474381425 Fix multiple issues with profiles 
That's what you get from not having tests running remote.
 2022-06-17 16:06:24 +02:00
Jaime van Kessel
e38059b7c0 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:58:11 +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
c6a3fb3ae4 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:54:47 +02:00
Jaime van Kessel
3689c097f3 Re-add accidentally removed setting 2022-06-17 15:54:23 +02:00
Jaime van Kessel
85eb0fedcd Fix Convex hull decorator tests 2022-06-17 15:50:04 +02:00
Jaime van Kessel
6956a4ad37 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:37:56 +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
Jaime van Kessel
3514c01b25 Remove duplicated code 
CURA-9352
 2022-06-17 15:21:30 +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
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change. 
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
 2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design 
CURA-8849
 2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together. 
Fix is to have the children fill their width

CURA-8849
 2022-06-16 13:12:36 +02:00
Joey de l'Arago
88168bc0e1
Merge pull request #12532 from Ultimaker/PP-116_clean-up-DD-variant-profile 
Pp 166 clean up dd variant profile
 2022-06-16 11:08:50 +02:00
Jelle Spijker
b8a4243e26 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 10:48:41 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata 
[CURA-8610] save required packages metadata
 2022-06-16 10:47:06 +02:00
j.delarago
8c92ebfccd Add missing import 
CURA-8849
 2022-06-16 10:41:06 +02:00
Jelle Spijker
d9b9959346 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 09:54:20 +02:00
j.spijker@ultimaker.com
8ce661b062 Add GitVersion 
Contributes to CURA-9365
 2022-06-16 09:54:03 +02:00
Jaime van Kessel
d30afb6647
Merge pull request #12534 from StuSerious/main 
Enhance CITATION.cff
 2022-06-16 09:29:10 +02:00
j.spijker@ultimaker.com
b364f512d8 Use string as type for body 
Contributes to CURA-9365
 2022-06-16 07:16:47 +02:00