Commit graph

78 commits

Author SHA1 Message Date
fieldOfView
b0d0d81dc3 Revert "Render ghost behind all objects in layerview"
I did not mean to merge this yet.

This reverts commit 18e1fc59da.
2016-08-30 13:32:33 +02:00
fieldOfView
18e1fc59da Render ghost behind all objects in layerview
CURA-1601
2016-08-30 13:21:58 +02:00
fieldOfView
0f9b989ae8 Revert "Show "ghosts" for all objects on the buildplate in layerview"
This reverts commit b765855ba5.
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
0745b3bbf5 Unbreak LayerView.
CURA-1381
2016-07-11 10:29:21 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue.
CURA-1381
2016-07-07 16:55:56 +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
Arjen Hiemstra
a81cab5eac Merge branch '2.1' 2016-06-04 19:11:59 +02:00
Arjen Hiemstra
070e791b94 Add a preference to change LayerView top layers between 1 and 5
Fixes CURA-1643
2016-06-02 11:23:18 +02:00
Arjen Hiemstra
49e5b1938a Reduce number of top layer to increase processing speed 2016-06-01 15:45:54 +02:00
Arjen Hiemstra
ea5dc00080 Bump LayerView API version to 3
It does not use any setting API so it is safe
2016-05-23 18:21:23 +02:00
Simon Edwards
0b858f3878 Introduced a LayerDataBuilder. Made LayerData immutable just like its superclass. Fixed the layer view which broke.
Contributes to CURA-1504
2016-05-23 09:49:31 +02:00
Simon Edwards
c810c22eb5 Set the default number of layers and current layer to 0. Now the layer view slider is empty while the initial slicing process is running.
Fixes CURA-1273 Layer number doesn't fit
2016-04-28 13:07:57 +02:00
Jaime van Kessel
3ed7d60adb Increased size of the label for layerview a bit more.
CURA-1273
2016-04-04 14:42:42 +02:00
Jaime van Kessel
4ad88f3498 Layerview number is now correctly displayed
CURA-1273y
2016-04-01 14:50:47 +02:00
Thomas-Karl Pietrowski
0b93328aeb Using PyDev compatible tags 2016-03-15 12:52:29 +01:00
Thomas-Karl Pietrowski
7bc99c8c19 Removing unneeded imports and marking unused variable
Not sure whether there is a WIP on the unused variable
2016-03-14 17:18:45 +01:00
Jaime van Kessel
c4c5ba6c22 Top layers are now correctly updated when object is selected
CURA-992
2016-03-03 11:36:28 +01:00
fieldOfView
5cb1e9e2a6 Tweak layer slider appearance 2016-03-03 09:00:52 +01:00
Jaime van Kessel
41d00af345 Moved timer back again, as arjen fixed the real issue 2016-03-01 10:57:29 +01:00
Arjen Hiemstra
3afd3f2209 Use the right style for the layer view slider and add a busy indicator to the current layer field
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
110c3fa754 Do not react to all Scene changes in LayerView but just childrenChanged
When the layer data is updated, a new node is attached to the scene
root. We can thus watch for only children changes since everything else
can be ignored.

Contributes to CURA-938
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
f2d98cfba3 Do not show a message when processing top layers but rather leave it up to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
c684e96ef1 Expose the new busy property to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
e0afc1535a Add a busy property to LayerView that indicates whether we are currently building top layers
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Jaime van Kessel
67d10ef0a2 UpdateTopLayer timer is now only triggered when max layers changes
CURA-969
2016-02-29 15:51:40 +01:00
Arjen Hiemstra
220146b0a9 Also trigger an update of the top layers when recalculating the layer count
Contributes to CURA-938
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
f37b422ccb Display a message when processing the top layers takes a long time
Contributes to CURA-957
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
a60bfa3d32 Perform creation of top solid layers in a background thread
This way we have a much more responsive layer view
2016-02-23 17:53:51 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Jaime van Kessel
01ecd9357c Max size & value are now set in correct order for layerview
CURA-763
2016-02-04 12:14:59 +01:00
Ghostkeeper
0d16fdf3ba Use a uniform-color shader for selection
In layer view, the selection shader is now a uniform-color shader. This shader does not use the vertex colours but makes the entire silhouette the same colour.

Contributes to issue CURA-625.
2016-01-21 14:24:57 +01:00
fieldOfView
a900b02ae8 Added weight to viewmode plugins for sorting in the viewmode 2015-12-30 09:53:25 +01:00
Arjen Hiemstra
435186e6d1 Fix convex hull and layer view rendering 2015-12-14 13:56:32 +01:00
fieldOfView
4d29fccb0b Remove cursorShapes for now 2015-12-03 12:09:30 +01:00
fieldOfView
47c53860fd Add hover cursorShape to open/viewmode buttons and layerslider 2015-12-03 12:09:29 +01:00
fieldOfView
2477617155 Reorient LayerView slider
Fix toolbar tooltip collisions
Refactor use of colors.text_default
2015-12-03 12:09:26 +01:00
fieldOfView
1ba1009b60 Initial theme rework:
* Move buttons around
* Resizing
* Colors
* Splash screen
2015-12-03 12:09:23 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00