Commit Graph

64 Commits

Author SHA1 Message Date
Alexander Bock
9fb7814145 Add visibility toggle to Property base class
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Sebastian Piwell
db375d310e Update kameleonlpane when sliding 2016-06-15 13:42:26 -04:00
Michael Nilsson
db9af4c886 abstracted cygnet properties to DataCygnet 2016-06-10 16:57:55 -04:00
Sebastian Piwell
39f083c342 Every datacygnet uses own dimensions 2016-06-10 15:19:32 -04:00
Sebastian Piwell
4ae4ecca3c Auto filter at start 2016-06-03 14:16:15 -04:00
Sebastian Piwell
e3dae7abc3 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-03 13:43:01 -04:00
Sebastian Piwell
8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Michael Nilsson
dbe9066829 removed shared_ptr from group events. 2016-06-03 12:44:18 -04:00
Michael Nilsson
e694be248f solve merge conflict in kameleonplane 2016-06-03 09:20:27 -04:00
Michael Nilsson
c05b417519 refactor kameleonplane 2016-06-02 18:00:26 -04:00
Sebastian Piwell
a4f9789dd9 Transfer function bug fix 2016-06-02 17:06:41 -04:00
Sebastian Piwell
41299f17f7 Improved multiple transfer functions 2016-06-02 16:56:25 -04:00
Sebastian Piwell
d788e31334 Change resolution and cdf file in KameleonPlane 2016-06-02 16:25:11 -04:00
Michael Nilsson
7401595e93 refactor filloptions in kameleonplane, merge conflict 2016-06-02 09:45:14 -04:00
Sebastian Piwell
a00e29d987 Merge fix 2016-06-01 16:55:20 -04:00
Sebastian Piwell
bba419fcf1 IswaKameleonGroup 2016-06-01 15:08:29 -04:00
Sebastian Piwell
27a046d81d IswaDataGroup 2016-06-01 14:40:00 -04:00
Michael Nilsson
cb601042a6 solve merge conflict 2016-06-01 14:03:39 -04:00
Michael Nilsson
f029362372 refactor datasphere 2016-06-01 13:19:45 -04:00
Sebastian Piwell
876c86ca75 Merge fix 2016-06-01 12:09:58 -04:00
Sebastian Piwell
d33121d07c New dataprocessor classes works with IswaGroup 2016-06-01 11:50:26 -04:00
Michael Nilsson
e8238859f8 refactor cygnetplane and dataplane 2016-05-31 17:54:39 -04:00
Sebastian Piwell
1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Alexander Bock
88db25e868 Windows compile fix 2016-05-31 18:51:57 +02:00
Michael Nilsson
627d31a5b2 refactor textureplane and cygnetplane 2016-05-27 16:50:01 -04:00
Sebastian Piwell
95dd221f84 Fix crash when cygnet has no group 2016-05-26 15:53:44 -04:00
Sebastian Piwell
6f6e016602 No more unique option names 2016-05-26 13:09:08 -04:00
Sebastian Piwell
0e3749fcf9 Small bug fixes 2016-05-26 09:49:24 -04:00
Sebastian Piwell
ba2737d554 Merge fix 2016-05-25 14:47:25 -04:00
Sebastian Piwell
2830708112 Fieldlines in IswaGroup 2016-05-25 14:18:16 -04:00
Michael Nilsson
88c006b361 add initializeGroup function to iswaCygnet 2016-05-24 17:33:06 -04:00
Michael Nilsson
e24944675e remove excess code 2016-05-24 17:08:22 -04:00
Michael Nilsson
b8c093c411 bugfix for adding iswacygnet without group 2016-05-24 16:47:01 -04:00
Sebastian Piwell
b3d5d41ca6 Auto filter property 2016-05-24 16:00:18 -04:00
Sebastian Piwell
813a68c85f Alpha and group name first 2016-05-24 15:35:34 -04:00
Michael Nilsson
8f6bc7d418 solve merge conflict 2016-05-24 14:10:37 -04:00
Michael Nilsson
8633bc8522 refactoring, using pubsub pattern for groups 2016-05-24 14:02:42 -04:00
Sebastian Piwell
e3c1093310 Read cdf list 2016-05-23 17:24:46 -04:00
Sebastian Piwell
fb5b260b8f Fix for variable resolution for KameleonPlane 2016-05-23 11:19:54 -04:00
Sebastian Piwell
5b9813c817 Don't load all Histograms at startup for KameleonPlane 2016-05-23 11:08:12 -04:00
Sebastian Piwell
1d8c77ee3b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-20 16:46:41 -04:00
Sebastian Piwell
c983ecfb89 Histogram eq with group dataprocessor 2016-05-20 16:46:33 -04:00
Michael Nilsson
0ccc48d1c3 windows fix 2016-05-20 14:18:49 -04:00
Sebastian Piwell
57cd44535d IswaGroup has own dataProcessor 2016-05-20 12:48:48 -04:00
Sebastian Piwell
672933cd05 Choose slice of kameleonPlane 2016-05-19 15:14:11 -04:00
Sebastian Piwell
0d54a24891 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-19 14:05:18 -04:00
Sebastian Piwell
bb2da4dd2a Choose resolution of KameleonPlane 2016-05-19 14:05:13 -04:00
Michael Nilsson
cd5431cb33 add try catch around json parse in kameleonwrapper, add doc comments to methods 2016-05-19 11:23:01 -04:00
Sebastian Piwell
91b159cb74 Merge fix 2016-05-19 11:16:46 -04:00