--- branches/development/src/utils/ParameterManager.hpp 2011/11/22 20:38:56 1665 +++ branches/development/src/utils/ParameterManager.hpp 2012/03/26 15:27:16 1700 @@ -157,6 +157,34 @@ struct ParameterTraits >{ return false; } static std::string getParamType() { return "std::pair";} +}; + +//OpenMD's internal Vector3d +template<> +struct ParameterTraits{ + typedef OpenMD::Vector3d RepType; + template static bool convert(T, RepType&){return false;} + template static RepType convert(T v) {RepType tmp; convert(v,tmp);return tmp;} + static bool convert(RepType v, RepType& r) {r=v; return true;} + static bool convert(std::string v, RepType& r) { + OpenMD::StringTokenizer tokenizer(v," ();,\t\n\r"); + if (tokenizer.countTokens() == 3) { + RealType v1 = tokenizer.nextTokenAsDouble(); + RealType v2 = tokenizer.nextTokenAsDouble(); + RealType v3 = tokenizer.nextTokenAsDouble(); + r = OpenMD::Vector3d(v1, v2, v3); + return true; + } else { + sprintf(painCave.errMsg, + "ParameterManager Error: " + "Incorrect number of tokens to make a Vector3!\n"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } + return false; + } + static std::string getParamType() { return "OpenMD::Vector3d";} }; @@ -176,6 +204,7 @@ class ParameterBase { (public) virtual bool setData(unsigned long int) = 0; virtual bool setData(RealType) = 0; virtual bool setData(std::pair) = 0; + virtual bool setData(OpenMD::Vector3d) = 0; virtual std::string getParamType() = 0; protected: std::string keyword_; @@ -210,6 +239,9 @@ class Parameter : public ParameterBase{ (public) virtual bool setData(std::pair pval) { return internalSetData >(pval); } + virtual bool setData(OpenMD::Vector3d pval) { + return internalSetData(pval); + } virtual std::string getParamType() { return ParameterTraits::getParamType();} private: