25644 Commits

Author SHA1 Message Date
Ghostkeeper
515c7459d3
Catch EnvironmentError when writing to UFP files
This should result in a user-visible error message rather than a crashing application.

Fixes Sentry issue CURA-28E.
2021-06-07 14:34:26 +02:00
Ghostkeeper
9a65008952
Catch correct exceptions
To catch the exception of duplicate file types, catch only the exception that triggers at this, OPCError. To catch generic file writing errors, catch all of EnvironmentError, not just OSError.
2021-06-07 14:28:33 +02:00
Jaime van Kessel
66f57d4d58
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-07 14:17:27 +02:00
Jaime van Kessel
89c2c94cc5
Merge branch 'PETG-for-UM3' of github.com:Ultimaker/Cura 2021-06-07 14:04:19 +02:00
VOLUMIC
ddd2e844cb
fix machine width (265) 2021-06-07 13:36:11 +02:00
VOLUMIC
7c8c978d05
Texts and names fixes (FR->EN) 2021-06-07 12:36:53 +02:00
VOLUMIC
230a0cd607
machine height correction to 310mm 2021-06-07 12:33:02 +02:00
Mark Burton
d2a7a4186a Avoid crash calculating max/min flow rates if there are no visible lines with extrusion. 2021-06-07 07:51:58 +01:00
Mark Burton
f65731e4c2 Reset min/max flow rates in calculateColorSchemeLimits(). 2021-06-06 12:17:19 +01:00
Mark Burton
2f1f370fe0 Remove local variable. 2021-06-06 12:17:03 +01:00
Mark Burton
4973d53057 Rework calculation of min/max flow rates for simulation view colour scheme.
The max value was being calculated as the product of the max line width, max layer thickness
and max feedrate but it should be calculated as the maximum of the products of the width,
thickness and feedrate for each individual line. i.e. calculate the flow for each line
and use the min and max values of the flows.
2021-06-06 09:34:56 +01:00
Ghostkeeper
2464f64129
Round layer height for display in quality menu
Otherwise it can become very long if it is calculated.

Fixes one of the issues found in #9887.
2021-06-04 14:03:59 +02:00
Konstantinos Karmas
8db873b155 Update setting_version to 17 2021-06-04 13:25:40 +02:00
Sarita-Ultimaker
48036c7b62 CC0.4 print profiles
Added and changes files to create the CC0.4 print profiles into Cura for S3 and S5
2021-06-04 13:15:22 +02:00
Ghostkeeper
2f8f98fcca
Add a log entry for importing, duplicating or removing a material
We encountered an issue yesterday that we had to find in a log file when a user was importing a material. Nothing is shown in the log when importing a material, so it was impossible to find.
Now we'll log this action. It is a direct user action, so info is a good log level.
2021-06-04 02:51:13 +02:00
Ghostkeeper
bb20e3307f
Revert "Fix merge conflict"
This reverts commit 7f1e61b7b8b6c6bb76ac5b99be8c762e1b01cd5e.

These icons were renamed, but the original icons are now restored so those changes need to be reverted.

Contributes to issue CURA-8267.
2021-06-03 17:27:35 +02:00
Ghostkeeper
3dc1dbbbdb
Load profile from ContainerRegistry if the stack refers to it
We encountered a case where the version upgrade changed the quality profile to a new one which was specific to the printer rather than a global profile. As the upgraded stack was being read from the project file, it would go look for the new quality profile in the workspace. That ID wouldn't be present in there, and so it would crash and pretend the project file is plain 3MF.
This change makes it fallback to the built-in profiles, for precisely such cases as when a version upgrade changes the stack.

Contributes to issue CURA-8212.
2021-06-03 17:13:22 +02:00
Remco Burema
00796b6c99
Add 'requirements.txt' to README 2021-06-03 12:55:49 +02:00
Remco Burema
992a35ae96
Merge pull request #9930 from Ultimaker/CURA-8269_exclude_plugins_from_backup
Exclude plugins from backup
2021-06-03 09:28:51 +02:00
Remco Burema
4fc43c2b32
Compare version-objects, not strings.
This would've gone so wrong if we actually released 4.10 without this, since, as a string, 4.10 is 'smaller than' 4.6 (for example), because alphanumerical-order.

