mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
parent df259f6d02 255f187052
commit d4278f9adc
210 changed files with 5201 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgui/src/renderproperties.cpp
+70 -45
View File
@@ -40,13 +40,14 @@
#include <ghoul/misc/misc.h>
#include <glm/gtx/component_wise.hpp>
#include <imgui_internal.h>
namespace openspace {
using namespace properties;
void renderTooltip(Property* prop) {
if (ImGui::IsItemHovered()) {
void renderTooltip(Property* prop, double delay) {
if (ImGui::IsItemHovered() && (GImGui->HoveredIdTimer > delay)) {
ImGui::BeginTooltip();
if (!prop->description().empty()) {
ImGui::TextWrapped("%s", prop->description().c_str());
@@ -90,7 +91,8 @@ void executeScript(const std::string& id, const std::string& value,
}
void renderBoolProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
BoolProperty* p = static_cast<BoolProperty*>(prop);
@@ -100,7 +102,7 @@ void renderBoolProperty(Property* prop, const std::string& ownerName,
BoolProperty::ValueType value = *p;
ImGui::Checkbox(name.c_str(), &value);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -110,7 +112,8 @@ void renderBoolProperty(Property* prop, const std::string& ownerName,
}
void renderOptionProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
OptionProperty* p = static_cast<OptionProperty*>(prop);
@@ -128,7 +131,7 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
for (const OptionProperty::Option& o : options) {
ImGui::RadioButton(o.description.c_str(), &value, o.value);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
}
ImGui::Separator();
@@ -153,6 +156,9 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
int oldIdx = idx;
ImGui::Combo(name.c_str(), &idx, nodeNames.c_str());
if (showTooltip) {
renderTooltip(prop, tooltipDelay);
}
if (idx != oldIdx) {
value = options[idx].value;
@@ -168,7 +174,8 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
}
void renderSelectionProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
SelectionProperty* p = static_cast<SelectionProperty*>(prop);
@@ -189,7 +196,7 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
ImGui::Checkbox(description.c_str(), &selected);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (selected) {
@@ -211,7 +218,8 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
}
void renderStringProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
StringProperty* p = static_cast<StringProperty*>(prop);
@@ -234,7 +242,7 @@ void renderStringProperty(Property* prop, const std::string& ownerName,
ImGuiInputTextFlags_EnterReturnsTrue
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (hasNewValue) {
@@ -249,7 +257,8 @@ void renderStringProperty(Property* prop, const std::string& ownerName,
}
void renderStringListProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
StringListProperty* p = static_cast<StringListProperty*>(prop);
@@ -274,7 +283,7 @@ void renderStringListProperty(Property* prop, const std::string& ownerName,
ImGuiInputTextFlags_EnterReturnsTrue
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (hasNewValue) {
@@ -287,7 +296,7 @@ void renderStringListProperty(Property* prop, const std::string& ownerName,
}
}
script += "}";
executeScript(
p->fullyQualifiedIdentifier(),
std::move(script),
@@ -299,7 +308,8 @@ void renderStringListProperty(Property* prop, const std::string& ownerName,
}
void renderDoubleProperty(properties::Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DoubleProperty* p = static_cast<DoubleProperty*>(prop);
@@ -312,7 +322,7 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
ImGui::SliderFloat(name.c_str(), &value, min, max, "%.5f", p->exponent());
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != static_cast<float>(p->value())) {
@@ -323,7 +333,8 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
}
void renderIntProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
IntProperty* p = static_cast<IntProperty*>(prop);
@@ -336,7 +347,7 @@ void renderIntProperty(Property* prop, const std::string& ownerName,
ImGui::SliderInt(name.c_str(), &value, min, max);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -347,7 +358,8 @@ void renderIntProperty(Property* prop, const std::string& ownerName,
}
void renderIVec2Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
IVec2Property* p = static_cast<IVec2Property*>(prop);
@@ -364,7 +376,7 @@ void renderIVec2Property(Property* prop, const std::string& ownerName,
max
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -379,7 +391,8 @@ void renderIVec2Property(Property* prop, const std::string& ownerName,
}
void renderIVec3Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
IVec3Property* p = static_cast<IVec3Property*>(prop);
@@ -397,7 +410,7 @@ void renderIVec3Property(Property* prop, const std::string& ownerName,
max
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -411,7 +424,8 @@ void renderIVec3Property(Property* prop, const std::string& ownerName,
}
void renderIVec4Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
IVec4Property* p = static_cast<IVec4Property*>(prop);
@@ -429,7 +443,7 @@ void renderIVec4Property(Property* prop, const std::string& ownerName,
max
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -443,7 +457,8 @@ void renderIVec4Property(Property* prop, const std::string& ownerName,
}
void renderFloatProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
FloatProperty* p = static_cast<FloatProperty*>(prop);
@@ -455,7 +470,7 @@ void renderFloatProperty(Property* prop, const std::string& ownerName,
float max = p->maxValue();
ImGui::SliderFloat(name.c_str(), &value, min, max, "%.5f", p->exponent());
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -466,7 +481,8 @@ void renderFloatProperty(Property* prop, const std::string& ownerName,
}
void renderVec2Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
Vec2Property* p = static_cast<Vec2Property*>(prop);
@@ -486,7 +502,7 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
p->exponent()
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -501,7 +517,8 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
}
void renderVec3Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
Vec3Property* p = static_cast<Vec3Property*>(prop);
@@ -529,7 +546,7 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
);
}
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -544,7 +561,8 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
}
void renderVec4Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
Vec4Property* p = static_cast<Vec4Property*>(prop);
@@ -572,7 +590,7 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
);
}
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (value != p->value()) {
@@ -587,7 +605,8 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
}
void renderDVec2Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DVec2Property* p = static_cast<DVec2Property*>(prop);
@@ -606,7 +625,7 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
p->exponent()
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (glm::dvec2(value) != p->value()) {
@@ -621,7 +640,8 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
}
void renderDVec3Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DVec3Property* p = static_cast<DVec3Property*>(prop);
@@ -641,7 +661,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
p->exponent()
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (changed) {
@@ -656,7 +676,8 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
}
void renderDVec4Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DVec4Property* p = static_cast<DVec4Property*>(prop);
@@ -676,7 +697,7 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
p->exponent()
);
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (glm::dvec4(value) != p->value()) {
@@ -691,7 +712,8 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
}
void renderDMat2Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DMat2Property* p = static_cast<DMat2Property*>(prop);
@@ -717,7 +739,7 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
ImGui::SliderFloat2("[1]", glm::value_ptr(value[1]), min, max, "%.5f", p->exponent());
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (glm::dmat2(value) != p->value()) {
@@ -732,7 +754,8 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
}
void renderDMat3Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DMat3Property* p = static_cast<DMat3Property*>(prop);
@@ -762,7 +785,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
ImGui::SliderFloat3("[2]", glm::value_ptr(value[2]), min, max, "%.5f", p->exponent());
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (glm::dmat3(value) != p->value()) {
@@ -777,7 +800,8 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
}
void renderDMat4Property(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
DMat4Property* p = static_cast<DMat4Property*>(prop);
@@ -810,7 +834,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
ImGui::SliderFloat4("[3]", glm::value_ptr(value[3]), min, max, "%.5f", p->exponent());
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
if (glm::dmat4(value) != p->value()) {
@@ -825,7 +849,8 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
}
void renderTriggerProperty(Property* prop, const std::string& ownerName,
IsRegularProperty isRegular, ShowToolTip showTooltip)
IsRegularProperty isRegular, ShowToolTip showTooltip,
double tooltipDelay)
{
ghoul_assert(prop, "prop must not be nullptr");
std::string name = prop->guiName();
@@ -836,7 +861,7 @@ void renderTriggerProperty(Property* prop, const std::string& ownerName,
executeScript(prop->fullyQualifiedIdentifier(), "nil", isRegular);
}
if (showTooltip) {
renderTooltip(prop);
renderTooltip(prop, tooltipDelay);
}
ImGui::PopID();