23883 Commits

Author SHA1 Message Date
Kostas Karmas
3b6ac5eb8d Add host_guid to the cloud printers' metadata
Since the host_guid is unique to the printer, it is more reliable for
identifying the cloud printers. This comes in handy when the cloud
printer is removed from the account and re-added. With the host_guid,
the printer that is added again can be properly identified as an
existing Cura cloud printer, and be linked to the original. To
achieve that, the META_CLUSTER_ID of the printer is updated with the
new one that is generated when the printer is added again to the
account.

CURA-7505
2020-06-15 15:01:14 +02:00
Nino van Hooff
e5a7ad2eca
Merge pull request #7904 from Ultimaker/CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message
CURA-7454: Add "remove printers" button in removed printers from account message
2020-06-12 17:35:09 +02:00
Ghostkeeper
abc105a727
Merge branch '4.6' 2020-06-12 12:02:08 +02:00
Ghostkeeper
bab037554c
Avoid hitting the prime blob when Z-hop is enabled
Similar to commit be814535e979c28734460a697da879dbe2b41a07, but ported to the Ultimaker Original.
2020-06-12 12:01:38 +02:00
Remco Burema
29e68fe407
Fix default value min_skin_width_for_expansion.
At some point max_skin_angle_for_expansion s deafult value was updated, but the default value for its child, min_skin_width_for_expansion wasn't altered to reflect that. Fixes #7925
2020-06-12 11:43:37 +02:00
Kostas Karmas
6d7d7bdb95 Fix local authorization server crashing
The thread handling the web_server was crashing. This in turn ended in
the web_server not being able to start again, thus being impossible to
login again if you logged out.
2020-06-11 15:27:29 +02:00
Nino van Hooff
64064fe8d5
Merge pull request #7911 from Ultimaker/CURA-7479_ConfigurationMenu_nozzles_get_stacked_together
CURA-7479: Change preferredWidth according to the model count in ConfigurationMenu
2020-06-10 16:26:26 +02:00
Ghostkeeper
ae272d42b8
Align build plate correctly to build volume
I don't know how this came to be misaligned. Maybe an oversight.

Contributes to issue CURA-7497.
2020-06-10 14:59:11 +02:00
Ghostkeeper
c9b2f4a2d2
Merge branch 'dagoma_bicolor' of https://github.com/0r31/Cura into 0r31-dagoma_bicolor 2020-06-10 14:50:44 +02:00
Kostas Karmas
defa3fd940 Remove lifetime of message, since it is the same as the default
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438023812

CURA-7454
2020-06-10 13:00:55 +02:00
Kostas Karmas
ad36903cbb Convert removed_printers_message into private
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438023220

CURA-7454
2020-06-10 12:59:39 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
2020-06-10 12:50:03 +02:00
orel
ddc8785755 Add 3mf meshes for mono extruder disco printers 2020-06-10 12:39:02 +02:00
Kostas Karmas
984426fabb Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-10 12:06:41 +02:00
Nino van Hooff
e9587a82d0
Merge pull request #7880 from Ultimaker/CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account
Cura 7455 Add "Keep printer configurations" button in the removed printers message
2020-06-10 12:05:13 +02:00
Kostas Karmas
fdc555caf3 Merge branch 'master' into CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 2020-06-10 11:51:50 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account
CURA-7438 Handle the case when a cloud printer is removed from the account
2020-06-10 11:46:10 +02:00
orel
36f70e43c2 Extruders gcodes sequences were inverted... 2020-06-10 11:43:44 +02:00
orel
7c6104b812 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-10 11:42:48 +02:00
Kostas Karmas
df2c20f647 Convert back Row to RowLayout
RowLayout is better for resizable interfaces

CURA-7479
2020-06-10 11:37:51 +02:00
Kostas Karmas
62047d585f Convert RowLayout into Row in ConfigurationMenu
CURA-7479
2020-06-10 11:23:17 +02:00
Kostas Karmas
b9956f2ae2 Fix failing tests
CURA-7454
2020-06-09 17:51:06 +02:00
Nino van Hooff
8ea6908935
Merge pull request #7775 from sgtnoodle/fix_stretch_feed
Fix extruder and feed rate after extruder-only moves in post stretch …
2020-06-09 17:46:17 +02:00
Remco Burema
ac36aeb831
Merge pull request #7903 from Ultimaker/CURA-7493_prefer_online_cloud_printers
Sort new_devices on online status first, name second
2020-06-09 17:46:05 +02:00
Kostas Karmas
2442371c2f Hide the message if a manual check is initiated
This has to be done in order to avoid weird actions taking place, such
as the user pressing to remove the printers while another sync is
happening.

