GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,916 Commits 294 Branches 267 Tags
Commit Graph

406 Commits

Author SHA1 Message Date
Ghostkeeper
a6e3828eaa
Efficiency: Don't update model if adding different container types 
In fact we might want to delay updating until after the program has started up.

Contributes to issue CURA-6597.
 2019-07-04 12:33:50 +02:00
Ghostkeeper
cf68157508
Fix updating upon containers or configuration changing 
Copy-paste mistake...

Contributes to issue CURA-6597.
 2019-07-04 12:29:02 +02:00
Ghostkeeper
bd2237dc45
Update intent categories upon adding containers or changing configuration 
Also upon start-up.

Contributes to issue CURA-6597.
 2019-07-04 11:31:59 +02:00
Ghostkeeper
6ba70f3425
Rewrite IntentModel to return quality types rather than actual profiles 
We don't want the profiles, because that'd be specific to one extruder. We want the quality types and intent categories as tuples again.

Contributes to issue CURA-6597.
 2019-07-04 11:04:44 +02:00
Ghostkeeper
3f29bce263
List intents per category 
This is the naive one. We want to list the default intents multiple times, once for every quality level.

Contributes to issue CURA-6597.
 2019-07-03 16:51:47 +02:00
Remco Burema
6b918dbd1d Fix typing in IntentCategoryModel. 2019-06-28 12:04:04 +02:00
Ghostkeeper
f339686c49
Implement category model 
Not just pseudocode. However this code is not yet tested.

Contributes to issue CURA-6091.
 2019-06-21 12:45:44 +02:00
Ghostkeeper
fa65875824
Add psuedocode/boilerplate for intent manager 
This won't run. Don't try to import this class yet. It's outlining what we need to implement to get intents per stack.

It does no form of caching at this point. Build first, optimise later, right.

Contributes to issue CURA-6091.
 2019-06-19 14:29:19 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +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
35ec70a3cf Add a selector for the intent profile 
CURA-6534
 2019-06-05 11:13:32 +02:00
Jaime van Kessel
2d8c19203e Expose intent model to QML 
CURA-6534
 2019-06-05 09:57:42 +02:00
Jaime van Kessel
2e7f8b066a Ensure that the intent model gets populated 
CURA-6534
 2019-06-04 17:32:11 +02:00
Jaime van Kessel
266cf52cbc Add stub for the IntentModel 
CURA-6534
 2019-06-04 17:24:34 +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
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
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
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
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00