GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,467 Commits 288 Branches 260 Tags
Commit Graph

746 Commits

Author SHA1 Message Date
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName() 
CURA-6449
 2019-04-29 13:28:18 +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
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs' 2019-04-16 16:29:14 +02:00
Lipu Fei
8e579d2d68 Update default extruder when applying remote config 
CURA-6452
 2019-04-15 13:25:24 +02:00
Lipu Fei
ba37812793 Correct some deprecations and remove duplicated code 2019-04-15 09:47:09 +02:00
Lipu Fei
5f7f7f944f Remove use XYZ instead 2019-04-15 09:39:05 +02:00
Remco Burema
d3310be846 Deprecate some MachineManagaer functions. 
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!

part of CURA-6457
 2019-04-12 16:19:54 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page 
CURA-6057
 2019-04-08 13:06:30 +02:00
Jaime van Kessel
e1804e0a47 Merge branch 'CURA-5930_switch_to_first_enabled_extruder' of github.com:Ultimaker/Cura 2019-04-08 11:37:19 +02:00
Jaime van Kessel
fe14024620 Move existNetworkInstances into discover action 2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a Move a bunch of network only functions out of machine manager 
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
 2019-04-05 17:45:19 +02:00
Lipu Fei
3adf7d49d0 Switch to the first enabled extruder after setActiveMachine 
CURA-5930
 2019-04-05 10:51:09 +02:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +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
da351da611 Update comments for associateActiveMachineWithPrinterDevice() 2019-03-20 10:48:04 +01:00
Lipu Fei
81fbc525e4 Rename ConfigurationModel to PrinterConfigurationModel 2019-03-20 09:52:35 +01:00
Lipu Fei
e555f7da68 Move ConfigurationModel into cura.UI module 2019-03-20 09:51:06 +01:00
Lipu Fei
69eb381f10 Move MaterialOutputModel into cura.UI module 2019-03-20 09:47:44 +01:00
Lipu Fei
49c87a1e1d Move ExtruderConfigurationModel into cura.UI module 2019-03-20 09:44:15 +01:00
Lipu Fei
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Jaime van Kessel
0fbfe9e6c9 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-13 15:42:21 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Ian Paschal
6392ab8d05 Handle "" and None as hot-end and material IDs 
Contributes to CL-1282
 2019-03-11 16:30:04 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Jaime van Kessel
1c7e047a38 Added tests for adding & removing discovered devices 
CURA-6179
 2019-02-28 09:47:25 +01:00
Jaime van Kessel
17fdc86e50 Fix typing 
CURA-6179
 2019-02-27 11:59:50 +01:00
Jaime van Kessel
21c6bba1ce Add the discovered printer functionality 
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).

This means we can select one of those printers and directly add it (thus no longer needing that step)

CURA-6179
 2019-02-27 11:05:54 +01:00
Jaime van Kessel
5c354eb6a3 Switch the order of name & id in addMachine call 
This makes it possible for the name to not be set, in which case it will
default to the name provided by the definition

CURA-6179
 2019-02-26 10:45:18 +01:00
Jaime van Kessel
b5c270f00a Add stubs for MachineManager testing 
It also adds a first test that checks if the setActiveMachine
 2019-02-22 13:49:31 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
b64cf1fe1c Remove unneeded signal call 2019-02-21 16:19:16 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Jaime van Kessel
b09538da63 Ensure that the numberOfExtruders property gets updated after configuration sync 
CURA-6220
 2019-02-14 13:44:43 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Remco Burema
c50fcf42c5 Fix crash on no output devices in list. 2019-02-12 11:39:03 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop up
 2019-02-08 13:26:03 +01:00
Lipu Fei
e5071eac5b Fix typing 2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5 Fix typing 2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831 Remove unused things 2019-02-07 14:29:59 +01:00
Ian Paschal
01ca3546aa Add activeMachineAddress to MachineManager for easy access 
Contributes to CL-1222
 2019-02-06 11:59:39 +01:00
Lipu Fei
fff6cb9ce8 Merge remote-tracking branch 'origin/4.0' 2019-02-05 09:48:10 +01:00
Lipu Fei
bac344a692 Show extruder names in disabled message 
CURA-5693
 2019-02-05 09:26:50 +01:00