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
Diego Prado Gesto
1a520a041b
CURA-4768 Allow groups of models to be included in the select all and
...
arrange tools.
2018-01-05 16:27:57 +01:00
Aleksei S
784a17149f
Don't show save to file if not possible to slice
...
CURA-4525
2018-01-05 15:20:42 +01:00
ChrisTerBeke
39921795ce
Properly align printer not connected label from top
2018-01-05 14:46:16 +01:00
ChrisTerBeke
7a7b4d2b63
Merge branch 'master' into feature_headless_docker
2018-01-05 14:27:58 +01:00
Aleksei S
5dad6cab2c
If the model is:some per mesh settings or outside of the buildplate show message,
...
CURA-4525
2018-01-05 14:00:23 +01:00
Ghostkeeper
a717960695
Disallow negative branch angles
...
The engine can't really handle that any more.
Contributes to issue CURA-4523.
2018-01-05 13:46:05 +01:00
Ghostkeeper
a8ad956c92
Erase gcode of build plates that are determined to be empty
...
You don't want to start a new slice, but you should still erase the g-code there.
Contributes to issue CURA-4525.
2018-01-05 13:34:39 +01:00
Ghostkeeper
fefb20deb7
Don't start slicing again if you can't slice
...
Contributes to issue CURA-4766.
2018-01-05 13:33:40 +01:00
Ghostkeeper
b20c6c6ac7
Use isinstance instead of type checking for SceneNode
...
isinstance also checks for subclasses. In our case, SceneNode was just extended to CuraSceneNode so this test was failing.
Contributes to issue CURA-4766.
2018-01-05 13:02:30 +01:00
Lipu Fei
8c98ab027a
Fix code style
...
CURA-4758
2018-01-05 11:55:18 +01:00
Lipu Fei
223d9b6025
Update QtQuick import versions
...
CURA-4758
2018-01-05 11:55:18 +01:00
Lipu Fei
65e8762546
Fix layer height slider update issue
...
CURA-4758
2018-01-05 11:55:17 +01:00
Diego Prado Gesto
47ba8b098c
Apply to layers shadow shader the same changes than in the default layer
...
shader, so that the shadow layers are correctly shown in simulation view
2018-01-05 11:51:12 +01:00
Ghostkeeper
502332ee3e
Revert "Account for getConvexHullTransformedVertices returning None"
...
This reverts commit 564a97d5a8
.
2018-01-05 09:17:02 +01:00
Ghostkeeper
63f7902fca
Revert "Simplify code flow a bit"
...
This reverts commit 2c45efb70d
.
2018-01-05 09:16:03 +01:00
Torbjørn
860a05091a
Merge pull request #5 from Ultimaker/master
...
resync
2018-01-04 19:15:50 +01:00
Ghostkeeper
2c45efb70d
Simplify code flow a bit
...
Use if branches for the unhappy flow, so that it's clear that this behaves as an early-out. This also prevents the need for declaring variables out of scope, which is not an issue with Python anyway.
2018-01-04 17:23:43 +01:00
Ghostkeeper
564a97d5a8
Account for getConvexHullTransformedVertices returning None
...
It returns None if there are no vertices.
2018-01-04 17:20:57 +01:00
ChrisTerBeke
9784faf181
Merge pull request #3017 from fieldOfView/feature_textfield_select
...
Select text when gaining focus
2018-01-04 17:01:46 +01:00
jack
5273fcf238
Merge pull request #2790 from Ultimaker/feature_tree_support
...
Tree support
2018-01-04 16:57:52 +01:00
Jack Ha
2dad18a9ba
CURA-4761 allow for space for scrollbar in per object settings
2018-01-04 16:26:39 +01:00
Jack Ha
5611a6b6eb
Merge branch 'master' of github.com:Ultimaker/Cura
2018-01-04 16:12:46 +01:00
Jack Ha
4f224a4311
CURA-4525 do not show build plate view item when disabled
2018-01-04 16:12:39 +01:00
Jaime van Kessel
d0ec7d10ce
Printer discovery shows if a cluster is actually set up as a host
...
CL-541
2018-01-04 15:35:30 +01:00
Lipu Fei
d778856025
Merge pull request #3009 from smartavionics/mb-add-infill_enable_travel_optimization
...
Added infill_enable_travel_optimization setting.
2018-01-04 15:09:58 +01:00
Jack Ha
5e26ecb458
CURA-4672 now unbreak arrange for large objects as well :-)
2018-01-04 14:59:40 +01:00
Jaime van Kessel
f44c169b3e
Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite
2018-01-04 14:57:11 +01:00
Jaime van Kessel
c9b8b0333c
Sending prints to a specific printer in the cluster is now possible again
...
CL-541
2018-01-04 14:56:42 +01:00
Jack Ha
0d7f139cd5
Merge branch 'master' of github.com:Ultimaker/Cura
2018-01-04 14:23:31 +01:00
Jack Ha
abdc33a0b9
CURA-4672 fix auto arrange for small models, they are now rounded up to 1 pixel rasterized
2018-01-04 14:23:22 +01:00
Lipu Fei
4b883f72d1
Merge pull request #3082 from Ultimaker/qtquick-controls-2.0
...
QtQuick controls 2.0 for settings sidebar
2018-01-04 14:07:31 +01:00
Lipu Fei
d20895a055
Fix code style
...
CURA-4758
2018-01-04 13:51:47 +01:00
Simon Edwards
b20e35714f
Factor out the code for adding a function for run after a HTTP request
...
CL-541
2018-01-04 13:36:29 +01:00
Jaime van Kessel
8a7105dd9c
Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite
2018-01-04 13:32:12 +01:00
Jaime van Kessel
acde48108d
Removed control item
...
CL-541
2018-01-04 13:31:54 +01:00
Simon Edwards
695c7d8267
Rename the _live_multiparts
to the even better _kept_alive_multiparts
name
...
CL-541
2018-01-04 13:27:24 +01:00
Lipu Fei
84adbc5f41
Use the 5.8 versions of QtQuick modules in QMLs
...
CURA-4758
2018-01-04 13:26:14 +01:00
ChrisTerBeke
c47a0a17a5
Merge branch 'master' into feature_headless_docker
2018-01-04 13:23:50 +01:00
Lipu Fei
7b8f951682
Simplify temp_scale_factor assignment
...
CURA-4672
2018-01-04 13:02:10 +01:00
Lipu Fei
3a4445b656
Fix code style
...
CURA-4672
2018-01-04 12:56:24 +01:00
Lipu Fei
9cb7050681
Remove unused code
...
CURA-4672
2018-01-04 12:56:23 +01:00
Jaime van Kessel
fc3a47cb7b
Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite
2018-01-04 12:55:08 +01:00
Jaime van Kessel
2e8ae5c590
Unsasigned jobs are now also removed from list
...
CL-541
2018-01-04 12:54:47 +01:00
ChrisTerBeke
4cec27b181
Fix QML warnings for combo boxes - CURA-4758
2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1
Fix icon positions - CURA-4758
2018-01-04 11:33:12 +01:00
ChrisTerBeke
af9181287a
Merge branch 'master' into qtquick-controls-2.0
2018-01-04 11:17:50 +01:00
ChrisTerBeke
4685230d8d
Add missing super init call - CURA-4525
2018-01-04 10:59:44 +01:00
ChrisTerBeke
c7c989f2a0
Fix merge conflicts after multi-buildplate refactor
2018-01-04 10:52:01 +01:00