done as part of CURA-8269
2021-06-03 09:25:59 +02:00
Ghostkeeper
cc6191a141
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2021-06-02 15:24:23 +02:00
Jaime van Kessel
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +02:00
Jaime van Kessel
4d5894d0c5
Merge pull request #9915 from AiyionPrime/patch-1
Update Readme regarding irc network
2021-06-01 16:08:53 +02:00
Jaime van Kessel
942e3106cf
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 16:07:38 +02:00
Jaime van Kessel
02a4ade2a5
Fix incorrect icons
CURA-8267
2021-06-01 16:07:05 +02:00
Ghostkeeper
867b3ba31e
Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master 2021-06-01 15:58:09 +02:00
Jaime van Kessel
cb2a7e1daa
Remove plugins that weren't restored in the backup from the installed list
CURA-8269
2021-06-01 14:37:12 +02:00
Jaime van Kessel
2d572eef7f
No longer include plugins in the backup
Backups are synced with your account anyway. Backing up the plugins means that you
quickly reach the limit of the max size (250mb) that the backups allow.

CURA-8269
2021-06-01 13:34:07 +02:00
Jaime van Kessel
fc87c6a90c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 11:41:16 +02:00
Jaime van Kessel
4f49a38168
Fix pre-heat button being ocluded by tooltip
Fixes #9891
2021-06-01 11:40:20 +02:00
Ghostkeeper
0f23dd714e
Merge branch 'CURA-8267_remove_new_icons' 2021-05-31 16:05:29 +02:00
StijnArntz
3e1cc89145 Changed version 16 to 17
Changed version number 16 to 17
2021-05-31 09:54:03 +02:00
StijnArntz
e68beabcbe Extra line at end of file
Added extra line at end of file
2021-05-31 09:34:47 +02:00
StijnArntz
605e1d1b2f PETG for UM3
Removed Generic and UM PETG from exclude material list.
Add quality files for PETG on UM3.
2021-05-31 09:20:00 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Jaime van Kessel
38ce22ba7c
Revert "Fix typo in icon name"
This reverts commit 12a98388d9fd00cd9e3b85a2ea060d6c8c9a215e.
2021-05-27 16:03:13 +02:00
Jaime van Kessel
119a957e7f
Revert "Add list for deprecated icons"
This reverts commit 34f75839c4811eeae946c2fb1c122569c1e75d7a.
2021-05-27 16:03:03 +02:00
Jaime van Kessel
760726cf0b
Revert "Add Function icon"
This reverts commit 5ad9cd4845ba286687e2bf0e74e947f219b384b9.
2021-05-27 16:02:53 +02:00
Jaime van Kessel
26afff6093
Revert "Switch out inherit icon"
This reverts commit 672d6c89cf6b12b01fe27c28622806310b063968.
2021-05-27 16:02:46 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
2021-05-27 16:01:17 +02:00
J. Burfeind
28aa9a1496
Update Readme regarding irc network 2021-05-27 15:56:21 +02:00
Ghostkeeper
8e12d49160
Merge branch 'master' of github.com:Ultimaker/Cura 2021-05-27 15:21:38 +02:00
Jaime van Kessel
6ec61a6a11
Merge branch 'fix_authdata_infinite_loop' of https://github.com/fieldOfView/Cura 2021-05-25 16:01:25 +02:00
fieldOfView
be06108f36 Fix an crash when starting Cura without a network connection 2021-05-24 18:43:05 +02:00
Humsie
21baf90ec8
Add Z Position parameter to FilamentChange (#9658)
* Add Z Position

* PR Comment: Add minimum value for z_position

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-05-21 17:02:53 +02:00
Remco Burema
0e95a4612a
Merge pull request #9856 from Ultimaker/CURA-8232_measure_file_type_usage
Add source file type to anonymous usage statistics
2021-05-21 14:05:30 +02:00
Ghostkeeper
7eba38b286
Check if child bounding box is None before checking if it's degenerate.
Contributes to issue CURA-7873.
2021-05-21 13:53:55 +02:00
Ghostkeeper
48d1715c2d
Also remove other transformations when getting the center position
The other transformations, in particular rotation, were also influencing the merge. The transformations were not removed when calculating the center position, causing the center position of a mesh to be calculating differently. When the meshes were actually transformed/moved, all of the transformations were removed but this gave the model a different center position. The different center position wasn't properly being compensated for using the previously calculated center position.

Fixes CURA-7873.
2021-05-21 13:45:51 +02:00
Ghostkeeper
6eeb135672
Fix calculating AABBs if group nodes are involved
The position of the group node should in theory never be included.
We'll return that position only if there is no mesh data and all children have no AABB either. In that case we'll return a degenerate AABB so that handling code has something to work with. But then also make sure that those degenerate AABBs are ignored if we want to get the AABB of a parent node.

Contributes to issue CURA-7873.
2021-05-21 13:30:53 +02:00
Vandresc
4936ff54d2
Merge pull request #9855 from Ultimaker/CURA-8233_filter_images_from_digital_factory
Filter images from DF open screen
2021-05-21 08:41:51 +02:00