Some minor changes to ParameterValue and StimulusGroup

mworks-project · Mar 29, 2011 · d714ceb · d714ceb
1 parent 943fe6f
commit d714ceb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/Core/PluginServices/Component.cpp b/Core/PluginServices/Component.cpp
@@ -27,7 +27,7 @@ void Component::describeComponent(ComponentInfo &info) {
 
 
 Component::Component(const ParameterValueMap &parameters) :
-    tag(parameters[TAG].getValue())
+    tag(parameters[TAG].str())
 {
     compact_id = _id_count++;
 }

diff --git a/Core/PluginServices/ParameterValue.cpp b/Core/PluginServices/ParameterValue.cpp
@@ -13,12 +13,6 @@
 BEGIN_NAMESPACE_MW
 
 
-template<>
-const std::string& ParameterValue::convert(const std::string &s, ComponentRegistryPtr reg) {
-    return s;
-}
-
-
 template<>
 VariablePtr ParameterValue::convert(const std::string &s, ComponentRegistryPtr reg) {
     return reg->getVariable(s);

diff --git a/Core/PluginServices/ParameterValue.h b/Core/PluginServices/ParameterValue.h
@@ -32,12 +32,17 @@ class ParameterValue {
         reg(reg)
     { }
 
-    const std::string& getValue() const {
+    const std::string& str() const {
         return value;
     }
 
     template<typename Type>
     operator Type() const {
+        return as<Type>();
+    }
+
+    template<typename Type>
+    Type as() const {
         return convert<Type>(value, reg);
     }
 
@@ -68,10 +73,6 @@ Type ParameterValue::convert(const std::string &s, ComponentRegistryPtr reg) {
 }
 
 
-template<>
-const std::string& ParameterValue::convert(const std::string &s, ComponentRegistryPtr reg);
-
-
 template<>
 VariablePtr ParameterValue::convert(const std::string &s, ComponentRegistryPtr reg);
 

diff --git a/Core/Stimuli/Stimulus.cpp b/Core/Stimuli/Stimulus.cpp
@@ -27,13 +27,14 @@ BEGIN_NAMESPACE_MW
 
 
 void StimulusGroup::describeComponent(ComponentInfo &info) {
+    Component::describeComponent(info);
     info.setSignature("stimulus_group");
-    info.addParameter("tag");
+    info.getParameter(Component::TAG).setRequired(true);
 }
 
 
 StimulusGroup::StimulusGroup(const ParameterValueMap &parameters) :
-    mw::Component(parameters["tag"].getValue())
+    Component(parameters)
 { }