Commit graph

4475 commits

Author SHA1 Message Date
Ghostkeeper
f948203a63
Fix crash when clearing build plate
We shouldn't delete the singleton PrintInformation object. We should rather just zero out the print information. And instead of doing that explicitly in deleteAll, listen to scene changes from PrintInformation in order to keep the logic related to the print information contained within its class.

Contributes to issue CURA-4810.
2018-01-16 13:44:49 +01:00
Lipu Fei
51b49c89f4 Switch to LayerView after GCode has been fully loaded
CURA-4805
2018-01-16 13:09:35 +01:00
Lipu Fei
8a570c4b01 Show user profiles based on Not Supported
CURA-4807
2018-01-16 11:57:20 +01:00
Lipu Fei
abece3c415 Add quality_type = not_supported to empty_quality_changes
CURA-4807
2018-01-16 11:57:20 +01:00
Jack Ha
2d9e25312e Merge branch '3.2' 2018-01-16 11:50:00 +01:00
Jack Ha
a0738c2977 CURA-4808 fix extruder setting change trigger slice. re-introduce extrudersAdded signal, probably needed because of timing issues (extruder added after loading global container). it's the inversion of 225b03e98e 2018-01-16 11:49:45 +01:00
Ghostkeeper
27c0ca4dea
Move some things outside of try-catch clause
Only the pre-read should really be in there. Otherwise we'd hide some mistakes in our code.

Contributes to issue CURA-4810.
2018-01-16 10:53:14 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +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
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Lipu Fei
9a5b215814 Do not show not supported when there are supported profiles
CURA-4796
2018-01-15 15:16:43 +01:00
Lipu Fei
784707bb85 Stay on the same build plate after everything is removed
CURA-4795
2018-01-15 14:42:22 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2
Fix for CURA-4789
2018-01-15 14:41:23 +01:00
Ian Paschal
5280501660 Fix for CURA-4789
`deleteAll()` within `CuraApplication.py` used to only delete all scene nodes but now also resets the print information, as deleting all scene nodes _should_ do that by default. Timer now resets to 0, and project name is reset.
2018-01-15 14:40:01 +01:00
Lipu Fei
a3c2635648 Fix profile manager to support not supported custom profiles
CURA-4796

Profile manager should be able to show custom profiles that are based on
the not supported profile correctly.
2018-01-15 14:29:52 +01:00
Lipu Fei
1d104f367d Do not show not supported in profile manager
CURA-4796
2018-01-15 14:29:51 +01:00
Lipu Fei
4abbd4b988 Show custom qualities based on not supported
CURA-4796
2018-01-15 14:29:51 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +01:00
Lipu Fei
dc596d0e1e Only remove selectable nodes in deleteAll()
CURA-4795

Otherwise, after loading a project file, all nodes including the
machine will be removed and you don't see the machine any more.
2018-01-15 11:12:09 +01:00
Lipu Fei
87dc3535bb Use isinstance() for SceneNode type check
CURA-4525
2018-01-15 09:59:41 +01:00
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00
ChrisTerBeke
6433619b2f Merge branch 'master' into feature_headless_docker 2018-01-15 09:30:47 +01:00
ChrisTerBeke
bd1bf2caaf Add use_gui flag in application, don't use theme functions when not using gui 2018-01-12 17:38:47 +01:00
Lipu Fei
b54b075cc9 Use isinstance() instead or issubclass()
CURA-4525
2018-01-12 16:42:34 +01:00
ChrisTerBeke
1a05fd5989 Merge branch 'master' into feature_headless_docker 2018-01-12 11:14:47 +01:00
Jaime van Kessel
67aa21ba6c Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-12 11:04:32 +01:00
ChrisTerBeke
36da402488 Merge branch '3.2' 2018-01-12 11:03:09 +01:00
Jaime van Kessel
1986677276 re-addded connection text
CL-541
2018-01-12 10:58:16 +01:00
ChrisTerBeke
ade86ebc45
Merge pull request #2974 from Ultimaker/network_rewrite
Network rewrite
2018-01-12 10:31:36 +01:00
Lipu Fei
225b03e98e No need for the extra extrudersAdded signal
CURA-4784
2018-01-12 09:58:07 +01:00
fieldOfView
76fd49b185 Merge branch 'network_rewrite' into feature_preheat_extruder 2018-01-11 15:28:28 +01:00
fieldOfView
bc5b5ac283 Implement preheating hotends for USB printing 2018-01-11 15:27:38 +01:00
Jack Ha
87105e6d06 CURA-4525 fix printing dimensions 2018-01-11 14:30:59 +01:00
Aleksei S
2ca6541712 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-11 13:34:14 +01:00
Aleksei S
3f4a2c565c Fix: after extruders switch do not trigger slicing, provided a new signal
which is triggered after adding extruder and it subscribers for property changes
2018-01-11 13:32:05 +01:00
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic
option
2018-01-11 13:03:35 +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
e5e6da2970 Change comments 2018-01-11 09:49:07 +01:00
Jack Ha
b8a21a5eb3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-11 09:33:15 +01:00
Jack Ha
b9a99d4692 CURA-4525 fix placement on load to only avoid objects on current build plate 2018-01-11 09:33:07 +01:00
Diego Prado Gesto
3a01a407cf CURA-4461 Set default variant builplate when the new printer is added 2018-01-11 09:16:11 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
Lipu Fei
702d7dd3a8 Fix model importing with multi build plate
CURA-4782
2018-01-11 08:23:19 +01:00
fieldOfView
fb9d841c90 Add per-extruder preheat controls
These are lifted from the bed preheat controls and are not functional at the moment
2018-01-10 21:41:59 +01:00
Diego Prado Gesto
78b42afbcb CURA-4776 Add unique id to the profiles so user can import the same
profile several times with different names.It also fixes the issue for
importing profiles from GCode.
2018-01-10 16:40:58 +01:00
Diego Prado Gesto
ff10af905c CURA-4461 Add code to set the default preferred buildplate when adding a
new machine that has different buildplates.
2018-01-10 16:04:30 +01:00
Jack Ha
6262003069 CURA-4525 reset the print information for build plates that are marked for slicing 2018-01-10 16:01:26 +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