25644 Commits

Author SHA1 Message Date
Remco Burema
1c806199a4
Explicitly give keyring backend on Mac too.
CURA-7180
2021-04-08 14:08:35 +02:00
MarkMan0
8a091aa0d2 Change default machine_height 2021-04-08 13:27:11 +02:00
MarkMan0
ee50ad21cd Probe calibration on the side of the buildplate 2021-04-08 13:27:05 +02:00
Kostas Karmas
dca0612ee7 Add descriptive comment for deleting the user auth data
CURA-8093
2021-04-08 12:49:33 +02:00
Kostas Karmas
72080a3cca Delete the auth data on upgrade from 4.8 if the scope doesn't match
If the user account scope is outdated, delete it when upgrading from 4.8 to 4.9. This means that
the user will have to log in again, to make sure they get the correct account scope.

CURA-8093
2021-04-08 12:46:52 +02:00
Jaime van Kessel
8e106b2f5b
Merge branch '4.9' of github.com:Ultimaker/Cura 2021-04-08 12:05:26 +02:00
Ghostkeeper
fcc567c8aa
Merge branch 'master' of https://github.com/kreuzhofer/Cura into kreuzhofer-master 2021-04-08 11:53:06 +02:00
Remco Burema
37cd12663b
Merge pull request #9523 from Ultimaker/fix_tests_python_upgrade
Fix tests python upgrade
2021-04-08 11:49:38 +02:00
Jaime van Kessel
82ffdccac2
Added type ignore since it does accept it 2021-04-07 17:15:22 +02:00
Jaime van Kessel
8cc091fd0a
Merge branch 'typing_keyattribute' of github.com:Ultimaker/Cura into fix_tests_python_upgrade 2021-04-07 15:43:03 +02:00
Jaime van Kessel
d49a90029f
Fix final set of typing issues 2021-04-07 14:03:35 +02:00
Jaime van Kessel
3432720f7c
Fix mypy issues caused by numpy upgrade 2021-04-07 11:47:52 +02:00
Jaime van Kessel
17d8751ec1
Fix incorrect typing in keyring attribute
It didn't need Type["basemodel"] but a direct base model
2021-04-07 11:39:28 +02:00
Jaime van Kessel
00a360aca6
Don't overload types in AMFReader
The typing really doesn't like it if we first let a variable be a list and then
an numpy array
2021-04-07 11:32:09 +02:00
Jaime van Kessel
0d38035944
Add constructor for keyring attribute
_store_secure was used, so it should be created on construction
2021-04-07 11:30:08 +02:00
jelle Spijker
4b1087a138
Put BaseModel in quotes
Contributes to CURA-7180
2021-04-07 11:25:39 +02:00
jelle Spijker
33a812d696
Added typing fof KeyringAttributes
This should hopefully shut mypy up.

Contributes to CURA-7180
2021-04-07 11:06:06 +02:00
Remco Burema
1e5d7623cb
Make it more clear the updates where for MacOS BigSur. 2021-04-07 09:40:06 +02:00
Remco Burema
d2007901f7
Also convert visibility-preset dropdown.
This will make this Qt5.15 control work on mac again. (Since the older controls are deprecated.)

CURA-8127
2021-04-07 08:31:49 +02:00
Kostas Karmas
39e9dcd4f5 Fix VersionUpgrade48to49 crashing if there is no "categories_expanded"
If the 4.8 is started from a clean install and no category gets expanded in the settings panel,
then the "categories_expanded" key will not exist in the [cura] preferences in cura.cfg.
As a result, when the 4.9 gets started in this specific case, the version upgrade 48 to 49 will
produce a crash and will be considered as "failed", which will then lead to cura requesting from
the user to go from the entire onboarding flow instead of landing on the "What's new" pages (even
though everything else has been properly updated).

This commit fixes that by checking whether the "categories_expanded" key exists in the cura.cfg.
2021-04-06 16:37:06 +02:00
Remco Burema
b3ea26c955
Half-revert last-last-last changelog changes.
CURA-8127
4.9-beta
2021-04-06 15:11:43 +02:00
Remco Burema
b505835248
Merge pull request #9509 from Ultimaker/Post_processing_script_add_script_fix
CURA-8127: Post processing script add script fix
2021-04-06 15:07:29 +02:00
Kostas Karmas
b2b258d357 Fix add script button list not working in MacOS
Fixed by using the qt quick controls 2

