mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added module property class that will toggle the discovery method modes

Browse Source
This commit is contained in:
KarRei
2018-05-30 14:34:46 -04:00
parent e0f4afa9f6
commit 3defbe6f7f
5 changed files with 121 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/exoplanets/CMakeLists.txt
View File

@@ -28,6 +28,7 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/exoplanetsmodule.h
${CMAKE_CURRENT_SOURCE_DIR}/tasks/exoplanetscsvtobintask.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitdisc.h
${CMAKE_CURRENT_SOURCE_DIR}/discoverymethods/discoverymethods.h
)
source_group("Header Files" FILES ${HEADER_FILES})
@@ -35,6 +36,7 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/exoplanetsmodule.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tasks/exoplanetscsvtobintask.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitdisc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/discoverymethods/discoverymethods.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})

63
modules/exoplanets/discoverymethods/discoverymethods.cpp Normal file
View File

@@ -0,0 +1,63 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2018 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/exoplanets/discoverymethods/discoverymethods.h>
#include <modules/exoplanets/exoplanetsmodule.h>
#include <openspace/documentation/documentation.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/scripting/scriptengine.h>
namespace {
constexpr const char* _loggerCat = "DiscoveryMethods";
static const openspace::properties::Property::PropertyInfo TransitMethodInfo = {
"TransitMethod",
"Show transit method",
"Change the view so that the transit method can be presented."
};
static const openspace::properties::Property::PropertyInfo DopplerMethodInfo = {
"DopplerMethod",
"Show doppler method",
"Change the view so that the doppler method can be presented."
};
} // namespace
namespace openspace::exoplanets{
DiscoveryMethods::DiscoveryMethods()
: PropertyOwner({ "DiscoveryMethods" })
, _showTransit(TransitMethodInfo, false)
, _showDoppler(DopplerMethodInfo, false)
{
addProperty(_showTransit);
addProperty(_showDoppler);
_showTransit.onChange([&]() { LINFO("transit"); });
_showDoppler.onChange([&]() { LINFO("doppler"); });
}
} // namespce

46
modules/exoplanets/discoverymethods/discoverymethods.h Normal file
View File

@@ -0,0 +1,46 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2018 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_EXOPLANETS___DISCOVERY_METHODS___H__
#define __OPENSPACE_MODULE_EXOPLANETS___DISCOVERY_METHODS___H__
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalar/boolproperty.h>
namespace openspace::exoplanets {
class DiscoveryMethods : public properties::PropertyOwner {
public:
DiscoveryMethods();
private:
properties::BoolProperty _showTransit;
properties::BoolProperty _showDoppler;
};
} // namespace
#endif // __OPENSPACE_MODULE_EXOPLANETS___TRANSIT_METHOD___H__

5
modules/exoplanets/exoplanetsmodule.cpp
View File

@@ -70,6 +70,11 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary&) {
ghoul_assert(fTask, "No task factory existed");
fTask->registerClass<ExoplanetsCsvToBinTask>("ExoplanetsCsvToBinTask");
fRenderable->registerClass<RenderableOrbitdisc>("RenderableOrbitdisc");
OsEng.registerModuleCallback(OpenSpaceEngine::CallbackOption::Initialize, [&] {
_discoveryMethods = std::make_unique<openspace::exoplanets::DiscoveryMethods>();
addPropertySubOwner(*_discoveryMethods);
});
}
std::vector<documentation::Documentation> ExoplanetsModule::documentations() const {

5
modules/exoplanets/exoplanetsmodule.h
View File

@@ -25,9 +25,13 @@
#ifndef __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSMODULE___H__
#define __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSMODULE___H__
#include <openspace/util/openspacemodule.h>
#include <openspace/documentation/documentation.h>
#include <modules/exoplanets/discoverymethods/discoverymethods.h>
namespace openspace {
class ExoplanetsModule : public OpenSpaceModule {
@@ -43,6 +47,7 @@ public:
protected:
void internalInitialize(const ghoul::Dictionary&) override;
std::unique_ptr<openspace::exoplanets::DiscoveryMethods> _discoveryMethods;
};