MMDevice: Make property name available from Property object (Jon Daniels)

(No change to device interface.)

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@15892 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

Author: mark

MMDevice/Property.cpp

@@ -340,21 +340,20 @@ int MM::PropertyCollection::CreateProperty(const char* pszName, const char* pszV
 
    switch(eType)
    {
-   case MM::String:
-         pProp = new MM::StringProperty();
-      break;
-      
+      case MM::String:
+         pProp = new MM::StringProperty(pszName);
+         break;
+
       case MM::Integer:
-         pProp = new MM::IntegerProperty();
-      break;
+         pProp = new MM::IntegerProperty(pszName);
+         break;
 
       case MM::Float:
-         pProp = new MM::FloatProperty();
-      break;
+         pProp = new MM::FloatProperty(pszName);
+         break;
 
       default:
-         return DEVICE_INVALID_PROPERTY_TYPE; // unsupported type
-      break;
+         return DEVICE_INVALID_PROPERTY_TYPE;
    }
 
    if (!pProp->Set(pszValue))

MMDevice/Property.h

@@ -67,6 +67,7 @@ class PropertyBase
    virtual int AddToSequence(const char* value) = 0;
    virtual int SendSequence() = 0;
 
+   virtual std::string GetName() const = 0;
 };
 
 /**
@@ -125,7 +126,7 @@ class ActionEx : public ActionFunctor
 class Property : public PropertyBase
 {
 public:
-   Property() :
+   Property(const char* name) :
       readOnly_(false),
       fpAction_(0),
       cached_(false),
@@ -136,13 +137,15 @@ class Property : public PropertyBase
       sequenceMaxSize_(0),
       sequenceEvents_(),
       lowerLimit_(0.0),
-      upperLimit_(0.0)
-      {}      
+      upperLimit_(0.0),
+      name_(name)
+   {}
+
    virtual ~Property()
    {
       delete fpAction_;
    }
-            
+
    bool GetCached()const {return cached_;}
    void SetCached(bool bState=true) {cached_ = bState;}
 
@@ -264,6 +267,11 @@ class Property : public PropertyBase
       return DEVICE_OK; // Return an error instead???
    }
 
+   std::string GetName() const
+   {
+      return name_;
+   }
+
    std::vector<std::string> GetSequence() const
    {
       return sequenceEvents_;
@@ -296,6 +304,7 @@ class Property : public PropertyBase
    double lowerLimit_;
    double upperLimit_;
    std::map<std::string, long> values_; // allowed values
+   const std::string name_;
 
 private:
    Property& operator=(const Property&);
@@ -307,7 +316,9 @@ class Property : public PropertyBase
 class StringProperty : public Property
 {
 public:
-   StringProperty() : Property() {}      
+   StringProperty(const char* name) :
+      Property(name)
+   {}
    virtual ~StringProperty(){};
 
    PropertyType GetType() {return String;}
@@ -335,7 +346,10 @@ class StringProperty : public Property
 class FloatProperty : public Property
 {
 public:
-   FloatProperty(): Property(), value_(0.0), decimalPlaces_(4)
+   FloatProperty(const char* name) :
+      Property(name),
+      value_(0.0),
+      decimalPlaces_(4)
    {
       int rms = 1;
       for (int i = 0; i < decimalPlaces_; ++i)
@@ -375,7 +389,10 @@ class FloatProperty : public Property
 class IntegerProperty : public Property
 {
 public:
-   IntegerProperty(): Property(), value_(0) {}      
+   IntegerProperty(const char* name) :
+      Property(name),
+      value_(0)
+   {}
    ~IntegerProperty() {};
 
    PropertyType GetType() {return Integer;}