mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 15:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the SelectionProperty

Browse Source
This commit is contained in:
Alexander Bock
2014-12-04 23:04:54 +01:00
parent 4ba81a5d6c
commit 08378888a6
2 changed files with 156 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/properties/selectionproperty.h
+38 -4
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPTIONPROPERTY_H__
#define __OPTIONPROPERTY_H__
#ifndef __SELECTIONPROPERTY_H__
#define __SELECTIONPROPERTY_H__
#include <openspace/properties/scalarproperty.h>
@@ -32,9 +32,43 @@
namespace openspace {
namespace properties {
REGISTER_TEMPLATEPROPERTY_HEADER(SelectionProperty, std::vector<int>);
//REGISTER_TEMPLATEPROPERTY_HEADER(SelectionProperty, std::vector<int>);
class SelectionProperty : public TemplateProperty<std::vector<int>> {
public:
struct Option {
int value;
std::string description;
};
SelectionProperty(std::string identifier, std::string guiName);
void addOption(Option option);
const std::vector<Option>& options() const;
void setValue(std::vector<int> value) override;
private:
/// The list of options which have been registered with this OptionProperty
std::vector<Option> _options;
std::vector<int> _values;
};
template <>
std::string PropertyDelegate<TemplateProperty<std::vector<int>>>::className();
template <>
template <>
std::vector<int> PropertyDelegate<TemplateProperty<std::vector<int>>>::fromLuaValue(lua_State* state, bool& success);
template <>
template <>
bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toLuaValue(lua_State* state, std::vector<int> value);
template <>
int PropertyDelegate<TemplateProperty<std::vector<int>>>::typeLua();
} // namespace properties
} // namespace openspace
#endif // __STRINGPROPERTY_H__
#endif // __SELECTIONPROPERTY_H__