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
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
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
Aleksei S
92e48795c9
Merge branch 'master' of github.com:Ultimaker/cura
2018-01-10 11:20:31 +01:00
Aleksei S
95361bbeb2
Refactoring: profile from Gcode
...
CURA-4776
2018-01-10 11:19:19 +01:00
Lipu Fei
91cccedf75
Fix upgrading quality changes for single extrusion machines
2018-01-10 08:54:46 +01:00
ChrisTerBeke
3de4940d69
Simplify creating, duplicating materials in preferences, extract logic to python, code-style fixes
2018-01-09 16:19:29 +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
Lipu Fei
33f0e8cb65
Use isinstance() to check if a node is a SceneNode
...
CURA-4780
2018-01-09 13:58:17 +01:00
ChrisTerBeke
8f26784377
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-01-09 13:49:13 +01:00
ChrisTerBeke
5936ebaa80
Fix another case of scene node checking by subclass, related to CURA-4780
2018-01-09 13:48:20 +01:00
Aleksei S
3852b0d1c3
Merge branch 'master' of github.com:Ultimaker/cura
2018-01-09 13:39:32 +01:00
Aleksei S
d633a4c112
Fix: cura does not profile form G-code
...
CURA-4776
2018-01-09 13:38:41 +01:00
Lipu Fei
78b9a14007
Fix all possible quality changes containers for single extrusion
...
In the current fix, the quality changes that are applicable to the
machine may not have been fixed yet because they are not active at that
moment. This commit makes sure that for a single extrusion machine which
has just been updated to have an ExtruderStack, all the quality changes
containers that are applicable to this machine will be updated as well.
2018-01-09 13:30:01 +01:00
Lipu Fei
c91eb30de9
Skip loaded instance containers
...
When trying to apply the fix for single extrusion machines by creating a
new ExtruderStack, skip the quality changes container that has already
been loaded.
2018-01-09 13:30:01 +01:00
Lipu Fei
8e5167be76
Use the same machine def for extruder quality changes containers
2018-01-09 13:30:00 +01:00
Lipu Fei
59d7cc663a
Fix creating ExtruderStack for single-extrusion machine at runtime
...
Move per-extruder settings from the machine's quality changes container
to the extruder's quality changes container.
2018-01-09 13:30:00 +01:00
Diego Prado Gesto
0722465fb9
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-01-09 09:17:51 +01:00
Diego Prado Gesto
4c8c4c78da
CURA-4772 Create a CuraSceneNode instead of a SceneNode when reading a
...
GCode. Avoid creating an empty CuraSceneNode if the node is already an
instance of it.
2018-01-09 09:16:21 +01:00
Jack Ha
584f477b54
CURA-4525 fix deleting last item
2018-01-08 14:28:09 +01:00
Jack Ha
164e5fdc8e
CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection
2018-01-08 13:55:42 +01:00
Jaime van Kessel
99de75a3fd
Fixed connection label state
...
CL-541
2018-01-08 13:44:20 +01:00
Jack Ha
e638c21acb
CURA-4525 fix selected object will select correct build plate (not only visualization)
2018-01-08 11:30:57 +01:00
Jack Ha
733d6234e6
CURA-4525 moved experimental preferences to bottom with its own label; all settings are by default off
2018-01-08 11:13:16 +01:00
Jaime van Kessel
ed9634ebe0
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2018-01-08 10:56:12 +01:00
Diego Prado Gesto
ab24506307
Add string to cura I18N catalog. Contributes to CURA-4525
2018-01-05 17:05:11 +01:00
Diego Prado Gesto
eda781ce7b
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-01-05 16:54:55 +01:00
Diego Prado Gesto
c839bc1759
Groups of objects are taken into account and are shown in the object
...
list instead of each model separatelly. Contributes to CURA-4525
2018-01-05 16:53:18 +01:00