9307 Commits

Author SHA1 Message Date
Casper Lamboo
6abce2a81a
Merge pull request #13195 from Ultimaker/CURA-9278_choose_printer_dialog
[CURA-9278] Press print on abstract cloud printer. User should see dialog.
2022-09-13 10:42:36 +02:00
c.lamboo
f6442d1950 Only display buildplate for glass buildplates
CURA-9622
2022-09-12 14:03:15 +02:00
c.lamboo
880724d2e4 Add material information to ufp output
CURA-9224
2022-09-10 09:47:31 +02:00
Remco Burema
b7611da95e Connect buttons for selected printers: Print and refresh.
part of CURA-9278
2022-09-09 15:14:29 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer.
CURA-9278
2022-09-09 11:05:05 +02:00
Jaime van Kessel
bdcbaeb65c
Merge pull request #11690 from jimduchek/usbprint_exception_fix
USBPrinterOutputDevice.py: Convert estimated time to int
2022-09-08 14:23:07 +02:00
Remco Burema
5866560540 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 23:33:45 +02:00
Jaime van Kessel
2f1325259c
Fix 3mf workspace reader crashing on certain invalid files
CURA-4DP (Sentry crash)
2022-09-06 14:47:32 +02:00
Jaime van Kessel
f2edc1ac49
Fix typo 2022-09-06 13:56:24 +02:00
Remco Burema
6baf14a516 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 12:08:05 +02:00
Jaime van Kessel
26b9bcf4f5
Merge pull request #12981 from digitalfrost/080822b
X3DReader.py: Iterate directly over list in readIndex()
2022-09-05 13:58:13 +02:00
Jaime van Kessel
bad161ef06
Merge pull request #13022 from digitalfrost/130822
VersionUpgrade.py: Use enumerate
2022-09-05 13:28:09 +02:00
joeydelarago
599fddd6dd Add all settitngs to the json.
Change default -> all_settings. This better reflects the purpose of the list.

CURA-9224
2022-09-05 10:43:21 +02:00
joeydelarago
ef36d3f6bd Refactoring
CURA-9224
2022-09-05 10:43:11 +02:00
joeydelarago
b1090728c0 Add settings changes
CURA-9224
2022-09-05 10:42:59 +02:00
joeydelarago
ee7c8d1f02 Move creatFlattenedContainerInstnance into CuraStackBuilder so it can be reused.
CURA-9224
2022-09-05 10:42:48 +02:00
joeydelarago
42c3eb0c64 Save settings to json file in .ufp
CURA-9224
2022-09-05 10:42:33 +02:00
Remco Burema
a56a21cf93 W.I.P.: Press print on abstract cloud printer. User should see dialog.
Start of implementation. When printing on an abstract printer, a user should see a dialog with the matching concrete cloud printers to pick from to actually print. Names are not final. Very much a work in progress. Very not finished also.

start of implementation for CURA-9278
2022-09-02 17:49:39 +02:00
Jaime van Kessel
023046370a
Throttle how often the local cluster updates
This puts it in line with how often the cloud does it
Might contribute to #11608
2022-09-02 10:03:24 +02:00
Remco Burema
053437a502 UX: The color needs to be the same. 2022-09-01 14:15:16 +02:00
Jaime van Kessel
6563ba32b4
Fix crash with removedPrinterMessage 2022-09-01 14:12:02 +02:00
Jaime van Kessel
3040a7c830
Always check if an abstract machine needs to be added
CURA-9289
2022-08-31 18:11:24 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
Remco Burema
4ea437ba28 Make send to DF in monitor for abstract printer work (again-ish).
Already moslty implemented, but a new approach of the base feature (abstract cloud printers) made a more? elegant and functioning implementation possible.

