7575 Commits

Author SHA1 Message Date
Ghostkeeper
7ec681a04d
Merge branch 'feature_support_meshes_present' of https://github.com/fieldOfView/Cura into fieldOfView-feature_support_meshes_present 2020-06-05 13:20:31 +02:00
Kostas Karmas
27b733fe3d Add "Keep printer configurations" button in removed printers message
Since keeping the printers as local ones is the default action, this
button behaves the same way as the "X" button, hiding the message.

CURA-7455
2020-06-05 11:39:26 +02:00
Kostas Karmas
167a4c1f58 Make reported_device_ids a class variable
So that the actions that can be performed by the message buttons
can properly access the list and take the necessary steps to achieve
their purpose.

CURA-7438
2020-06-05 11:25:44 +02:00
Kostas Karmas
458b439a9a Rename META_REMOVED_FROM_ACCOUNT to META_LINKED_TO_ACCOUNT
The meta data entry was rename to be more representative of its
function. In addition, the bool metadata entry is now properly
handled using the parseBool function.

CURA-7438
2020-06-04 16:14:09 +02:00
Kostas Karmas
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +02:00
Kostas Karmas
ee7f2d4b38 Handle the case when a cloud printer is removed from the account
When a cloud printer is no longer received from mycloud, it is safe to
assume that the printer is removed from the account. In such a case,
the new function _devicesRemovedFromAccount(..) will retrieve all the
devices that are to be removed (i.e. they are added in Cura but they
do not exist in the clusters received from mycloud) and will remove
their output device. In addition the function will generate a message
that mentions all the devices that were no longer linked to the
account.

In order to achieve that, the Cloud/CloudOutputDeviceManager is
enriched with the dictionary self._um_cloud_printers that contains all
the currently existing cloud-enabled devices that were previously added
in Cura. In addition, the meta-data field "removed_from_account" is
added to all the cloud-enabled Cura devices to distinguish the ones
actually linked to the current account.

With these additions, the cloud devices that are removed from the
account will be automagically re-linked to it once the devices are once
again retrieved from mycloud for the specific account.

CURA-7438
2020-06-04 14:56:58 +02:00
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
Gabriel Vogel
2ebf32831a remove duplicate updates for model properties 2020-06-04 13:50:24 +02:00
Ghostkeeper
9b6f10b6e7
Merge branch '4.6' 2020-06-04 13:37:44 +02:00
Ghostkeeper
2e5f4764bd
Remove duplicated version upgrade plug-in
These two version upgraders do the same operation. Their code is copied. Instead, we can just let one version upgrader upgrade both versions of the files.

Contributes to issue CURA-7413.
2020-06-04 13:37:30 +02:00
fieldOfView
c34162a2ba Merge branch 'master' into feature_support_meshes_present
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
2020-06-04 10:27:11 +02:00
Ghostkeeper
b2ce1419cf
Don't crash when syncing material that has no colour code
Use the colour code for Generic PLA then.
2020-06-03 17:48:28 +02:00
Ghostkeeper
1e49438c03
Merge branch 'master' of https://github.com/victornpb/Cura into victornpb-master 2020-06-03 16:21:50 +02:00
Nino van Hooff
80a5b53aad Store the printer cluster size as a metadata entry on the machine
This makes the cluster size also available when the machine is offline.
Also fixes an issue where the cluster size is improperly restored
once the internet connection comes back online, resulting in the printer
showing as a single printer until next sync

CURA-7347
2020-06-03 13:59:51 +02:00
Kostas Karmas
be9aec624a Use the um_cloud_cluster_id metadata when removing the cloud printer
CURA-7457
2020-06-03 11:13:21 +02:00
Kostas Karmas
d0534c0476 Update _remote_clusters dict when cloud printer is removed from Cura
CURA-7457
2020-06-02 15:23:35 +02:00
Nino van Hooff
ba705176fe Remove extraneous logging 2020-06-02 14:13:04 +02:00
Jaime van Kessel
f1d3c2272e
Merge branch 'CURA-7458_Add_offline_cloud_printers_in_Cura' of github.com:Ultimaker/Cura 2020-06-02 10:55:21 +02:00
Victor
63e7e2b382
Added 76800 baud rate 2020-06-02 00:03:12 -03:00
Victor
accd205185
Added 76800 baud rate 2020-06-02 00:02:24 -03:00
Ghostkeeper
1bb4458dca
Remove use of deprecated extruders property
This also removes the need to sort them, since the list is already sorted by position.