CURA-8127
2021-04-06 14:53:20 +02:00
jelle Spijker
1132e4c6f9
Added known Mac OSX issues to the Changelog of 4.9 beta
This commit should be reverted on the branch with the fixes made by
@rburema.
2021-04-06 14:09:13 +02:00
Ghostkeeper
95297f0410
Merge branch '4.9' 2021-04-06 13:30:03 +02:00
Ghostkeeper
08be77adad
Increment SDK version to 7.5.0
The Cura 4.9 release will have expanded functionality. If you have a plug-in that uses this functionality, marking it as using SDK 7.5.0 will notify older Cura releases that they can't use that plug-in.
2021-04-06 13:28:08 +02:00
Remco Burema
81c37ac4f4
Changelog changes just in time. 2021-04-06 13:10:52 +02:00
Jelle Spijker
98730eace7
Merge pull request #9508 from Ultimaker/CURA-8142_custom_menu_osx_fix
CURA-8142 Custom-menu OSX workaround
2021-04-06 12:39:28 +02:00
Remco Burema
40fb430277
Merge pull request #9501 from Ultimaker/CURA-7180_keyring_none_value
Handle storing None values in keyring
2021-04-06 12:31:45 +02:00
Remco Burema
7520e3b148
Workaround old-style menu's not closeable on Mac OSX.
Menu's didn't always close, and on newer Macs users wouldnt be able to even close the menu, making this a blocker. Will fix this properly before the final, but at least the beta should be usable now.

CURA-8142
2021-04-06 12:21:59 +02:00
Konstantinos Karmas
b9f76ef9e4
Merge pull request #9488 from Ultimaker/CURA-8110_upgrader
Cura 8110 upgrader
2021-04-06 12:03:17 +02:00
Jelle Spijker
e9a8ff05cd
Merge pull request #9507 from Ultimaker/CURA-8127_pref_screen_osx_fix
CURA-8127 preference-screen OSX fix
2021-04-06 11:59:38 +02:00
Kostas Karmas
081b0b23a4 Fix setting the time_remaining_method in the versionUpgrader
The DisplayProgressOnLCD script was changed and the "time_remaining" was split into two settings:
the "time_remaining" and the "time_remaining_method". If the "time_remaining" was enabled, the
"time_remaining_method" should be set to "m117".

The VersionUpgrader48to49 was changing the "time_remaining" to "m117" instead of changing the
"time_remaining_method", which was leading to the "time_remaining" having a wrong value and not
being interpreted as a boolean.

This commit fixes that by setting the "time_remaining_method" into "m117" when the "time_remaining"
was True.

CURA-8110
2021-04-06 11:38:28 +02:00
Remco Burema
a04fee8e95
Deprecated QtQuickControls 1 has some problems on Mac OSX.
In this particular case it was easiest to do the in a sense proper thing and just upgrade.

CURA-8127
2021-04-06 10:44:31 +02:00
Miroslav Sustek
068ee32d32 fix typo in Czech translation of "Experimental" 2021-04-04 20:55:28 +02:00
Miroslav Sustek
38e7d3b1ff Add missing Czech translations for Cura 4.9 2021-04-04 19:46:46 +02:00
Jelle Spijker
5a353f488c
Merge pull request #9497 from Ultimaker/constant_colour_layer_view
Draw simulation view lines with a constant colour for the entire line
2021-04-04 15:23:50 +02:00
Jelle Spijker
295e16f5cd
Merge pull request #9493 from Ultimaker/CURA-8152_Onboarding_flow_dialog_ends_after_selecting_networked_printer_without_showing_whats_new
CURA-8152: Go to the next page when adding a networked machine in oboarding wizard
2021-04-04 12:47:58 +02:00
jelle Spijker
23ba1745a4
Handle storing None values in keyring
Write an empty string as value to the keyring if None is parsed and
return a None value if an empty string was parsed from the keyring.

