3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 20:57:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22028 commits 306 branches 270 tags 779 MiB
Commit graph

2094 commits

Author SHA1 Message Date
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
Ghostkeeper
93ef8f6c98
Merge branch 'master' into CURA-6440_exclude_support_blocks_in_used_extruders 2019-04-04 16:41:00 +02:00
Ghostkeeper
8c5f871185
Also omit support meshes from used extruders list 
Their own extruder doesn't get used necessarily, because these meshes are then printed using the support extruder.

Contributes to issue CURA-6440.
 2019-04-04 16:35:48 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden 
I think some of us got the spelling of this word wrong in their heads.
 2019-04-04 14:39:01 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Lipu Fei
8da1f8fa7d Exclude support blockers in used extruders 
CURA-6440
 2019-04-02 14:16:57 +02:00
Jaime van Kessel
5e66564c00 Ensure that configurationTypes doesn't crash if a None is in the list 
Fixes #5551
 2019-04-02 12:05:08 +02:00
Jaime van Kessel
efe8f19109 Return the value for default extruder if the requested one could not be found 
This fixes #5535
 2019-04-02 11:46:12 +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
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
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +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
Lipu Fei
1f5cf62a7c Move UserChangesModel into cura.UI module 2019-03-20 09:22:42 +01:00
Lipu Fei
e1d26da528 Move ExtrudersModel into cura.UI module 2019-03-20 09:19:30 +01:00
Lipu Fei
a106a9ddb9 WIP: Cleanup MachineSettingsAction 2019-03-20 08:59:20 +01:00
Lipu Fei
449740a631 WIP: MachineSettings Printer tab 2019-03-18 14:48:24 +01:00
Jaime van Kessel
7bb35cdbf7 Add test cases for the ContainerManager 2019-03-15 16:17:28 +01:00
Jaime van Kessel
0fbfe9e6c9 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-13 15:42:21 +01:00
Jaime van Kessel
986581c18a Improve logging if extruder cant be found while creating extruder stack 2019-03-13 14:18:25 +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
Jaime van Kessel
0616601250 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:39:23 +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
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version 
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
 2019-03-08 13:34:16 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel 
also when the variant container has changed.

Contributes to CURA-6227.
 2019-03-01 14:54:42 +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
b165b9625f Removed unused code and fix styling for some comments 2019-02-22 15:08:51 +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