comparison base/PropertyContainer.cpp @ 387:7aa1de571880

* juggle some files around in order to free audioio, base, and system libraries
  from dependency on QtGui

     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
 #include "PropertyContainer.h"
-#include "CommandHistory.h"
 #include "RangeMapper.h"
 #include "UnitDatabase.h"
-#include "ColourDatabase.h"
-
-#include <QColor>
 
 #include <iostream>
 
 PropertyContainer::PropertyList
 PropertyContainer::getProperties() const

 }
 
 QString
 PropertyContainer::getPropertyValueLabel(const PropertyName &name, int value) const
 {
-    if (getPropertyType(name) == ColourProperty) {
-        ColourDatabase *db = ColourDatabase::getInstance();
-        if (value >= 0 && size_t(value) < db->getColourCount()) {
-            return db->getColourName(value);
-        }
-    }
-
     return QString();
 }
 
 RangeMapper *
 PropertyContainer::getNewPropertyRangeMapper(const PropertyName &) const

 PropertyContainer::setProperty(const PropertyName &name, int) 
 {
     std::cerr << "WARNING: PropertyContainer[" << getPropertyContainerName().toStdString() << "]::setProperty(" << name.toStdString() << "): no implementation in subclass!" << std::endl;
 }
 
-void
-PropertyContainer::setPropertyWithCommand(const PropertyName &name, int value)
+Command *
+PropertyContainer::getSetPropertyCommand(const PropertyName &name, int value)
 {
     int currentValue = getPropertyRangeAndValue(name, 0, 0, 0);
-    if (value == currentValue) return;
-
-    CommandHistory::getInstance()->addCommand
-	(new SetPropertyCommand(this, name, value), true, true); // bundled
+    if (value == currentValue) return 0;
+    return new SetPropertyCommand(this, name, value);
 }
  
 void
 PropertyContainer::setProperty(QString nameString, QString valueString)
 {

         return;
     }
     setProperty(name, value);
 }
  
-void
-PropertyContainer::setPropertyWithCommand(QString nameString, QString valueString)
+Command *
+PropertyContainer::getSetPropertyCommand(QString nameString, QString valueString)
 {
     PropertyName name;
     int value;
     if (!convertPropertyStrings(nameString, valueString, name, value)) {
-        std::cerr << "WARNING: PropertyContainer::setPropertyWithCommand(\""
+        std::cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\""
                   << nameString.toStdString() << "\", \""
                   << valueString.toStdString()
                   << "\"): Name and value conversion failed" << std::endl;
-        return;
-    }
-    setPropertyWithCommand(name, value);
+        return 0;
+    }
+    return getSetPropertyCommand(name, value);
 }
 
 bool
 PropertyContainer::convertPropertyStrings(QString nameString, QString valueString,
                                           PropertyName &name, int &value)

             }
         }
         break;
 
     case ValueProperty:
+    case ColourProperty:
     {
         int min, max;
         getPropertyRangeAndValue(name, &min, &max, 0);
         for (int i = min; i <= max; ++i) {
             if (valueString == getPropertyValueLabel(name, i)) {

                 break;
             }
         }
         break;
     }
-
-    case ColourProperty:
-        value = ColourDatabase::getInstance()->getColourIndex(valueString);
-        if (value >= 0) success = true;
-        else value = 0;
-        break;
         
     case UnitsProperty:
         value = UnitDatabase::getInstance()->getUnitId(valueString, false);
         if (value >= 0) success = true;
         else value = 0;