CURA-7180_keyring_none_value
2021-04-04 12:27:43 +02:00
Ghostkeeper
71b217c624
Fix colour calculations if spectrum is entirely one value
If the range of the colour spectrum is 0, i.e. there is only one value for the current colour spectrum, then this would previously give a division by 0 in the shader, causing the final colour to become black. This is unexpected and makes the layer view hard to read. Instead, we'll now use the middle of the range then.
This was likely a problem for a long time but only really became visible due to the colour spectrum now showing only the range of values for the visible structures. Previously it was a problem e.g. for layer thickness if all layers had the same thickness (i.e. initial layer height == layer height).
2021-04-03 17:29:33 +02:00
Ghostkeeper
6209a08121
Fix accidentally always taking 0th line along
The input array here is 2D, but always 1 by N long. The output of where then gives a tuple of two arrays, one indicating the Y positions and the other the X positions. The X positions were therefore always 0. The amin and amax functions were then always taking this index 0 along in their results, regardless of whether the line at that index was visible at all or not.
This will also improve performance since it's checking the limits now only for half as many indices.
2021-04-03 17:19:24 +02:00
Ghostkeeper
9b1941a4a2
Don't crash if there are no visible lines in a polyline 2021-04-03 17:07:01 +02:00
Ghostkeeper
b5bc4aecd5
Reset color scheme limits before every recalculation
This prevents previous measurements from influencing the colour scheme. Essentially previously it was showing the colour scheme based on all lines you had ever seen, rather than just the line types you were currently seeing.
2021-04-03 16:56:36 +02:00
Ghostkeeper
9f902f7a7a
Update colour scheme limits if visibility changed the limits
If the user makes certain structures visible or invisible, and this then causes the limits of the colour scheme to change, this now triggers the layer view to be re-rendered and updates the legend in the simulation view menu component.
2021-04-03 16:49:04 +02:00
Ghostkeeper
424f037dca
Trigger recalculation of colour scheme limits when visibility changes
While it's now correctly triggered to recalculate, it doesn't correctly update yet in the interface. We'll need to resolve that next.
2021-04-03 16:30:10 +02:00
Ghostkeeper
28f8da8f7b
Move calculation of simulation spectrum limits to separate function
This is just a refactor that shouldn't have any influence on the behaviour.
It is a necessary prerequisite to be able to trigger the updating of the layer view colour spectrum more frequently, i.e. if the visible line types change.
2021-04-03 16:16:02 +02:00
Ghostkeeper
8d13cfb5d6
Make limits in colour scheme depend on the visible line types
This way, if travel moves are not currently visible in the layer view, the travel moves don't get counted with the limits to determine the colour spectrum to grade each line with. Quite often, travel moves had a much greater speed than other moves, like 120mm/s instead of the fastest printed line 60mm/s. This caused all of the layer view to be pushed into the lower end of the spectrum. It makes it hard to distinguish the differences in speed and line width because travel moves influence the spectrum so much. This way, the travel moves only influence the spectrum if they are visible. If they are visible, it might be relevant to the user. Otherwise, the user gets the full spectrum to differentiate between all the line widths and speeds.

This currently doesn't update correctly yet. That is something we'll need to fix.
2021-04-03 16:03:20 +02:00
Ghostkeeper
fd6dbd3ede
Draw simulation view lines with a constant colour for the entire line
All of our current layer view colour schemes are properties of a line, not of a vertex. The line has a single feedrate, a single line type, a single layer thickness, a single material colour and a single width. This is even limited by the g-code specification itself, which is unable to represent lines with varying line width. However, we store this information in the vertices, the vertex data being the only data sent to layer view since layer view is sent as polylines to the shader.

This change makes the entire line take on the colour scheme of the vertex where its representative data is stored. This data is intended for the line, not just for that vertex, so it makes sense that the entire line listens to the data of the correct vertex, not just the nearest vertex of the line's endpoint.
2021-04-03 15:40:14 +02:00
jelle Spijker
279edf7a37
Czech Translations for 4.9
CURA-8153
2021-04-02 19:28:44 +02:00
Kostas Karmas
40c07fdeca Merge branch '4.9_translations' into 4.9 2021-04-02 18:11:22 +02:00