Merge branch 'master' into feature/multiple-joysticks

data/assets/util/default_keybindings.asset

@@ -192,9 +192,14 @@ asset.onInitialize(function()
     openspace.action.registerAction(action)
     openspace.bindKey(action.Key, action.Identifier)
   end
+
+  -- The take screenshot function is a bit special since we want to bind two keys to that action
+  openspace.bindKey("PRINT_SCREEN", take_screenshot.Identifier)
 end)
 
 asset.onDeinitialize(function ()
+  openspace.clearKey("PRINT_SCREEN")
+
   for _, action in ipairs(Actions) do
     openspace.action.removeAction(action.Identifier)
     openspace.clearKey(action.Key)

data/assets/util/webgui.asset

@@ -3,7 +3,7 @@ asset.require('./static_server')
 local guiCustomization = asset.require('customization/gui')
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "913fe364fcd3baa314351dc4e332f9a1bdb340f0"
+local frontendHash = "4fe18eea379c8493dbcb2cea6798d09a85819912"
 local dataProvider = "data.openspaceproject.com/files/webgui"
 
 local frontend = asset.syncedResource({

data/tasks/exoplanets/datapreparation.task

@@ -1,11 +1,11 @@
-local dataFolder = "D:/dev/exoplanets data config"
+local dataFolder = "D:/data/prepared_exoplanets_data"
 return {
   {
     Type = "ExoplanetsDataPreparationTask",
 
-    InputDataFile = dataFolder .. "/exoplanets_data_composite.csv",
-    InputSPECK = "${SYNC}/http/digitaluniverse_exoplanets_speck/1/expl.speck",
-    TeffToBvFile = "${SYNC}/http/exoplanets_data/1/teff_bv.txt",
+    InputDataFile = "${DATA}/tasks/exoplanets/downloaded_exo_data.csv",
+    InputSPECK = "${SYNC}/http/digitaluniverse_exoplanets_speck/2/expl.speck",
+    TeffToBvFile = "${SYNC}/http/exoplanets_data/2/teff_bv.txt",
     OutputBIN = dataFolder .. "/exoplanets_data.bin",
     OutputLUT = dataFolder .. "/lookup.txt"
   }

data/tasks/exoplanets/downloadexodata.py

@@ -0,0 +1,39 @@
+##
+# Download most recent exoplanet data from NASA Exoplanet Archive using the TAP service
+# More info at: https://exoplanetarchive.ipac.caltech.edu/docs/TAP/usingTAP.html 
+#
+# The data table is the Planetary Systems Composite dataset, where multiple sources have 
+# been combined into one row per planet. 
+# https://exoplanetarchive.ipac.caltech.edu/cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
+#
+# The script downloads the columns needed for the visualization in OpenSpace and for the 
+# exoplanets datapreparation task, but more columns can be added if needed. 
+##
+
+import pandas as pd
+
+dataFileName = 'downloaded_exo_data.csv'
+
+# The columns we need for the visualization in OpenSpace
+columns = 'pl_name,hostname,pl_letter,sy_snum,sy_pnum,pl_orbsmax,pl_orbsmaxerr1,pl_orbsmaxerr2,' \
+          'pl_orbeccen,pl_orbeccenerr1,pl_orbeccenerr2,pl_orbincl,pl_orbinclerr1,pl_orbinclerr2,' \
+          'pl_orblper,pl_orblpererr1,pl_orblpererr2,pl_orbper,pl_orbpererr1,pl_orbpererr2,' \
+          'pl_radj,pl_radjerr1,pl_radjerr2,pl_tranmid,pl_tranmiderr1,pl_tranmiderr2,ra,dec,' \
+          'sy_dist,st_rad,st_raderr1,st_raderr2,st_teff,st_tefferr1,st_tefferr2,' \
+          'st_lum,st_lumerr1,st_lumerr2,cb_flag,disc_year'
+
+# This may contain any extra conditions that one might want to fulfill. Start with a '+' sign
+where = ''
+
+###
+## Download and save csv file
+print("Downloading all confirmed planets from NExSci's Exoplanets Archive... (Planetary Systems Composite Data table)")
+
+NEW_API = 'https://exoplanetarchive.ipac.caltech.edu/TAP/sync?query='
+url = NEW_API + 'select+' + columns + '+from+pscomppars' + where + '&format=csv'
+print(url)
+df = pd.read_csv(url)
+
+print("Writing data to file...")
+df.to_csv(dataFileName)
+print("Done!")