Commit Graph

3928 Commits

Author SHA1 Message Date
Ylva Selling f6e4c33db3 Set the FOV with respect to the image's zoom level 2021-04-13 15:54:38 +02:00
Ylva Selling 7e81a05bf0 Make target move to look at image coordinate when clicked in GUI 2021-04-13 15:42:51 +02:00
Ylva Selling fadf20435d Move conversion function to target and add some utility functions to target and browser 2021-04-09 15:04:19 +02:00
Ylva Selling 03cb84c0e2 Add amount of data to Image and make image sending process more efficient 2021-04-09 15:03:18 +02:00
Ylva Selling 4e358fe122 Restructure code for parsing xml to make it more readable 2021-04-08 11:18:23 +02:00
Ylva Selling a84e8ee48b Bugfix for parsing the xml. Now all images (only with non-empty urls though) are loaded. 2021-04-08 09:58:47 +02:00
Ylva Selling 67a39652d5 Make it possible to select images in GUI and thereby loading them into WWT, and bugfix for parsing xml 2021-04-08 09:35:46 +02:00
Ylva Selling 3f68ea9b4d Send over image name and url to GUI api 2021-04-07 16:15:19 +02:00
Ylva Selling 794902d5cb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-04-06 15:11:25 +02:00
Ylva Selling b8d1c33eed Add Lua function to send the image thumbnail url:s to the api 2021-04-06 15:11:14 +02:00
Ester Lindgren d74de3273b Merge with master 2021-04-06 09:01:48 +02:00
Ester Lindgren ba0685227f Merge branch 'master' into thesis/2021/skybrowser 2021-04-06 08:52:11 +02:00
Ester Lindgren 8ffee81e64 Merge resolve 2021-04-06 08:48:37 +02:00
Ester Lindgren c234b69436 Add function to drag and change view within browser 2021-04-06 08:44:42 +02:00
Ylva Selling f99f3e88a9 Move the WWT data handling to class WWTDataHandler and add pointer in module 2021-03-31 17:03:30 +02:00
Ylva Selling b95d6e5b94 Change rapidxmlparser to tinyxml2 and add more extensive xml parsing and image loading 2021-03-31 16:41:38 +02:00
Alexander Bock d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Ylva Selling b88d58edbb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-30 08:31:20 +02:00
Ylva Selling d4e944f73f Add webgui to cmake include dependencies 2021-03-30 08:29:57 +02:00
Ylva Selling ec138b6897 Add function to save URL to file, parse to XML tree and insert into vector as images 2021-03-30 08:28:32 +02:00
Ylva Selling 0b85180bb5 Add rapid xml parser 2021-03-30 08:24:22 +02:00
Alexander Bock 612b9bbc7f Moving more documentation to use codegen (#1549)
- Make use of more codegen in more classes
- Fix verifier for Color4Verifier
2021-03-29 21:50:26 +02:00
Alexander Bock 797ddf7daf Fix some warnings on AppleClang 2021-03-29 14:58:19 +02:00
Ester Lindgren 19aa6895fd Set fixed width of square target border 2021-03-29 09:57:55 +02:00
Ylva Selling d72080b2f6 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-29 08:27:53 +02:00
Ylva Selling bb5042cd50 Create functions to display WWT images 2021-03-29 08:27:40 +02:00
Alexander Bock e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Alexander Bock a6bb8cdecb Split DashboardTextItem from DashboardItem 2021-03-24 17:46:13 +01:00
Ester Lindgren 7ec1da10f1 Merge resolve 2021-03-23 17:07:00 +01:00
Ester Lindgren 18e5916a04 Set the crosshair of target to have fixed linewidth 2021-03-23 16:46:52 +01:00
Ylva Selling 74609230b6 Make browser and target highlight when the mouse is hovering on them 2021-03-23 15:01:40 +01:00
Emma Broman 0ea0e781da Prevent crash when reloading renderable that only has labels and no data
Occurred when unchecking and rechecking the "Draw elements" property for example the "Eclipltic Sphere Labels"
2021-03-23 11:40:34 +01:00
Ylva Selling 6ff0e6475a Ensure target and browser always are visible together by using the enabled flag 2021-03-23 09:51:15 +01:00
Ylva Selling fbc05244e1 Make it possible to add many browsers and targets by moving functionality to ScreenSpaceRenderable 2021-03-23 09:44:14 +01:00
Ylva Selling ac275140c5 Load browser and target as assets 2021-03-22 13:54:01 +01:00
Ylva Selling 51f40172f7 Move browser specific functionality to screenspacebrowser 2021-03-22 09:57:49 +01:00
Ylva Selling 39b1887e14 Merge resolve 2021-03-19 15:14:12 +01:00
Ester Lindgren b17bb82359 Change target to crosshair in relation to field of view 2021-03-19 14:43:55 +01:00
Ylva Selling ac105178c8 Add scale function to screenspacetarget 2021-03-19 14:42:11 +01:00
Ylva Selling d2d6899e7a Add draft for creating the browser and target from GUI. Still problem with finding browser after creation 2021-03-19 13:52:21 +01:00
Ylva Selling e463e35e1b Fix bug with target having flipped y-axis 2021-03-19 11:26:39 +01:00
Ylva Selling 65c3de6c86 Merge resolve fix 2021-03-19 11:08:37 +01:00
Ester Lindgren 543e3641ab Set target dimensions from browser dimensions 2021-03-19 09:57:14 +01:00
Ylva Selling ac4fc926a2 Add function to create browser 2021-03-19 09:37:19 +01:00
Ylva Selling 3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +01:00
Ylva Selling e0559f85b9 Merge branch 'master' into thesis/2021/skybrowser 2021-03-18 09:35:56 +01:00
Ylva Selling 707027664f Merge resolve 2021-03-18 09:35:00 +01:00
Ylva Selling c05f8a4e87 Add working resize and dragging functionality 2021-03-18 09:33:34 +01:00
Alexander Bock e2c1414ba6 Update to newest codegen, replace std::monostate with ghoul::Dictionary 2021-03-17 21:26:57 +01:00
Emma Broman 20519d007b Remove hardcoded path to B-V colormap (#1531)
Also prevent future problems in reading the file (e.g. if number of lines of comments would change)
2021-03-15 13:22:41 +01:00