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
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft'
2019-02-18 15:17:48 +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
Remco Burema
f1b6e527be
Rectified wrong placement of brackets causing logic change. [CURA-5864]
2019-02-14 14:55:12 +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
Remco Burema
a601e0878c
Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864]
2019-02-13 15:46:39 +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
d6abad3f27
Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable
2019-02-07 14:47:11 +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
