GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 291 Branches 260 Tags
Commit Graph

569 Commits

Author SHA1 Message Date
Joey de l'Arago
2b7eca29af Continue if a printer has no active materials. This was causing a crash when loading the material combinations for a printer with two empty material slots. 
CURA-10110
 2023-02-22 13:43:06 +01:00
jspijker
fe4679e4e8 Check before removing 
Cura shouldn't crash when the abstract machine isn't in the other_machine_stack
 2023-01-13 13:30:09 +01:00
c.lamboo
16c64014b2 Resolve formula in Keep or Discard dialog 
CURA-10111
 2023-01-04 13:17:56 +01:00
Remco Burema
8f65af61e5 Connect compare-and-safe profile dialog buttons to actions. 
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.

part of CURA-9347
 2022-11-30 18:48:07 +01:00
Joey de l'Arago
dd0411f171 isOnline was incorrectly being used instead of isNetworked. This caused offline printers not to show an Icon. 
Fixed

CURA-9424
 2022-11-15 14:56:25 +01:00
Joey de l'Arago
57e1c7a4ce Commit suggestion by Jelle 
CURA-9424
 2022-11-11 17:08:45 +01:00
Joey de l'Arago
62274c4dac Revert Some of "Fix show/hide button in WorkSpaceDialog printer selector" 
This reverts commit 0c79ec73
 2022-11-11 17:04:39 +01:00
Joey de l'Arago
bbadc9c887
Apply suggestions from code review 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-11-11 13:44:37 +01:00
c.lamboo
0c79ec738e Fix show/hide button in WorkSpaceDialog printer selector 
CURA-9424
 2022-11-09 23:05:06 +01:00
c.lamboo
06a2886139 Clean up section property logic 
CURA-9424
 2022-11-09 17:11:31 +01:00
Joey de l'Arago
1ebf5bb650 Update MachineListModel to optionally take a list of global stack to show in list instead of searching the container registry. 
Add option not to listen to container change events in MachineListModel.

CURA-9424
 2022-11-04 16:42:07 +01:00
Remco Burema
ce6f7c20ca Abstract printer types: Sort newer ones on top. 
Partial (manual) revert of initial implementatio of CURA-9748 -- that first commit deleted the 'reverse = True' needed to make sure (read hack) the most recent abstract printer types on top, instead of the other way around.
 2022-10-12 16:14:32 +02:00
c.lamboo
9bacbb5825 Sort cloud printers in printer selection dropdown menu 
CURA-9748
 2022-10-12 14:37:26 +02:00
Remco Burema
7dd37c6a53 Filter material lists for compatible printers. 
So that only one identical entry shows up per material, per extruder (per printer).

CURA-9689
 2022-10-12 12:02:20 +02:00
c.lamboo
2079bd5a6e Sort "other printers" list 
CURA-9687
 2022-10-05 13:26:12 +02:00
Jaime van Kessel
1dc42cb69a
Fix refresh of ChoosePrinterDialog not working 
CURA-9278
 2022-09-16 14:39:36 +02:00
c.lamboo
ad14e60d26 Show printer even if the configuration does not match 
CURA-9278
 2022-09-13 10:34:33 +02:00
Remco Burema
8935ab4a2d Defensive coding: What if no extruder position. 
part of CURA-9278
 2022-09-13 10:12:32 +02:00
c.lamboo
99136fd209 Fix bug in displaying extruders 
CURA-9278
 2022-09-12 17:24:55 +02:00
Casper Lamboo
e3fc73f17d
Simplify if notation 
CURA-9278
 2022-09-12 14:20:06 +02:00
Casper Lamboo
0f36f83373
Simplify list notation 
CURA-9278
 2022-09-12 14:19:08 +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
2b1909b7b5 Don't show machines with only incompatible configurations. 
part of CURA-9278
 2022-09-09 13:17:41 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer. 
CURA-9278
 2022-09-09 11:05:05 +02:00
Remco Burema
04cd76cb3b Get extruder configs to frontend. 
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.

CURA-9278
 2022-09-08 13:36:42 +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
c.lamboo
148263a068 Move hasNetworkedConnection to GlobalStack 
From code review

CURA-9277
Co-authored-by: Joey <j.delarago@ultimaker.com>
 2022-09-06 13:52:10 +02:00
Casper Lamboo
6253fb2fdc
Add typing to function argument 
CURA-9277

Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-09-06 13:19:50 +02:00
Joey de l'Arago
ea596bdd90 Add some extrudare information fetching. 
CURA-9278
 2022-09-05 17:59:01 +02:00
Joey de l'Arago
7f98ef70f0 Add printer cards 
CURA-9278
 2022-09-05 17:38:21 +02:00
c.lamboo
b6a461bd08 Revert "Prevent abstract machines from being deleted in the config menu" 
This reverts commit 27fc11b8404ed84a9b95b2fdddab239d2cd3c93b.
 2022-09-05 17:32:23 +02:00
c.lamboo
48b8585ce6 Make sure online printers are always shown in the correct tab 
CURA-9277
 2022-09-05 11:44:29 +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
c.lamboo
6d0acbe095 Always show correct number of connected machines 
Calculate number of connected machines _after_ the abstract machine its connected is removed from the list

CURA-9277
 2022-09-02 16:28:10 +02:00
c.lamboo
27fc11b840 Prevent abstract machines from being deleted in the config menu 
CURA-9277
 2022-09-02 16:26:17 +02:00
c.lamboo
8bb2671a28 Don't show abstract machines in configuration page 
So they cannot be removed through the preferences

CURA-9289
 2022-09-02 16:26:17 +02:00
Jaime van Kessel
ded3873249
Fix abstract machines being displayed twice 2022-08-31 15:12:25 +02:00
Remco Burema
a713b1e9e9
Merge pull request #13165 from Ultimaker/CURA-8463_cloud_configuration 
Show all configurations in "abstract" printer from cloud
 2022-08-31 14:50:13 +02:00
joeydelarago
ab722eb93c Default printers should be collapsed 
CURA-9514
 2022-08-31 13:19:12 +02:00
Casper Lamboo
dccffdeca3
Update cura/Machines/Models/MachineListModel.py 2022-08-31 11:08:37 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model. 
CURA-9514
 2022-08-31 10:50:20 +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
joeydelarago
b999a88b26 Update function name to match code style 
CURA-9514
 2022-08-31 10:26:57 +02:00
joeydelarago
9f204f2e43 Update isAbstractMachine to match Role name format. 
CURA-9514
 2022-08-31 10:20:50 +02:00
joeydelarago
760e53c401 Fix indentation 
Remove debug statement

CURA-9514
 2022-08-31 10:19:02 +02:00
joeydelarago
daab1aae71 QML was attempting to fetch variables that were emtpy. Using self.clear() properly removed unused items when the list is resized to be smaller. 
Also add some dummy variables inside cloud printer expand and contract buttons.

CURA-9514
 2022-08-31 10:05:41 +02:00
c.lamboo
aa1c09591f Typo 
CURA-9514
 2022-08-31 08:15:13 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons 
CURA-9514
 2022-08-31 07:58:05 +02:00
c.lamboo
ac732e9604 Add button to hide/show connected printers 
CURA-9514
 2022-08-30 23:15:54 +02:00
joeydelarago
f3b9040561 Add sanity check for printers that are online. They must have an online connection type. This can pop up when adding a printer from a 3mf since we do not store the connection_type but we do store is_online=True. 
CURA-9277
 2022-08-29 14:03:23 +02:00