Commit Graph

210 Commits

Author SHA1 Message Date
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 4056cbb160 linux fix 2016-05-20 15:08:00 -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
Sebastian Piwell e3c7624605 Read cdf slice of any axis 2016-05-19 10:55:59 -04:00
Michael Nilsson 8306df2618 solve merge conflict 2016-05-19 10:11:50 -04:00
Michael Nilsson b7343398d0 fieldlines selection added to kamelionplane 2016-05-19 10:08:51 -04:00
Sebastian Piwell 100a1e8749 Process Kameleon data 2016-05-18 15:06:35 -04:00
Sebastian Piwell 9387e6d993 Fill option function 2016-05-18 14:44:16 -04:00
Sebastian Piwell 19c301f769 Options to Kameleonplane 2016-05-18 14:26:29 -04:00
Sebastian Piwell f5b33158bd Add KameleonPlanes again 2016-05-18 11:10:04 -04:00
Sebastian Piwell 093d265dff Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-18 09:33:43 -04:00
Michael Nilsson c3a8bb9bde Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-17 17:22:00 -04:00
Michael Nilsson 2af533e6fe fetchFile in downloadmanager will fail when response status is 400 or above 2016-05-17 17:21:46 -04:00
Sebastian Piwell cd35cea0ee Updated Kameleon plane 2016-05-17 17:18:09 -04:00
Sebastian Piwell ff39239b0f Auto filter of 'background' 2016-05-17 16:11:57 -04:00
Sebastian Piwell 6c37ab289a Group name instead of id 2016-05-17 13:25:57 -04:00
Sebastian Piwell 562a986a43 Real Radius on Ionosphere 2016-05-16 17:31:12 -04:00
Sebastian Piwell 4f9c969e4e Merge fix 2016-05-16 15:26:43 -04:00
Sebastian Piwell 1184240b2b Transfer function and texture fix 2016-05-16 15:21:25 -04:00
Michael Nilsson b3164d6a8b removed commented code 2016-05-16 14:34:10 -04:00
Michael Nilsson ace6a91301 fetch ionosphere date from localhost - solve merge conflict 2016-05-16 14:27:17 -04:00
Sebastian Piwell 24d7832c40 Removed couts 2016-05-16 13:55:42 -04:00
Sebastian Piwell 8cd0a5d50a Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-16 13:36:37 -04:00
Sebastian Piwell 2a236bca77 Read ionosphere data from json file 2016-05-16 13:36:25 -04:00
Michael Nilsson f41bf3e424 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-13 15:32:51 -04:00
Michael Nilsson ece7519b8f solve merge conflict 2016-05-13 15:32:30 -04:00
Sebastian Piwell 88dca0d6c0 Ionosphere test data 2016-05-13 15:22:50 -04:00
Michael Nilsson d37de2e582 moved histogram stuff to Histogram class, fixed miscalculated standard deviation 2016-05-13 15:16:43 -04:00
Sebastian Piwell fec15357e8 Moved function body 2016-05-13 14:29:25 -04:00
Sebastian Piwell 1eb0d47fad DataProcessor class 2016-05-13 14:17:42 -04:00
Sebastian Piwell c81078682d Solved iSWA name problem 2016-05-13 11:00:50 -04:00
Sebastian Piwell 05fa58c39b Delete ScreenSpaceCygnet with lua script 2016-05-13 10:39:26 -04:00
Sebastian Piwell 489b7bbcd2 Clean up 2016-05-13 10:20:51 -04:00
Sebastian Piwell 581002175c IswaManager loads cygnet info 2016-05-12 18:49:16 -04:00
Sebastian Piwell 03de689de3 Use update time for ScreenSpaceCygnet from json 2016-05-12 17:40:15 -04:00
Sebastian Piwell e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Sebastian Piwell c5fa1891b6 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-09 13:10:06 -04:00
Sebastian Piwell 39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Michael Nilsson 2b541127fa Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-09 11:24:33 -04:00
Michael Nilsson 279d85f0c2 windows fix 2016-05-09 11:24:05 -04:00
Michael Nilsson 819b227976 bugfix, reset dataBuffer in DataPlane before append new data 2016-05-09 09:09:47 -04:00
Michael Nilsson ab62eaada5 solve merge conflict 2016-05-06 17:06:09 -04:00
Michael Nilsson f2b802b317 MemoryFile har now char pointer and size instead of string 2016-05-06 16:39:24 -04:00