387 Commits

Author SHA1 Message Date
Lipu Fei
ab4cfa5fbb Use userChanges instead of getContainer(0)
CURA-4916
2018-02-28 12:49:41 +01:00
Aleksei S
e533c4604c Update infill scroll bar if setting is changed in custom mode
CURA-4916
2018-02-28 10:52:46 +01:00
Diego Prado Gesto
85059882fe CURA-4959 Add buildplate information to the summary when saving a
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.
2018-02-16 11:01:02 +01:00
Jaime van Kessel
b36d3c759f Codestyle & typing fixes 2018-02-08 11:40:23 +01:00
Jaime van Kessel
22e0c80b3d Removed unneeded extra error check
This caused an extra 1.5 second delay on changing machine configurations for dual extrusion machines.
2018-02-08 10:27:54 +01:00
Lipu Fei
25713a6e64 Merge remote-tracking branch 'origin/3.2' 2018-02-01 11:23:20 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks
CURA-4898
2018-01-31 13:32:45 +01:00
Lipu Fei
b14fdb1d0d Merge remote-tracking branch 'origin/3.2' 2018-01-23 11:20:49 +01:00
Jack Ha
92e99012d3 CURA-4785 now actually checking for extruder position, improved logs 2018-01-23 09:33:52 +01:00
Jack Ha
dc119d74bd CURA-4785 added logging for measuring time for validation check 2018-01-23 09:21:38 +01:00
Jack Ha
204af1b6ed CURA-4785 fix slow cura for Custom FDM printer: now it's not checking for errors in unused extruders 2018-01-22 16:17:37 +01:00
Diego Prado Gesto
0fbcd2d2ec Merge branch '3.2' 2018-01-19 13:50:30 +01:00
ChrisTerBeke
d035ace40d Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template 2018-01-19 13:32:25 +01:00
ChrisTerBeke
422d047317 Merge branch 'master' into feature_headless_docker 2018-01-17 17:02:04 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Diego Prado Gesto
0f497545bc CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes 2018-01-15 18:00:49 +01:00
ChrisTerBeke
1a05fd5989 Merge branch 'master' into feature_headless_docker 2018-01-12 11:14:47 +01:00
Diego Prado Gesto
a2089c6afd CURA-4461 Force set the active quality as it is when changing the buildplate type, so the values are updated 2018-01-11 09:49:48 +01:00
Diego Prado Gesto
0abb2e0d55 CURA-4461 When reading instance containers, just allow a variant in the global stack if it is a buildplate. 2018-01-10 15:00:12 +01:00
Diego Prado Gesto
cea9f359cd CURA-4461 Set active buildplate in the global container stack when is
changed in the UI.

Add a new setting for distinguish between types of build plates.
2018-01-10 14:05:38 +01:00
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if
the printer has different buildplates.
2018-01-09 15:42:10 +01:00
ChrisTerBeke
56435f12c0 Add additional debug logging in machine manager for changing stack setup 2017-12-21 17:12:39 +01:00
ChrisTerBeke
0e1cd99578 Add flag to ignore discard or keep dialog when changing print setup 2017-12-21 17:08:44 +01:00
Jaime van Kessel
9754aa5397 Material & hotend updated callback is enabled for LegacyUM3 again
CL-541
2017-12-21 13:16:44 +01:00
Jaime van Kessel
bc8741ef08 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-19 10:40:32 +01:00
Lipu Fei
f26872ec1f Apply fix for single extrusion machines when a new global stack is added
CURA-4713

Now the machines are not all loaded in the beginning, so the old way of
adding extruder stacks for old single-extrusion machines don't work.
With this fix, it now happens whenever a global stack is added to the
registry.
2017-12-15 14:51:48 +01:00
Jaime van Kessel
24bd32477a Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-14 13:03:02 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start.
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom
If we know it's a CuraContainerStack we can use .definition safely.

Contributes to issue CURA-4243.
2017-12-08 16:57:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated
CL-541
2017-12-08 14:36:53 +01:00
Jaime van Kessel
c28c20dbd7 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-08 10:22:16 +01:00
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager.
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
2017-12-06 14:12:51 +01:00
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +01:00
Lipu Fei
c0a502f99c Check if there is an active machine before doing anything else
CURA-4680
2017-12-06 11:48:14 +01:00
Jack Ha
41cde7c7f4 Fix connecting material name change signal on startup. Contributes to CURA-4243. 2017-12-04 17:07:37 +01:00
Lipu Fei
14c84d835a Make quality switching clear
CURA-4650
2017-12-01 09:55:38 +01:00
Ghostkeeper
838e49f3da
Pass just metadata through quality manager instead of full containers
Where we only need metadata, we should pass metadata instead of full containers.
Also add some type hinting.

Contributes to issue CURA-4243.
2017-11-29 14:33:04 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
2017-11-28 17:30:00 +01:00
Ghostkeeper
381d9bf3f1
Log which file caused it to go wrong
Contributes to issue CURA-4243.
2017-11-28 16:15:20 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder
CURA-4620
2017-11-25 02:25:36 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
Lipu Fei
aeb478bb4b Should only show Keep/Discard dialog when it's needed
CURA-4599
2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7 Show Keep/Discard dialog after the containers have been changed
CURA-4599

Or the default values will reflect those before the switch.
2017-11-22 09:18:20 +01:00