(re)implements CURA-9422
2022-08-31 14:13:47 +02:00
Jaime van Kessel
4c55befad7
Merge branch 'main' of github.com:Ultimaker/Cura into CURA-8463_cloud_configuration 2022-08-31 10:39:05 +02:00
Jaime van Kessel
b9e8bca012
Remove commented out properties
CURA-8463
2022-08-31 10:33:46 +02:00
Jaime van Kessel
5ff07b00d0
Fix case where both a "normal" and an "abstract" ouput device could be active
CURA-8463
2022-08-31 10:27:52 +02:00
Jaime van Kessel
dd5981d85e
Only remove abstract output device if it's actually added
CURA-8463
2022-08-31 10:09:47 +02:00
Remco Burema
e69b855b2b
Merge pull request #13127 from Ultimaker/CURA-9221_show_message_cloud_approval
[CURA-9221] Show message cloud approval
2022-08-30 16:53:47 +02:00
Remco Burema
7ab16e078c Speared spurious space.
done as part of CURA-9221
2022-08-30 16:45:34 +02:00
Jaime van Kessel
feadbf04da
Fix status request for Ultimaker 2+ Connect
CURA-8463
2022-08-30 16:42:15 +02:00
Jaime van Kessel
e2ba110cf7
Ensure that all material configs are added to the list
CURA-8463
2022-08-30 16:33:29 +02:00
Jaime van Kessel
6fed6b824c
Added stub for AbstractCloudOutputDevice
It doesn't actually allow you to send a print, but it does ask some info from the API

CURA-8463
2022-08-30 15:53:47 +02:00
c.lamboo
c7f8fe8feb Don't add is_online to .3mf files
from eccb
2022-08-30 13:38:19 +02:00
Jaime van Kessel
38e4ca1e0f
Updated documentation link
CURA-8463
2022-08-30 13:30:42 +02:00
Jaime van Kessel
65a0a2f67b
Update formatting of CloudAPIClient
CURA-8463
2022-08-30 13:23:01 +02:00
Jaime van Kessel
143f796ba6
Use get instead of direct []
The next line (checking if the result is None) doesn't make sense otherwise

CURA-8463
2022-08-30 13:13:32 +02:00
Jaime van Kessel
587d71bb57
Fix typo
CURA-8463
2022-08-30 13:11:42 +02:00
Jaime van Kessel
6d947963a4
Remove stray whitespace
CURA-8463
2022-08-30 13:11:17 +02:00
c.lamboo
cf99114de8 Only display message for abstract printers
CURA-9422
2022-08-30 13:10:03 +02:00
Jaime van Kessel
b689a84bcb
Add explicit typing 2022-08-30 13:09:53 +02:00
Jaime van Kessel
718d3790e2
Clean up iterating over cluster list
CURA-8463
2022-08-30 13:07:19 +02:00
Jaime van Kessel
7eabbd7b5c
Convert _updateOnlinePrinters to static
CURA-8463
2022-08-30 11:52:13 +02:00
Jaime van Kessel
f4c4b52d9b
Update typing to reflect new message that is being used
CURA-8463
2022-08-30 11:49:09 +02:00
Jaime van Kessel
ce3ab62c91
Move RemovedprintersMessage to it's own class
The OutputDeviceManager is just too bloated to properly make sense of.
So I'm trying to move as much code out of it so I can start to make sense of it

CURA-8463
2022-08-30 11:45:30 +02:00
Jaime van Kessel
45e7d15c80
Add documentation for _onDiscoveredDeviceRemoved 2022-08-30 11:36:47 +02:00
Jaime van Kessel
7f9984cd16
Also move remainder of NewPrinterDetected logic to it's own class
This should make the CloudOutputDeviceManager a bit more readable

CURA-8463
2022-08-30 11:33:20 +02:00
Jaime van Kessel
a429a93e94
Move new printers detected message to it's own class
CURA-8463
2022-08-30 11:26:09 +02:00
Jaime van Kessel
8e9056df71
Rename function to better reflect what it does
CURA-8463
2022-08-30 11:11:00 +02:00
Jaime van Kessel
d35441603b
Rename variables so it's easier to understand what is what
CURA-8463
2022-08-30 11:06:09 +02:00