# HG changeset patch
# User Chris Cannam
# Date 1147359734 0
# Node ID a08718723b204be276dd262476ca6575e1613292
# Parent  90ade4fa63be6537812d0db436a4cd7b4e7f50f9
* Add units repository, and unit property on time-value and note layers.

diff -r 90ade4fa63be -r a08718723b20 base/PropertyContainer.h
--- a/base/PropertyContainer.h	Thu May 11 11:35:46 2006 +0000
+++ b/base/PropertyContainer.h	Thu May 11 15:02:14 2006 +0000
@@ -39,6 +39,7 @@
 	RangeProperty, // range of integers
 	ValueProperty, // range of integers given string labels
 	ColourProperty, // colours, get/set as qRgb
+        UnitsProperty, // unit from UnitDatabase, get/set unit id
 	InvalidProperty, // property not found!
     };
 
diff -r 90ade4fa63be -r a08718723b20 base/UnitDatabase.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base/UnitDatabase.cpp	Thu May 11 15:02:14 2006 +0000
@@ -0,0 +1,68 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006 Chris Cannam.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "UnitDatabase.h"
+
+UnitDatabase
+UnitDatabase::m_instance;
+
+UnitDatabase *
+UnitDatabase::getInstance()
+{
+    return &m_instance;
+}
+
+UnitDatabase::UnitDatabase() :
+    m_nextId(0)
+{
+}
+
+QStringList
+UnitDatabase::getKnownUnits() const
+{
+    QStringList list;
+    for (UnitMap::const_iterator i = m_units.begin(); i != m_units.end(); ++i) {
+        list.push_back(i->first);
+    }
+    return list;
+}
+
+void
+UnitDatabase::registerUnit(QString unit)
+{
+    if (m_units.find(unit) == m_units.end()) {
+        m_units[unit] = m_nextId++;
+    }
+    emit unitDatabaseChanged();
+}
+
+int
+UnitDatabase::getUnitId(QString unit)
+{
+    if (m_units.find(unit) == m_units.end()) {
+        registerUnit(unit);
+    }
+    return m_units[unit];
+}
+
+QString
+UnitDatabase::getUnitById(int id)
+{
+    for (UnitMap::const_iterator i = m_units.begin(); i != m_units.end(); ++i) {
+        if (i->second == id) return i->first;
+    }
+    return "";
+}
+
diff -r 90ade4fa63be -r a08718723b20 base/UnitDatabase.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base/UnitDatabase.h	Thu May 11 15:02:14 2006 +0000
@@ -0,0 +1,56 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006 Chris Cannam.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef _UNIT_DATABASE_H_
+#define _UNIT_DATABASE_H_
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <map>
+
+// This grandly named class is just a list of the names of known scale
+// units for the various models, for use as the set of fixed values in
+// unit dropdown menus etc.  Of course, the user should be allowed to
+// enter their own as well.
+
+class UnitDatabase : public QObject
+{
+    Q_OBJECT
+
+public:
+    static UnitDatabase *getInstance();
+
+    QStringList getKnownUnits() const;
+    void registerUnit(QString unit);
+    
+    int getUnitId(QString unit);
+    QString getUnitById(int id);
+
+signals:
+    void unitDatabaseChanged();
+
+protected:
+    UnitDatabase();
+
+    typedef std::map<QString, int> UnitMap;
+    UnitMap m_units;
+    int m_nextId;
+
+    static UnitDatabase m_instance;
+};
+
+#endif
+