GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-28 23:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 287 Branches 260 Tags
Commit Graph

386 Commits

Author SHA1 Message Date
ChrisTerBeke
a179d7118d Fix renaming mistake from 1fa5628cb2e35425d1b42f9dbb20a9bda45da032 2019-08-20 17:17:52 +02:00
ChrisTerBeke
1fa5628cb2 Rename output device to prevent inheritance naming confusion 2019-08-02 15:16:08 +02:00
ChrisTerBeke
92d07ddb71 Merge branch 'master' into CS-234_network_plugin_code_quality 2019-08-02 12:44:56 +02:00
Lipu Fei
c841382bbd Add more info in exceptions 2019-08-02 11:12:16 +02:00
Ghostkeeper
b3912fb930
Merge branch '4.2' 2019-07-31 10:43:17 +02:00
Jaime van Kessel
4b956953a6 Fix incorect error checking 
We don't need to check the global stack for errors, as the correct values are already checked by looking at the extruder stacks
 2019-07-31 10:24:31 +02:00
ChrisTerBeke
1aa70748af Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
ChrisTerBeke
ddd282eef3 Remove absolute plugin imports, some fixes 2019-07-29 16:11:01 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
a98f88e6a3 Also move _getMachineTypeNameFromId to DiscoveredPrintersModel 
As this is only used by that model, there is no point in keeping it in the machine manager
 2019-06-07 15:04:19 +02:00
Jaime van Kessel
5eee3fc368 Move hasHumanReadableMachienTypeName to discovered printers 2019-06-07 15:01:30 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Lipu Fei
2054413952 Add handling for ValidatorState.Invalid 
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
 2019-05-09 12:07:16 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog 
CURA-6495
 2019-05-06 13:06:23 +02:00
Lipu Fei
7d4c821551 Prevent auto selecting an invalid printer 
CURA-6483
 2019-05-03 08:49:39 +02:00
Lipu Fei
1e89ce3673 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-05-02 14:06:07 +02:00
Lipu Fei
5fee82bcb7 Fix machine settings page 
CURA-6495
 2019-05-02 09:46:00 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Ghostkeeper
ab0cef95e8
Sort secondarily by printer name 
Makes it a bit easier to find printers.

Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/
 2019-05-01 14:38:55 +02:00
Ghostkeeper
8d6136bcf3
Don't crash when materials are not registered 
It can't update the nodes structure with the links between materials then.

Contributes to issue CURA-6444.
 2019-05-01 13:14:40 +02:00
Lipu Fei
d6f4ddc322 Simplify GlobalStacksModel 
CURA-6483
 2019-04-30 12:46:01 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName() 
CURA-6449
 2019-04-29 13:28:18 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string 
CURA-6449
 2019-04-25 13:14:28 +02:00
Lipu Fei
b22073e170 Add timeout for manual IP requests 
CURA-6483
 2019-04-25 11:54:32 +02:00
Lipu Fei
9868dee474 Fix typing 
CURA-6483
 2019-04-25 08:57:57 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Lipu Fei
47f9741d9d Sort network printer names in list 
CURA-6449
 2019-04-17 13:35:40 +02:00
Lipu Fei
ce5682aa74 Check type by ID in isUnknownMachineType() 
CURA-6449
 2019-04-17 09:32:34 +02:00
Lipu Fei
d9018220b5
Merge branch 'master' into CURA-6449_fix_non_host_printers 2019-04-15 11:37:02 +02:00
Remco Burema
367a12557f Filter placeholders-devices: but use parseBool instead. [CURA-6057] 2019-04-12 13:14:35 +02:00
Remco Burema
c5f4b30264 Don't show 'discovered' machines that are placeholders. [CURA-6057] 2019-04-12 13:01:39 +02:00
Lipu Fei
6383c77473 Fix section text 
CURA-6449
 2019-04-12 12:25:38 +02:00
Lipu Fei
26205fbdce Remove translation for Unknown printer type 
CURA-6449
 2019-04-12 12:23:24 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group 
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
 2019-04-11 11:33:01 +02:00
Lipu Fei
1207533046 Fix local printer selection update 
CURA-6057
 2019-04-03 15:14:06 +02:00
Ghostkeeper
d8f89d8330
Fix sorting printers by name 
Because DiscoveredPrinter.name contains the MAC addresses of the printers. NetworkedPrinterOutputDevice.name contains the discovered name as communicated by ZeroConf. We already use that property from QML to display in the list.

Contributes to issue CURA-6057.
 2019-03-29 13:41:46 +01:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable 
CURA-6057
 2019-03-29 10:43:47 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names 
CURA-6426
 2019-03-27 14:08:06 +01:00
Lipu Fei
6dbae6f088 Show machine actions page optionally 2019-03-27 09:34:48 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Jaime van Kessel
8518aba3a5 Adds tests for QualityManager 2019-03-15 14:51:35 +01:00