Skip to content
Permalink
Browse files

Merge pull request #537 from braunms/configurator

Fixed int parameter case bug
  • Loading branch information
braunms committed Mar 23, 2020
2 parents 715be7e + 69e6632 commit bbbd87390420df49f41afe1d72351993bff73d5c
Showing with 7 additions and 11 deletions.
  1. +7 −11 plugins/gui/src/configurator/Parameter.cpp
@@ -96,7 +96,7 @@ std::string megamol::gui::configurator::Parameter::GetValueString(void) {
case (Parameter::ParamType::INT): {
auto param = megamol::core::param::IntParam(arg);
value_string = std::string(param.ValueString().PeekBuffer());
}
} break;
case (Parameter::ParamType::ENUM): {
auto param = megamol::core::param::EnumParam(arg);
// Initialization of enum storage required
@@ -105,7 +105,7 @@ std::string megamol::gui::configurator::Parameter::GetValueString(void) {
param.SetTypePair(pair.first, pair.second.c_str());
}
value_string = std::string(param.ValueString().PeekBuffer());
}
} break;
default:
break;
}
@@ -114,23 +114,19 @@ std::string megamol::gui::configurator::Parameter::GetValueString(void) {
case (Parameter::ParamType::STRING): {
auto param = megamol::core::param::StringParam(arg.c_str());
value_string = std::string(param.ValueString().PeekBuffer());
break;
}
} break;
case (Parameter::ParamType::TRANSFERFUNCTION): {
auto param = megamol::core::param::TransferFunctionParam(arg);
value_string = std::string(param.ValueString().PeekBuffer());
break;
}
} break;
case (Parameter::ParamType::FILEPATH): {
auto param = megamol::core::param::FilePathParam(arg.c_str());
value_string = std::string(param.ValueString().PeekBuffer());
break;
}
} break;
case (Parameter::ParamType::FLEXENUM): {
auto param = megamol::core::param::FlexEnumParam(arg.c_str());
value_string = std::string(param.ValueString().PeekBuffer());
break;
}
} break;
default:
break;
}
@@ -342,7 +338,7 @@ bool megamol::gui::configurator::Parameter::Presentation::presentation_button(vo
case (Presentations::PIN_VALUE_TO_MOUSE):
presentation_str = "Pin Value to Mouse";
break;
defalt:
default:
break;
}
if (presentation_str.empty()) break;

0 comments on commit bbbd873

Please sign in to comment.
You can’t perform that action at this time.