23772 Commits

Author SHA1 Message Date
Kostas Karmas
15e7cb44af Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-23 15:07:18 +02:00
Nino van Hooff
3ba284b36c
Merge pull request #7539 from Ultimaker/CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard
Cura 7019 move sign in screen in front of add printer in first run wizard
2020-04-23 14:56:31 +02:00
Ghostkeeper
09ee9660ea
Don't crash if the build volume is smaller than one arrange cell
Fixes Sentry issue CURA-M6.
2020-04-23 14:42:36 +02:00
Ghostkeeper
52b4e98056
Prevent crash when unable to write to storage location for container manager
Or the temp directory.

Fixes Sentry issue CURA-KY.
2020-04-23 13:48:05 +02:00
Ghostkeeper
75aafa1e5c
Don't crash if rendering without any window
Probably it'll still crash somewhere else then, but we'll rely on Sentry to find that for us.

Fixes Sentry issue CURA-KW.
2020-04-23 13:41:06 +02:00
Ghostkeeper
29d2e5c921
Don't crash if USB device is taken over by other applications or breaks
If it happens at just the wrong moment, Cura could crash. Hopefully no longer, though I fear that now it would maybe crash somewhere else with the same error then. We'll find out through new error reports, I hope.

Fixes Sentry issue CURA-K8.
2020-04-23 13:07:48 +02:00
Jelle Spijker
9b44ca37ef
Converted comments in dir Cura/cura/Arranging to rst style
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura/Arranging directory recursively  using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.

Various missing return types were added to complete Typing support
2020-04-23 12:13:24 +02:00
Nino van Hooff
971d8cd8e2 Remove leftover debug code from ChangeAtZ.py
CURA-7146
2020-04-23 11:48:50 +02:00
Jaime van Kessel
0bf862f9a9
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-23 11:39:04 +02:00
Jaime van Kessel
45dc8bcc68
Fix warnings about output device not being detected
CURA-7055
2020-04-23 11:38:34 +02:00
Ghostkeeper
add9be387b
Fix crash when creating a socket before the plug-in is fully registered
The plug-in ID is set once the register function is completed, so after initialisation. If the _createSocket function is called in between, Cura would crash.
I don't know why the _createSocket function would be called in between, but possibly another plug-in causes an event that calls it since it's being called on many events (everything that would initiate a reslice).

Fixes Sentry issue CURA-K4.
2020-04-23 11:38:27 +02:00
Ghostkeeper
d9cdea9496
Don't crash when material file is missing
This could happen because a material is deleted right at that moment, since the SendMaterialJob is done on a separate thread.

Fixes Sentry issue CURA-JZ.
2020-04-23 11:10:52 +02:00
Jaime van Kessel
be43383474
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-23 11:08:09 +02:00
Jaime van Kessel
6746106608
Also connect with cloudOutput device if it was added
CURA-7055
2020-04-23 11:07:21 +02:00
Jaime van Kessel
7c7c1ad96c
Fix remote_clusters not being added in second boot
CURA-7055
2020-04-23 10:58:16 +02:00
Kostas Karmas
1602b71841 Inform the Cloud page about new cloud printers
Properly close the welcome screen if the user has signed in and has
cloud printers linked to his/her account. If he doesn't have any, move
to the next page of the welcome wizard.

CURA-7019
2020-04-23 09:59:32 +02:00
Strahler85
83adb98a5f
Add nozzle profiles for Ender 3 pro
These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name.

Fixes #7550.
2020-04-23 00:30:01 +02:00
Jelle Spijker
68318d20fd
Converted comments in dir Cura/cura/API to rst style
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura/API directory recursively  using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.

Comments from the hidden attributes in the class CuraAPI (_acount, _backups, _interface) were moved to the public property getters, so they docstrings are exposed to the user.
2020-04-22 20:57:41 +02:00
Ghostkeeper
a0dc78cb39
Merge branch 'master' of https://github.com/dpodhola/Cura into dpodhola-master 2020-04-22 19:04:53 +02:00
Kostas Karmas
1262d1f641 Activate the first available Cloud printer if the activeMachine is empty
CURA-7019
2020-04-22 18:31:04 +02:00
Kostas Karmas
3d26b6886f Fix the welcome dialog not closing when cloud printers detected
The welcome dialog was not closing because when pressing the "Sign up"
button in the cloud page, a signal is emitted that is forcing the
welcome wizard to move to the next page. Therefore the currentPageIdx
was detected as cloud_page_idx+1.

This commit fixes the check by checking whether the welcome dialog is
in the page after the Cloud page.