Done during Turbo Testing and Tooling.
2020-05-29 17:45:41 +02:00
Ghostkeeper
1fb78d23a5
Remove usage of deprecated extruders property
Use extruderList instead.

Done during Turbo Testing and Tooling.
2020-05-29 17:42:18 +02:00
Ghostkeeper
da61096efe
Remove uses of deprecated extruders property
It's been replaced by extruderList now.

Done during Turbo Testing and Tooling.
2020-05-29 17:38:34 +02:00
Ghostkeeper
9c78178561
Fix running automated tests from source with different SIP version
This prevents the PyCapsule_GetPointer error when running the tests for this plug-in.

Done during Turbo Testing and Tooling.
2020-05-29 17:31:58 +02:00
Ghostkeeper
e7371bd741
Use extruderList rather than deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 17:02:22 +02:00
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments
Converted doxygen style comments to reStructuredText style
2020-05-29 16:46:25 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Kostas Karmas
5aff6218d5 Add the offline cloud printers in Cura when they are discovered
CURA-7458
2020-05-29 14:02:36 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Jaime van Kessel
f7921394bf
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-05-28 17:21:42 +02:00
Jaime van Kessel
7e53bc179f
Add beta upgrader
CURA-7413
2020-05-28 17:13:26 +02:00
Nino van Hooff
bb2a176e36 Convert doxygen to rst for VersionUpgrades 40+ 2020-05-28 16:21:49 +02:00
Nino van Hooff
5af9faf5e5 Convert doxygen to rst for X3DReader, XmlMaterialProfile, XRayView 2020-05-28 16:08:51 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status
CURA-7437_no_internet_cloud_status
2020-05-28 10:02:15 +02:00
Nino van Hooff
6035adb963 Fix return type in GCodeProfileReader 2020-05-27 14:24:28 +02:00
Nino van Hooff
ca333b4e8a Revert commented lines
CURA-7437
2020-05-26 16:45:17 +02:00
Nino van Hooff
e39a192b43
Merge pull request #7824 from Ultimaker/CURA-7459_persistent_marketplace_notification_on_updated_bundled_packages
Cherry-pick changes from CURA-7245_fix_bundled_package_sync
2020-05-26 16:31:18 +02:00
Jaime van Kessel
280d3f07a6
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-26 11:52:14 +02:00
Jaime van Kessel
ed74198e20
Revert "Revised text from Enterprise marketplace pop-up screen"
This reverts commit 6a334dd907eeeaf657db006a07d71618d800987f.

The commit broke the string freeze. It also hardcodes the enterprise text
for all versions of Cura (which should not be the case!)
2020-05-26 11:19:54 +02:00
Ghostkeeper
715e5a890e
Don't crash when the file is deleted while in pre-read phase
The pre-read takes a while since it shows a dialogue. The user has all the time to delete the file or rename it in the meanwhile.

Fixes Sentry issue CURA-SG.
2020-05-25 17:20:39 +02:00
Nino van Hooff
75f5e6a8ce Consider all packages when calculating account discrepancies
Not just the user-subscribed ones

CURA-7245
2020-05-25 15:40:40 +02:00
Jelle Spijker
6a334dd907 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-05-25 14:48:18 +02:00
Jelle Spijker
fed5598eb7 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-05-25 14:39:04 +02:00
Ghostkeeper
be9029b33e
Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width' 2020-05-25 11:48:05 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon
CURA-7437
2020-05-20 17:20:40 +02:00
Konstantinos Karmas
e22b672f12
Merge pull request #7785 from Ultimaker/CURA-7436_cloud_printer_remove_warning
CURA-7436_cloud_printer_remove_warning
2020-05-20 15:48:27 +02:00
Kostas Karmas
b5e971f9ec Update remove cloud printer pop-up message
CURA-7436
2020-05-20 15:21:57 +02:00
Kostas Karmas
503d5d2a35 Correctly upgrade the ironing_inset based on the ironing_pattern used
Previously, the ironing_inset was changed in the profiles to reflect
the changes made in the CuraEngine. This inset though was not taking
into account the ironing_pattern (in the CuraEngine, the inset is
compensated differently depending on the pattern).

This commit fixes that in the version upgrader and the printer
definitions in order to maintain the same behavior for the old
profiles.

CURA-7318
2020-05-20 13:56:24 +02:00
Nino van Hooff
81ec7d6582
Merge pull request #7201 from fieldOfView/feature_unify_pause_at_height
Unify pause at height scripts
2020-05-19 15:51:21 +02:00