* \author Teemu Murtola <teemu.murtola@gmail.com>
* \ingroup module_options
*/
+#include "gmxpre.h"
+
#include "basicoptions.h"
#include "basicoptionstorage.h"
* BooleanOption
*/
-AbstractOptionStoragePointer BooleanOption::createStorage() const
+AbstractOptionStorage *
+BooleanOption::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new BooleanOptionStorage(*this));
+ return new BooleanOptionStorage(*this);
}
* IntegerOption
*/
-AbstractOptionStoragePointer IntegerOption::createStorage() const
+AbstractOptionStorage *
+IntegerOption::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new IntegerOptionStorage(*this));
+ return new IntegerOptionStorage(*this);
}
* Int64Option
*/
-AbstractOptionStoragePointer Int64Option::createStorage() const
+AbstractOptionStorage *
+Int64Option::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new Int64OptionStorage(*this));
+ return new Int64OptionStorage(*this);
}
* DoubleOption
*/
-AbstractOptionStoragePointer DoubleOption::createStorage() const
+AbstractOptionStorage *
+DoubleOption::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new DoubleOptionStorage(*this));
+ return new DoubleOptionStorage(*this);
}
* FloatOption
*/
-AbstractOptionStoragePointer FloatOption::createStorage() const
+AbstractOptionStorage *
+FloatOption::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new FloatOptionStorage(*this));
+ return new FloatOptionStorage(*this);
}
GMX_THROW(APIError("Conflicting default values"));
}
}
- // If there is no default value, match is still -1.
- if (enumIndexStore_ != NULL)
- {
- *enumIndexStore_ = match;
- }
}
if (settings.defaultEnumIndex_ >= 0)
{
addValue(allowed_[settings.defaultEnumIndex_]);
commitValues();
}
+ // Somewhat subtly, this does not update the stored enum index if the
+ // caller has not provided store() or storeVector(), because values()
+ // will be empty in such a case. This leads to (desired) behavior of
+ // preserving the existing value in the enum index store variable in such
+ // cases.
+ refreshEnumIndexStore();
}
std::string StringOptionStorage::formatExtraDescription() const
void StringOptionStorage::refreshValues()
{
MyBase::refreshValues();
+ refreshEnumIndexStore();
+}
+
+void StringOptionStorage::refreshEnumIndexStore()
+{
if (enumIndexStore_ != NULL)
{
for (size_t i = 0; i < values().size(); ++i)
{
- ValueList::const_iterator match =
- std::find(allowed_.begin(), allowed_.end(), values()[i]);
- GMX_ASSERT(match != allowed_.end(),
- "Enum value not found (internal error)");
- enumIndexStore_[i] = static_cast<int>(match - allowed_.begin());
+ if (values()[i].empty())
+ {
+ enumIndexStore_[i] = -1;
+ }
+ else
+ {
+ ValueList::const_iterator match =
+ std::find(allowed_.begin(), allowed_.end(), values()[i]);
+ GMX_ASSERT(match != allowed_.end(),
+ "Enum value not found (internal error)");
+ enumIndexStore_[i] = static_cast<int>(match - allowed_.begin());
+ }
}
}
}
* StringOption
*/
-AbstractOptionStoragePointer StringOption::createStorage() const
+AbstractOptionStorage *
+StringOption::createStorage(const OptionManagerContainer & /*managers*/) const
{
- return AbstractOptionStoragePointer(new StringOptionStorage(*this));
+ return new StringOptionStorage(*this);
}
} // namespace gmx