Commit Graph

1095 Commits

Author SHA1 Message Date
Alexander Bock
0f72d5ddda Updated timeline application stylesheet and colors 2015-05-08 16:39:28 +02:00
Alexander Bock
db05279a35 Added style sheet to timeline application
Fixed various layout issues
2015-05-08 15:40:03 +02:00
Alexander Bock
16ed2f0d5d Removed LuaScriptExternalControl
Prepared Timeline View for Stylesheets
2015-05-08 01:13:13 +02:00
Alexander Bock
b93aa9c80d Set OpenSpace version string to prerelease-5
Only handle status messages in timeline application if playbooks are received
2015-05-07 23:40:31 +02:00
Alexander Bock
9188e59ded Merge branch 'feature/timelinegui' into develop 2015-05-07 22:30:15 +02:00
Alexander Bock
a8d97089e5 Write HTML log on default 2015-05-07 22:29:59 +02:00
Alexander Bock
f5e6d8cf1c Updated color mapping for Instruments
Updated playbook parsing
2015-05-07 22:29:38 +02:00
Alexander Bock
3352cd90f4 Updated layout of timeline application
Added userdefined instrument names
Added button to set focus to next target
2015-05-07 21:02:19 +02:00
Alexander Bock
157be78ab9 Add capabilities for multiple parsers into the timeline gui
Fix delta time controller
2015-05-07 18:27:18 +02:00
Alexander Bock
1177e4e4cf Restructure parsers, send label parser information to GUI application 2015-05-07 18:26:23 +02:00
Alexander Bock
dac1f213b5 Fix instrumenttimes in labelparser 2015-05-07 17:42:37 +02:00
Alexander Bock
b2fcbe4fb0 Adding final keyword 2015-05-07 17:30:36 +02:00
Alexander Bock
b536c5c32f Merge branch 'develop' into feature/parser 2015-05-07 17:27:28 +02:00
Michal Marcinkowski
e0fedb203d Merge branch 'develop' into NewHorizonsMerge 2015-05-05 20:33:52 -04:00
Michal Marcinkowski
15cb4e0a3a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-05 20:24:56 -04:00
Michal Marcinkowski
665d832454 optimization for projections 2015-05-05 20:19:19 -04:00
Alexander Bock
e1c87a49ed Redesign parser 2015-05-05 21:43:46 +02:00
Alexander Bock
9150e52327 Updated openspace-data 2015-05-05 19:43:54 +02:00
Alexander Bock
33bc1733b6 Make time control in timeline view non-linear 2015-05-05 19:41:31 +02:00
Alexander Bock
02eaf6e7b9 Replaced asserts with ghoul_asserts 2015-05-05 17:57:18 +02:00
Alexander Bock
23a3950215 Fixing issue with linux 2015-05-05 17:46:51 +02:00
Alexander Bock
b35edde94a Fixing issue with linux 2015-05-05 17:40:01 +02:00
Alexander Bock
e33c250bfc Fixing issue with linux 2015-05-05 17:33:48 +02:00
Alexander Bock
dfca315293 Fixing issue with linux 2015-05-05 17:29:12 +02:00
Alexander Bock
0d11e6e2f8 Fixing issue with linux 2015-05-05 17:23:41 +02:00
Alexander Bock
b458e6c0f9 Yet another linux fix 2015-05-05 17:12:24 +02:00
Alexander Bock
335571879d Fixing bug in linux with va_arg macros 2015-05-05 15:56:10 +02:00
Alexander Bock
b79acb1501 Fixing variable names to fix linux compile error 2015-05-05 15:45:00 +02:00
Alexander Bock
4b9c5a9de6 Linux compile fix with ImageSequencer2 2015-05-05 14:40:47 +02:00
Alexander Bock
47af7a5270 Disabling the GUI applications on default, added possibility to enable them with a switch
Added additional check into the model loader to guard against empty models
2015-05-05 14:37:24 +02:00
Alexander Bock
74a15338ff Merge branch 'feature/timelinegui' into develop 2015-05-05 14:22:56 +02:00
Alexander Bock
5b1ab8b692 Fix crash when changing coordinate system origin to Pluto 2015-05-05 14:10:37 +02:00
Alexander Bock
0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui
Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp
2015-05-05 11:42:49 +02:00
Alexander Bock
2f5114fe2d More changes in timelinegui; show images even if start time and end time are outside the viewing frame 2015-05-05 10:58:10 +02:00
Michal Marcinkowski
f6d382f9f9 Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge
Conflicts:
	src/rendering/renderengine.cpp
2015-05-04 20:27:52 -04:00
Michal Marcinkowski
0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Anton Arbring
f8d6f42f44 Default startup + renderengine fixes
Added interesting times for Dawn and Rosetta in default startup script.
Fixed coordinate system switch to Vesta, commented for demo but needed for
development.
2015-05-04 19:52:56 -04:00
Anton Arbring
17064a92d5 Modifying labelparser and imagesequencer2
For extension to handling other instruments than lorri
2015-05-04 19:40:08 -04:00
Anton Arbring
d495778d4a Restored some changes lost in merge + "timedots"
Added impact on trails from start/stoptime definitions in modfile.
Added dots of equal time in trails, no progress on printing the time
string.
2015-05-04 19:30:57 -04:00
Anton Arbring
a993dfb42f Storing frame-to-body relationship
Store frames for bodies in SpiceManager, still adding "IAU_" if
no frame is added for the body. Adding frames in renderableModel for
67p to get proper inertial frame.
2015-05-04 19:20:14 -04:00
Alexander Bock
fde0d10199 Fix error with instrument transmission over the network 2015-05-04 18:31:17 +02:00
Alexander Bock
4451bbe920 More work on timeline application
Only showing the images that are inside of the timeline
Disabling all widgets when no connection is established
2015-05-04 17:29:18 +02:00
Alexander Bock
5704c8dcf6 Show the target of an instrument in the timeline view 2015-05-04 11:56:21 +02:00
Alexander Bock
314ce645f6 Fix a bug where OpenSpace would crash when too many field of views are generated 2015-05-04 11:55:53 +02:00
Alexander Bock
810480d5d8 Enable focus node change
Show instruments
2015-05-04 10:02:47 +02:00
Alexander Bock
14270b316e Bugfix fixing a crash with rendering
Started rendering of image data
2015-05-03 13:52:55 +02:00
Alexander Bock
d89760c9e9 More changes on TimelineView 2015-05-03 00:14:17 +02:00
Alexander Bock
9a76f37573 Fix crashes with focus node change when view and camera vectors were almost the same but not equal
Fix crash when moving to time without any images
2015-05-03 00:14:01 +02:00
Alexander Bock
8b9165fbfb Added missing files 2015-05-02 22:24:27 +02:00
Alexander Bock
4f8c1e4a14 Added methods to Hongkang parser that publish the results
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00