mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 19:39:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add new Lua function to load CSV file, utilize new function to correctly load , inside field values (closes #2124)

Browse Source
This commit is contained in:
Alexander Bock
2023-02-28 10:49:23 -07:00
parent 32af3cc675
commit 5b29fb045a
5 changed files with 101 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine/openspaceengine.cpp
View File

@@ -1689,7 +1689,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
codegen::lua::DownloadFile,
codegen::lua::CreateSingleColorImage,
codegen::lua::IsMaster,
codegen::lua::Version
codegen::lua::Version,
codegen::lua::ReadCSVFile
},
{
absPath("${SCRIPTS}/core_scripts.lua")

20
src/engine/openspaceengine_lua.inl
View File

@@ -23,6 +23,7 @@
****************************************************************************************/
#include <openspace/openspace.h>
#include <ghoul/misc/csvreader.h>
namespace {
@@ -206,4 +207,23 @@ namespace {
return res;
}
/**
* Loads the CSV file provided as a parameter and returns it as a vector containing the
* values of the each row. The inner vector has the same number of values as the CSV has
* columns. The second parameter controls whether the first entry in the returned outer
* vector is containing the names of the columns
*/
[[codegen::luawrap]] std::vector<std::vector<std::string>> readCSVFile(
std::filesystem::path file,
bool includeFirstLine = false)
{
if (!std::filesystem::exists(file) || !std::filesystem::is_regular_file(file)) {
throw ghoul::lua::LuaError(fmt::format("Could not find file {}", file));
}
std::vector<std::vector<std::string>> res =
ghoul::loadCSVFile(file.string(), includeFirstLine);
return res;
}
#include "openspaceengine_lua_codegen.cpp"