Commit graph

14766 commits

Author SHA1 Message Date
Jack Ha
b983a50bcd Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 10:21:18 +01:00
Jack Ha
7ebd83f815 CURA-4400 get setting type from definition instead of whole stack improves speed of this call by a factor of 10 2018-03-14 10:21:10 +01:00
fieldOfView
7e4cb1c36e Disable Support Eraser if anti_overhang_mesh is disabled 2018-03-14 10:08:00 +01:00
Lipu Fei
3cefacdfcc Remove root_material_nod is None check in MaterialManager
CURA-5056

This will no longer happen.
2018-03-14 09:28:35 +01:00
Jack Ha
ac9bd954df Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 09:03:25 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
Ghostkeeper
00bd306307
Merge branch 'M&P-Setting-Optimization' 2018-03-14 09:02:38 +01:00
Ghostkeeper
9f89678e42
Update when switching printers
I confused globalContainerChanged with activeStackChanged.

Contributes to issue CURA-4606.
2018-03-14 08:26:12 +01:00
fieldOfView
a536da503b Rename DepthPass to PickingPass
The map created by the shader is not strictly a depth map; not only is the "depth" encoded in the rgb channels, but it is also a distance to the camera instead of a "scene depth".
2018-03-13 20:40:41 +01:00
fieldOfView
d88724aff5 Move ray picking to DepthPass 2018-03-13 20:05:49 +01:00
Mark Burton
4aa89068d7 Now, wall_min_flow and wall_min_flow_retract are hidden if overlap compensation is disabled. 2018-03-13 19:00:27 +00:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Lipu Fei
b83fd17038 Fix GUI update upon material data change
CURA-5084
2018-03-13 17:43:01 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar
CURA-5084
2018-03-13 17:41:15 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +01:00
Jaime van Kessel
7b3598e992 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:54:09 +01:00
Jaime van Kessel
00f5e6ff7c Only trigger platform physics update if the node has meshdata 2018-03-13 16:53:28 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Lipu Fei
5adb769cf8 Fix value function for extruders_enabled_count
CIRA-5056
2018-03-13 16:48:44 +01:00
Jaime van Kessel
283d08a0d6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:46:51 +01:00
Jaime van Kessel
40d300f5cc Change default direction of snapshot, so robot looks in the same direction as our beautifull logo; the ultibot 2018-03-13 16:46:02 +01:00
Aleksei S
37bb48d04f Merge branch 'master' of github.com:Ultimaker/cura 2018-03-13 16:38:29 +01:00
Aleksei S
e2cbfa8cec Fix: Retrieve printer type during creating outputDevice
CURA-5053
2018-03-13 16:37:09 +01:00
Lipu Fei
493bfb6b17 Fix material serialization
CURA-5086
2018-03-13 16:37:04 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility
Cura 5059 reset icon visibility
2018-03-13 16:11:58 +01:00
Diego Prado Gesto
855df814d8 CURA-4870 Fix some style with brackets in QML 2018-03-13 16:11:51 +01:00
Lipu Fei
c8a882849f Simplify task queue for machine error check
CURA-5059
2018-03-13 16:08:46 +01:00
Jack Ha
9e0a78929a CURA-5059 changed error check timer interval and added measured time in logging 2018-03-13 16:02:57 +01:00
Diego Prado Gesto
180139090a CURA-4870 Reuse the filter in findContainerStacks to find specific
printers.
Allow to show configurations with empty material or variant.
2018-03-13 15:54:00 +01:00
THeijmans
6b7fc8b903 Removed retraction z hops from variants
To make single extrusion mode work.
2018-03-13 15:00:24 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Jack Ha
76f853c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 13:53:49 +01:00
Jack Ha
cf3032605c CURA-4400 fix extruderValue / getExtruderValue for extruder_index -1 2018-03-13 13:53:41 +01:00
Aleksei S
09d01f2207 Fix: Group models were not slicable
CURA-5082
2018-03-13 13:51:19 +01:00
Diego Prado Gesto
9196802e83 CURA-4870 Clean the error messages from qml by not rendering components
if there is no outputDevice defined.
2018-03-13 13:40:31 +01:00
Ian Paschal
516772e1f7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-13 13:29:03 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
2018-03-13 13:21:44 +01:00
Jack Ha
d6979bc89a CURA-4400 using an intermediate variable prevents an empty popup that occured now and then 2018-03-13 13:14:33 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
2018-03-13 13:14:29 +01:00
Jack Ha
0897c740b0 Fix typo in log 2018-03-13 12:57:03 +01:00
Ian Paschal
6d2d9c8fe2 CURA-4946 Fixed typo 2018-03-13 12:39:10 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders
context menu option
2018-03-13 12:31:03 +01:00
fieldOfView
0caea24afc Add depth pass for picking a location 2018-03-13 12:14:05 +01:00
THeijmans
392605014a Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization
Fixed conflicts
2018-03-13 11:58:33 +01:00
THeijmans
4c61ea5ba9 Single extrusion settings for travels
Updated single extrusion settings, so z hops are removed and travels are shortened for single extrusion.
2018-03-13 11:45:19 +01:00
Aleksei S
73517cd176 The infill denstiy was updated twice, first in Custom view and then in Recomended view
CURA-5071
2018-03-13 11:41:48 +01:00
Diego Prado Gesto
d807ce57a5 CURA-4870 Disable rename button in MachinesPage when the selected item
is a network printer since the name is the name of the host printer (or
group)
2018-03-13 10:49:29 +01:00
Diego Prado Gesto
fa2b5f141c CURA-4870 Remove dinamic connections to the signals in the machine
model. The model is still updated when the container changed.
2018-03-13 10:35:48 +01:00
Lipu Fei
40d3e09d90 Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility 2018-03-13 10:25:01 +01:00