mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

ListProperties and SelectionProperty (#1558)

Browse Source 
* Reimplement stringlistproperty with a listproperty parent class

* Add string list property tests and structure test files

* Reimplement SelectionProperty and add tests

* Some TemplateProperty documentation updates

* Read full constellation name and not just first word for ConstallationSelection

* Remove support for setting property value from string (unused)

* Add IntListProperty, DoubleListProperty

* Bug fix: SetProperty topic now support empty json objects

* Imgui renderings for list properties and pass SelectionProperty  info to WebGui
This commit is contained in:
Emma Broman
2021-04-19 16:10:36 +02:00
committed by GitHub
parent b00fcb78df
commit 91387d8401
83 changed files with 1451 additions and 1484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/volume/transferfunctionproperty.cpp
View File

@@ -38,12 +38,6 @@ bool toLuaConversion(lua_State* state, openspace::volume::TransferFunction value
return value.envelopesToLua(state);
}
openspace::volume::TransferFunction fromStringConversion(std::string val, bool& success) {
openspace::volume::TransferFunction tf;
success = tf.setEnvelopesFromString(val);
return tf;
}
bool toStringConversion(std::string& outValue,
openspace::volume::TransferFunction inValue)
{
@@ -59,7 +53,6 @@ REGISTER_TEMPLATEPROPERTY_SOURCE(TransferFunctionProperty, volume::TransferFunct
volume::TransferFunction(),
fromLuaConversion,
toLuaConversion,
fromStringConversion,
toStringConversion,
LUA_TTABLE
)