CURA-7019
2020-04-22 18:22:42 +02:00
Jaime van Kessel
13105cfbd7
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-22 17:20:59 +02:00
Kostas Karmas
1030945c5d Merge branch 'master' into CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard 2020-04-22 16:51:40 +02:00
Kostas Karmas
4b62291043 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-22 16:32:52 +02:00
Nino van Hooff
ec334e0891
Merge pull request #6778 from novamxd/master
ChangeAtZ 5.2.0
2020-04-22 16:18:27 +02:00
Kostas Karmas
1d7c327b36 Redirect to "Add cloud printer" page when button clicked
CURA-7022
2020-04-22 16:15:24 +02:00
Kostas Karmas
a4c5e63355 Add "Add cloud printer" button in "Add a printer" page
CURA-7022
2020-04-22 16:10:31 +02:00
Kostas Karmas
41c472c2ed Add "Add a Cloud printer" QML page
CURA-7022
2020-04-22 16:09:24 +02:00
Nino van Hooff
6bbfd14d00
Merge pull request #7443 from Ultimaker/CURA-7055_auto_add_cloud_printers
CURA-7055_auto_add_cloud_printers
2020-04-22 16:05:40 +02:00
Jaime van Kessel
967488095b
Fix weird wording.
Whoops. It's only been there for a year...
2020-04-22 15:43:38 +02:00
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
2020-04-22 15:18:48 +02:00
maukcc
f66cf6f4d0 HMS434 update
material exclusion
2020-04-22 13:46:52 +02:00
Remco Burema
d078c465ee
Reduce branches in shader.
part of the further fallout of CURA-7147
2020-04-22 11:51:21 +02:00
Remco Burema
7ed59503d6
Round doesn't work for OpenGL 2.1 because it was only added in glsl 130.
So mad at myself right now >:-(
Part of the further fallout of CURA-7147
2020-04-22 11:49:27 +02:00
Ghostkeeper
888937d03b
Use initial layer bed/print temperatures
These are more likely what the user wants the printer to start up to.

Fixes #7505.
2020-04-22 11:39:10 +02:00
Jaime van Kessel
de7e3f824d
Move the getCfgVersion to base version upgrade
They can still be overridden, but in the current situation they were
all the same...
2020-04-22 11:30:35 +02:00
Jelle Spijker
6aedab78dc
Converted comments in dir Cura/cura to rst style
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura directory using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.
2020-04-21 16:58:45 +02:00
konskarm
cf604c0f20
Merge pull request #7497 from maukcc/master
HMS434 update
2020-04-21 16:50:22 +02:00
Kostas Karmas
ad6f837f44 Force reloading the VariantNode if it exists
When the MachineNode is updated through _loadAll, it was not updating
its VariantNodes when they already existed. This caused an issue to
UM2+Olsson block printers, where changing the G-Code flavor to Marlin
was not updating the VariantNodes to search for materials (since the
variants already existed).

This commit fixes that by forcing an update to the existing Variant
nodes.

CURA-7354
2020-04-21 14:41:17 +02:00
maht
27f7f595f8
Updated change log 4.6 stable CURA-7380 4.6.0 2020-04-21 13:29:12 +02:00
Ghostkeeper
29b0bd1b23
Merge branch '4.6' 2020-04-21 12:04:01 +02:00
Ghostkeeper
c73082616c
Merge branch 'CURA-7383_sdk_ver_7_2_0' into 4.6 2020-04-21 12:03:47 +02:00
Ghostkeeper
085462667e
Merge branch 'CURA-7383_sdk_ver_7_2_0' 2020-04-21 12:03:28 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6
CURA-7383
2020-04-21 11:46:12 +02:00
Ghostkeeper
e1308f0768
Merge branch '4.6' 2020-04-21 11:42:23 +02:00
Ghostkeeper
f38ae5bb96
Fix i18n catalog for per-object settings panel
Turns out that all of these had not been working properly for a while.

Contributes to issue CURA-7344.
2020-04-21 11:39:49 +02:00
Kostas Karmas
1b1c006998 Skip the Cloud page if the user is logged in
If the user goes through the welcome wizard, arrives at the login page,
logs in and then closes Cura, he/she will be logged in the next time.
In this case, he/she will go through the welcome page again but will
not see the sign in page at all.

CURA-7019
2020-04-21 11:23:42 +02:00
Nino van Hooff
8e5d331e6b
Merge pull request #7536 from Ultimaker/mahtDFR-patch-1
Updated change log CURA-7380
2020-04-21 11:05:59 +02:00
Nino van Hooff
e3bc304d5d Update sdk version to 7.2.0
CURA-7383
2020-04-21 11:00:06 +02:00