CURA-7454
2020-06-09 17:42:53 +02:00
Remco Burema
a38fac9e67
Fix typing. 2020-06-09 17:34:23 +02:00
Remco Burema
29442e29e4
Make printer name sorting case insensitive again.
part of CURA-7493
2020-06-09 17:28:02 +02:00
Jaime van Kessel
1747dea203
Merge pull request #7902 from Ultimaker/CURA-7490_authorization_server_cpu_usage
Fix Authorization server not properly stopping after flow completes.
2020-06-09 17:27:25 +02:00
Kostas Karmas
1c9ce25614 Change lifetime of the removed_printers_message to 30 seconds
After 30 seconds a new sync will be initiated, which will alter the
conents of self.reported_device_ids, thus making the current message
deprecated. Therefore, it is best to have a maximum lifetime of 30
seconds.

CURA-7454
2020-06-09 17:24:36 +02:00
Nino van Hooff
b734830fcf Sort new_devices on online status first, name second
Since the first device might be activated in case there is no active printer yet,
it would be nice to prioritize online devices

CURA-7493
2020-06-09 17:02:21 +02:00
Jaime van Kessel
ed53557044
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-09 16:53:33 +02:00
Kostas Karmas
f26445a914 Fix mypy complaint
CURA-7454
2020-06-09 16:01:38 +02:00
Kostas Karmas
8c6a7d3098 Remove definitionChanges before removing a printer
When removing a printer, the files in %appdata%/cura/<version>/
/definition_changes/ remained intact. This commit fixes that by
making sure that the definitionChanges are removed before removing
the machine.
2020-06-09 15:56:13 +02:00
Kostas Karmas
567f6dabdc Add option to remove all printers not linked to the account
When the "Printers removed from account" message pops up, it will give
the option to the user to remove all the printers that are not linked
to his/her account from Cura. Since this action removes all
configurations, it first pops a confirmation question box, and if the
user insists, these printers are purged from Cura.

Note: In order to properly delete all the files, the printers have to
be activated first before they are removed, or else some extruder
files in %appdata%/cura/<version>/user and %appdata%/cura/<version>/
extruders remain.

CURA-7454
2020-06-09 15:40:30 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
2020-06-09 15:33:22 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
2020-06-09 15:20:15 +02:00
Nino van Hooff
f66e723866 Fix Authorization server not properly stopping after flow completes.
CURA-7490
2020-06-09 15:12:26 +02:00
Kostas Karmas
f0dda6553b Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:04:54 +02:00
Kostas Karmas
01230cff00 Merge branch 'CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account' into CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 2020-06-09 15:04:41 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Jaime van Kessel
b6b3646f32
Merge branch 'CURA-7437_no_internet_cloud_bugs' of github.com:Ultimaker/Cura 2020-06-09 13:45:21 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
2020-06-09 13:41:30 +02:00
Nino van Hooff
32f57b8770 Merge remote-tracking branch 'origin/master' into CURA-7437_no_internet_cloud_bugs 2020-06-09 10:47:53 +02:00
Ghostkeeper
c6af6565a3
More descriptive and appropriate logging
Contributes to issue CURA-7488.
2020-06-08 17:58:42 +02:00
Ghostkeeper
7e10e74e9e
Don't send print job in chunks
Previously the print job was sent with multiple PUT requests. This was necessary since the request was made with the Python Requests library, which freezes the interface while it's running. By breaking the upload up in chunks, it would at least periodically keep updating the interface (4 times per second or so, depending on your internet speed and Ultimaker's). Later on, this was replaced by a QNetworkRequest which doesn't freeze the interface in a refactor, but it was still broken up in chunks.
Recently that was again refactored to use Uranium's HttpRequestManager, which under the covers also uses QNetworkRequest. This also doesn't freeze while uploading, which is good. However for some reason the second chunk would always give a QNetworkReply::ProtocolUnknownError, which is a bit of a catch-all error for any HTTP status codes not supported by Qt. I was not able to figure out what was really going wrong there, but it has something to do with the content-range header and making multiple requests.
Instead of fixing that, I've removed the chunking. This simplifies the code a lot and doesn't have any implications for the user, since it still doesn't freeze the interface while the network request is ongoing. It should be slightly faster to upload, and reduce load on the server too.

However the disadvantage is that the original bug is probably still there if it was a bug in the HttpRequestManager. If it was a bug in the ToolPathUploader I probably deleted the bug here.

Contributes to issue CURA-7488.
2020-06-08 17:55:07 +02:00
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Jaime van Kessel
83fd35424b
Store data for metadata first
This should help with providing data to sentry to find out what the hell is going wrong
2020-06-08 10:31:40 +02:00
Jaime van Kessel
773edfd533
Prevent crash when camera tool was not found 2020-06-08 10:24:59 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Kostas Karmas
d662c607dd Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:06 +02:00