24127 Commits

Author SHA1 Message Date
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
4bebaaaddb Display an appropriate tooltip when device is removed from the account
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
2020-06-04 15:08:27 +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
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
2020-06-04 14:22:14 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
2020-06-04 14:06:03 +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
Ghostkeeper
1d6c722505
Indent using spaces, not a mix of tabs and spaces
Contributes to issue CURA-7450.
2020-06-04 13:14:56 +02:00
Ghostkeeper
06dce91bef
Merge branch 'master' of https://github.com/grk3010/Cura into grk3010-master 2020-06-04 13:06:08 +02:00
Mark Burton
f8c86cce4d Improve readability and add comments. 2020-06-04 12:04:29 +01:00
Mark Burton
74984ca12a Stop panel growing above first tool button. 2020-06-04 11:30:13 +01:00
Jaime van Kessel
d4eba3d089
Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' of github.com:Ultimaker/Cura 2020-06-04 11:27:41 +02:00
Kostas Karmas
230ba01d14 Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 10:46:54 +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
Orel
e537af24da Refine platform offset 2020-06-03 20:14:10 +02:00
Orel
93715bf2ad Replace 3mf to stl files for mono extruder dagoma printers 2020-06-03 20:05:15 +02:00
Orel
5079009ccd Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-03 20:04:16 +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
Kostas Karmas
07bbee7cb9 Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-03 17:32:04 +02:00
Ghostkeeper
1e49438c03
Merge branch 'master' of https://github.com/victornpb/Cura into victornpb-master 2020-06-03 16:21:50 +02:00
Remco Burema
2337e3b82c
Merge pull request #7862 from Ultimaker/CURA-7457_Fix_resyncing_removed_online_cloud_printers
Update _remote_clusters dict when cloud printer is removed from Cura
2020-06-03 16:14:37 +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
Ghostkeeper
6d1d6ca1aa
Add warning for Support Wall Line Count if breaking up support in chunks
It will be hard to break it up then.

Fixes #7841.
2020-06-03 10:51:43 +02:00
Kostas Karmas
09ff6b72ed Merge branch 'master' into CURA-7457_Fix_resyncing_removed_online_cloud_printers 2020-06-03 09:46:10 +02:00
Mark Burton
700533b4aa Change the panelBorder rectangle anchor to the bottom for lower toolbar buttons.
This makes the panel grow upwards into clear space rather than downwards which is a problem
when the Cura window height is restricted.
2020-06-03 08:15:10 +01:00
Orel
6544fa31f4 Add 3mf meshes for single extrusion dagoma disco printers 2020-06-02 19:10:32 +02:00
Orel
b0edcc1c18 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-02 18:27:30 +02:00
Kostas Karmas
323d2d4019 Update setting_version to 15 for ATMAT machine profiles
Following PR https://github.com/Ultimaker/Cura/pull/7030

CURA-7323
2020-06-02 16:28:49 +02:00
Konstantinos Karmas
856221f0b6
Merge pull request #7030 from gandzia44/master
ATMAT machines profiles
2020-06-02 16:25:55 +02:00
Kostas Karmas
a06035cf38 Display appropriate tooltip message when cloud printer is offline
Display a different message in the popup tooltip when the internet
is reachable but the printer is offline.

CURA-7460
2020-06-02 16:12:05 +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
Jaime van Kessel
73026a0744
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-02 14:20:35 +02:00
Jaime van Kessel
fbbd2f7484
Fix small copy paste error
CURA-7477
2020-06-02 14:19:13 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Nino van Hooff
ba705176fe Remove extraneous logging 2020-06-02 14:13:04 +02:00
Ghostkeeper
93c84d5bc0
Mock the limit_to_extruder property with an actual value
This is necessary because our code now converts this to an integer. Mocks can't be converted to an integer, so the sub-magic-mock here can't be used. We need to provide something that can be cast to an integer.
2020-06-02 14:01:09 +02:00
Ghostkeeper
825a34d418
Mock the extruderList
Otherwise the list of extruders becomes a MagicMock. Adding a list to a MagicMock is again a MagicMock, and when iterating over that it doesn't result in any iterations. As a result, the for loop that clears all user containers didn't clear anything and the test failed.
2020-06-02 13:46:17 +02:00
Ghostkeeper
be814535e9
Avoid hitting the prime blob when Z hop is enabled
If Z hop is enabled, it would move to the height of the Z hop at the start of the print, in order to hop for the initial travel move. Cura sort of assumes that this hop is going up and so it's safe to do, but in reality this hop is going down due to the starting process in the firmware. As a hotfix, we'll just move away from that blob so that we don't hit it even if you enable Z hops.
2020-06-02 11:54:10 +02:00
Ghostkeeper
19f500834b
Remove use of deprecated extruders property
Still had this one uncommitted from last Friday. I tested it and it works the same way.
2020-06-02 11:54:10 +02:00
Nino van Hooff
eb48fcf05e Merge remote-tracking branch 'origin/master' 2020-06-02 11:32:20 +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
fieldOfView
aa2ed1aa4b Remove now defunct variable 2020-05-29 21:34:00 +02:00
Ghostkeeper
e68ebb198e
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:14:21 +02:00
Ghostkeeper
0e4830e6ef
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:10:59 +02:00
Ghostkeeper
e98c26a33c
Don't use deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 18:07:08 +02:00