Rename None to Hidden, to avoid collision with X11 and reset data path

This commit is contained in:
Emil Axelsson
2017-03-06 10:33:18 +01:00
parent dcc9d6228d
commit 0cdceddeee
3 changed files with 4 additions and 4 deletions

View File

@@ -64,13 +64,13 @@ class Property {
public:
/**
* The visibility classes for Property%s. The classes are strictly ordered as
* All > Developer > User > None
* All > Developer > User > Hidden
*/
enum class Visibility {
All = 3, ///< Visible for all types, no matter what
Developer = 2, ///< Visible in Developer mode
User = 1, ///< Visible in User mode
None = 0 ///< Never visible
Hidden = 0 ///< Never visible
};
/**

View File

@@ -36,7 +36,7 @@ return {
SGCT = "${BASE_PATH}/config/sgct",
SCRIPTS = "${BASE_PATH}/scripts",
SHADERS = "${BASE_PATH}/shaders",
OPENSPACE_DATA = "${BASE_PATH}/data-minimal",
OPENSPACE_DATA = "${BASE_PATH}/data",
SCENE = "${OPENSPACE_DATA}/scene",
TASKS = "${OPENSPACE_DATA}/tasks",
SPICE = "${OPENSPACE_DATA}/spice",

View File

@@ -193,7 +193,7 @@ std::string Property::generateMetaDataDescription() const {
{ Visibility::All, "All" },
{ Visibility::Developer, "Developer" },
{ Visibility::User, "User" },
{ Visibility::None, "None" }
{ Visibility::Hidden, "Hidden" }
};
Visibility visibility = _metaData.value<Visibility>(MetaDataKeyVisibility);
bool isReadOnly = _metaData.value<bool>(MetaDataKeyReadOnly);