GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 13:09:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,784 Commits 290 Branches 263 Tags
Commit Graph

7768 Commits

Author SHA1 Message Date
Nino van Hooff
81d02d5d58 Implement printer cloud sync error state 
CURA-7290
 2020-05-04 13:19:16 +02:00
Kostas Karmas
96fde43ae8 Up the setting version inside the VersionUpgrade460to462 
CURA-7421
 2020-05-04 13:12:17 +02:00
Kostas Karmas
aab2257574 Up the setting version to 14 in CuraApplication 
CURA-7421
 2020-05-04 13:06:19 +02:00
Kostas Karmas
74bc40eb90 Add version upgrade 460to462 
CURA-7421
 2020-05-04 13:03:21 +02:00
Kostas Karmas
524a072420 Merge version upgrade 45to46 with 46to47 
CURA-7421
 2020-05-04 13:00:17 +02:00
Nino van Hooff
0aed6d3731 Connect the manual sync button 
CURA-7290
 2020-05-01 15:56:09 +02:00
Jaime van Kessel
245a4435e1
Also handle sceneChanged when it's from the root 
The rest of the code also seems to expect that
 2020-05-01 14:39:23 +02:00
Rodrigo Sclosa
d354c9f8ca Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-30 16:37:20 -03:00
Rodrigo Sclosa
f9868a5aa4 Revert "Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code." 
This reverts commit 323c374cc4477a3a143b932fefb77929c70da7ec.
 2020-04-30 16:34:20 -03:00
Kostas Karmas
80a4cfbd75 Remove duplicated line 
This line is called both outside and inside of _setOutputDeviceMetadata(...)

CURA-7055
 2020-04-30 14:03:34 +02:00
Jaime van Kessel
db7429488d
Merge branch 'del_scripts_pycache' of github.com:Ultimaker/Cura 2020-04-30 13:50:57 +02:00
Kostas Karmas
b008f1e823 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 15:37:53 +02:00
Kostas Karmas
61e2cc1193 Fix missing type for result 2020-04-29 15:33:28 +02:00
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura 2020-04-29 14:59:53 +02:00
Ghostkeeper
dfa021ab20
Fix upgrade of preference if visible settings was not modified 
Oops. Small oversight. This could lead to the preferences file being erased completely.

Found during work on Sentry issue CURA-NH.
 2020-04-29 14:10:07 +02:00
Ghostkeeper
abffb6c26c
Don't crash when reading corrupt 3MF files 
Otherwise it would crash with a BadZipFile error. We should be robust against that. This will trigger a generic message that we couldn't read that file to the user, and put more information in the log.

Fixes Sentry issue CURA-NH.
 2020-04-29 14:07:04 +02:00
Ghostkeeper
dcac9b6a87
Prevent a crash when retrying even though it completed in the meanwhile 
Fixes Sentry issue CURA-NA.
 2020-04-29 14:07:03 +02:00
Ghostkeeper
bf3d6c67d9
Check the bounding box before using it 
Some objects don't have a bounding box if they are improperly constructed by a plug-in.

Fixes Sentry issue CURA-N3.
 2020-04-29 14:07:03 +02:00
Jaime van Kessel
084e80bcda
Only connect a cloud printer if it's the active one 
By splitting up the correctly setting of metadata and actually
connecting, the distinction can be made.

CURA-7055
 2020-04-29 13:48:06 +02:00
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic 
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
 2020-04-29 13:31:45 +02:00
Remco Burema
4c4e611629
Fix x-ray error color. 
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
 2020-04-29 12:06:20 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Remco Burema
aaee651369
Fix comment. 
a smaller part of CURA-7404
 2020-04-28 13:28:02 +02:00
Remco Burema
242e0d403e
Clean pycache for scripts as well. 2020-04-28 12:11:55 +02:00
Kostas Karmas
6583f5f5ac Reset the model when pressing the Add cloud printer button 
CURA-7022
 2020-04-28 12:08:48 +02:00
Jaime van Kessel
174b58374a
Remove unneeded unit tests 
The code was moved to uranium, so no need to test them in a plugin.

In some cases they were also testing a specific implementation artifact and not
actual expected behavior.

CURA-7388
 2020-04-28 10:23:36 +02:00
Kostas Karmas
49cb1d325e Update the DiscoveredCloudUltimakerPrinters model 
Whenever new cloud devices are detected on the ultimaker account, add
them to the model

CURA-7022
 2020-04-24 19:17:34 +02:00
Rodrigo Sclosa
323c374cc4 Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-23 20:15:10 -03:00
Remco Burema
1475a999b0
Merge pull request #7575 from Ultimaker/CURA-7367_update_image_and_copy_in_enterprise_version 
Cura 7367 update image and copy in enterprise version
 2020-04-23 16:08:06 +02:00
Ghostkeeper
b21b36924c
Merge branch 'speed_up_version_upgrade' 2020-04-23 15:39:38 +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
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
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
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
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
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
Nino van Hooff
ec334e0891
Merge pull request #6778 from novamxd/master 
ChangeAtZ 5.2.0
 2020-04-22 16:18:27 +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
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
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