89 Commits

Author SHA1 Message Date
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jack Ha
5f6ed488d1 Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273 2017-01-30 11:39:59 +01:00
Jack Ha
3a2438937d Removed crappy legend 2017-01-25 12:46:07 +01:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
Jack Ha
e21a6ed62a Cleanup 2017-01-24 16:52:47 +01:00
Jack Ha
f80a04cbc3 Auto detect compatibility mode for layer view. 2017-01-24 16:31:57 +01:00
fieldOfView
45c8083423 Use themeable colors in Solid, Xray & Layer view 2017-01-23 22:08:27 +01:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
Jack Ha
cd8eaf7759 minimum layer slider now works 2017-01-03 15:58:35 +01:00
Jack Ha
93137fcc91 Added compatibility mode - old layer view is now also available 2017-01-02 12:56:18 +01:00
Jack Ha
73a8859b0e WIP second slider LayerView 2017-01-02 09:20:27 +01:00
Jack Ha
6271774528 Added all kinds of options to layer view 2016-12-30 15:32:06 +01:00
Jack Ha
fc4c60b0dc Added layer view options 2016-12-30 14:31:53 +01:00
Victor Larchenko
8987aa2048 T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a T466: Added ability to print loaded gcode 2016-12-23 15:53:14 -05:00
Victor Larchenko
333e501268 T466: Removed cube, Changed label, Added clearing of scene 2016-12-23 15:53:13 -05:00
Victor Larchenko
8aa3b1b38c T466: Added basic file loading and parsing 2016-12-23 15:53:12 -05:00
Victor Larchenko
65f3495a29 T466: Added pausing of backend work 2016-12-23 15:53:12 -05:00
Jack Ha
c6d56b60f6 Working quite nicely 2016-12-22 09:44:00 +01:00
Jack Ha
0adb1a4c1c Finally got normals in 2016-12-21 14:37:02 +01:00
fieldOfView
4911eaed00 Fix merge mistakes
CURA-2299
2016-09-19 18:30:23 +02:00
fieldOfView
087ad6f472 Move layerdata and busy handling back into LayerView
This reverts commits 17b12b904809cae093aa59cfdd2e5958978eb6e0 and 66f8a62e6c1cf376ab6fb089a8d4911fc311e4b0.

# Conflicts:
#	plugins/LayerView/LayerPass.py
#	plugins/LayerView/LayerView.py
2016-09-19 17:59:24 +02:00
fieldOfView
7bca6a648a Merge branch 'feature_layerview_ghosts' into ghosts
# Conflicts:
#	plugins/LayerView/LayerView.py
2016-09-19 16:43:17 +02:00
fieldOfView
72b4442320 Show warning in layerview that wireprint display is not accurate
CURA-2288
2016-09-14 08:50:46 +02:00
fieldOfView
c43b277901 Fixed double import
3rd time lucky?
2016-09-13 11:53:46 +02:00
fieldOfView
d907bfb5e3 Fixed copy/paste error 2016-09-13 11:52:18 +02:00
fieldOfView
ebd9332823 Fix imports 2016-09-13 11:49:27 +02:00
fieldOfView
f527da2f3c Add message to layerview about incompatibility with wireprinting
The message is not currently shown yet, but added before the string freeze. CURA-2288
2016-09-13 11:01:26 +02:00
fieldOfView
26a6df4c4d Fix indentation
CURA-1601
2016-09-07 14:02:01 +02:00
fieldOfView
f1b81dfad0 Code style
CURA-1601
2016-09-07 14:02:00 +02:00
fieldOfView
66f8a62e6c Move busy handling into LayerPass and cleanup
CURA-1601
2016-09-07 14:01:59 +02:00
fieldOfView
17b12b9048 Move layer data into LayerPass for cleaner access
CURA-1601
2016-09-07 14:01:58 +02:00
fieldOfView
2c35f0196d Code cleanup
CURA-1601
2016-09-07 14:01:10 +02:00
fieldOfView
b090eab221 Use renderpass to render layers above ghosts
CURA-1601
2016-09-07 14:01:09 +02:00
fieldOfView
90a1f5f8ed Revert "Revert "Show "ghosts" for all objects on the buildplate in layerview""
This reverts commit 0f9b989ae86fa319269a715d960b533f2a51c09d.
2016-09-07 14:01:09 +02:00
fieldOfView
aa689dc2fb Fix layerview for grouped objects
The "ghosts" would be rendered over grouped objects, thereby making them not visible. Note that this quick fix comes at the price of slightly "muddying" all the layerview colors. A better fix was proposed here (but it is not yet working correctly): https://github.com/Ultimaker/Cura/pull/906

CURA-2246
2016-09-01 13:34:18 +02:00
fieldOfView
46ee6c0713 Show "ghosts" for all objects on the buildplate in layerview
Simpler implementation that works.
CURA-1601
2016-08-30 13:27:19 +02:00
fieldOfView
0f9b989ae8 Revert "Show "ghosts" for all objects on the buildplate in layerview"
This reverts commit b765855ba5d3bb96d7113e485e34c4e8b8f3cd49.
2016-08-02 12:30:22 +02:00
fieldOfView
b765855ba5 Show "ghosts" for all objects on the buildplate in layerview
CURA-1601
2016-08-01 17:33:00 +02:00
Jaime van Kessel
102a0793e6 Codestyle & documentation 2016-07-29 17:38:35 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
Jaime van Kessel
8d59d7187f Deleting old toplayer data is now only done when new data is complete.
This prevents the pretty annoying blinking behavior that we had before
2016-07-29 13:01:03 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small.
CURA-1671
2016-07-07 16:23:27 +02:00
Johan Kristensen
41503d7d5b Adapting code to merge of simple_convex_hull and code cleanup. 2016-06-28 23:50:00 +02:00
Johan K
f184baadf0 Formulate layerview logic using numpy to speed up. Also changed layer data packets from engine to make it possible. 2016-06-28 22:29:29 +02:00
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
2016-06-21 14:47:10 +02:00
Thomas Karl Pietrowski
c0472e0068 LayerView: Using resetLayerData()
Currently resetLayerData() is not used at all, but found in two places
the same code like found in resetLayerData().
So replaced them with resetLayerData().
2016-06-10 13:57:52 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00