comparison data/model/NoteModel.h @ 1644:513192aa9b03 single-point

Further API updates

                   public NoteExportable
 {
     Q_OBJECT
     
 public:
-    NoteModel(sv_samplerate_t sampleRate, int resolution,
+    NoteModel(sv_samplerate_t sampleRate,
+              int resolution,
               bool notifyOnAdd = true) :
         m_sampleRate(sampleRate),
         m_resolution(resolution),
         m_valueMinimum(0.f),
         m_valueMaximum(0.f),

 
     bool isOK() const override { return true; }
     sv_frame_t getStartFrame() const override { return m_events.getStartFrame(); }
     sv_frame_t getEndFrame() const override { return m_events.getEndFrame(); }
     sv_samplerate_t getSampleRate() const override { return m_sampleRate; }
+    int getResolution() const { return m_resolution; }
 
     bool canPlay() const override { return true; }
     QString getDefaultPlayClipId() const override {
         return "elecpiano";
     }

         if (emitRegionChanged) {
             emit modelChangedWithin(m_sinceLastNotifyMin, m_sinceLastNotifyMax);
             m_sinceLastNotifyMin = m_sinceLastNotifyMax = -1;
         }        
     }
+
+    /**
+     * Query methods.
+     */
+
+    int getEventCount() const {
+        return m_events.count();
+    }
+    bool isEmpty() const {
+        return m_events.isEmpty();
+    }
+    bool containsEvent(const Event &e) const {
+        return m_events.contains(e);
+    }
+    EventVector getAllEvents() const {
+        return m_events.getAllEvents();
+    }
+    EventVector getEventsSpanning(sv_frame_t f, sv_frame_t duration) const {
+        return m_events.getEventsSpanning(f, duration);
+    }
+    EventVector getEventsWithin(sv_frame_t f, sv_frame_t duration) const {
+        return m_events.getEventsWithin(f, duration);
+    }
+    EventVector getEventsStartingWithin(sv_frame_t f, sv_frame_t duration) const {
+        return m_events.getEventsStartingWithin(f, duration);
+    }
+    EventVector getEventsCovering(sv_frame_t f) const {
+        return m_events.getEventsCovering(f);
+    }
+
+    /**
+     * Editing commands and methods.
+     */
+    
+    class EditCommand : public Command
+    {
+    public:
+        //!!! borrowed ptr
+        EditCommand(NoteModel *model, QString name) :
+            m_model(model), m_name(name) { }
+
+        QString getName() const override {
+            return m_name;
+        }
+
+        void add(Event e) {
+            m_add.insert(e);
+        }
+
+        void remove(Event e) {
+            m_remove.insert(e);
+        }
+        
+        void execute() override {
+            for (const Event &e: m_add) m_model->add(e);
+            for (const Event &e: m_remove) m_model->remove(e);
+        }
+
+        void unexecute() override {
+            for (const Event &e: m_remove) m_model->add(e);
+            for (const Event &e: m_add) m_model->remove(e);
+        }
+
+        EditCommand *finish() {
+            if (m_add.empty() && m_remove.empty()) {
+                delete this;
+                return nullptr;
+            } else {
+                return this;
+            }
+        }
+
+    private:
+        NoteModel *m_model;
+        std::set<Event> m_add;
+        std::set<Event> m_remove;
+        QString m_name;
+    };
+
+    void add(Event e) {
+
+        bool allChange = false;
+           
+        {
+            QMutexLocker locker(&m_mutex);
+            m_events.add(e);
+//!!!???        if (point.getLabel() != "") m_hasTextLabels = true;
+
+            float v = e.getValue();
+            if (!ISNAN(v) && !ISINF(v)) {
+                if (!m_haveExtents || v < m_valueMinimum) {
+                    m_valueMinimum = v; allChange = true;
+                }
+                if (!m_haveExtents || v > m_valueMaximum) {
+                    m_valueMaximum = v; allChange = true;
+                }
+                m_haveExtents = true;
+            }
+            
+            sv_frame_t f = e.getFrame();
+
+            if (!m_notifyOnAdd) {
+                if (m_sinceLastNotifyMin == -1 || f < m_sinceLastNotifyMin) {
+                    m_sinceLastNotifyMin = f;
+                }
+                if (m_sinceLastNotifyMax == -1 || f > m_sinceLastNotifyMax) {
+                    m_sinceLastNotifyMax = f;
+                }
+            }
+        }
+        
+        if (m_notifyOnAdd) {
+            emit modelChangedWithin(e.getFrame(),
+                                    e.getFrame() + e.getDuration() + m_resolution);
+        }
+        if (allChange) {
+            emit modelChanged();
+        }
+    }
+    
+    void remove(Event e) {
+        {
+            QMutexLocker locker(&m_mutex);
+            m_events.remove(e);
+        }
+        emit modelChangedWithin(e.getFrame(),
+                                e.getFrame() + e.getDuration() + m_resolution);
+    }
+
+    /**
+     * TabularModel methods.  
+     */
+
+    int getRowCount() const override {
+        return m_events.count();
+    }
+    
+    int getColumnCount() const override {
+        return 6;
+    }
+
+    bool isColumnTimeValue(int column) const override {
+        // NB duration is not a "time value" -- that's for columns
+        // whose sort ordering is exactly that of the frame time
+        return (column < 2);
+    }
+
+    sv_frame_t getFrameForRow(int row) const override {
+        if (row < 0 || row >= m_events.count()) {
+            return 0;
+        }
+        Event e = m_events.getEventByIndex(row);
+        return e.getFrame();
+    }
+
+    int getRowForFrame(sv_frame_t frame) const override {
+        return m_events.getIndexForEvent(Event(frame));
+    }
+    
+    QString getHeading(int column) const override {
+        switch (column) {
+        case 0: return tr("Time");
+        case 1: return tr("Frame");
+        case 2: return tr("Pitch");
+        case 3: return tr("Duration");
+        case 4: return tr("Level");
+        case 5: return tr("Label");
+        default: return tr("Unknown");
+        }
+    }
+
+    QVariant getData(int row, int column, int role) const override {
+
+        if (row < 0 || row >= m_events.count()) {
+            return QVariant();
+        }
+
+        Event e = m_events.getEventByIndex(row);
+
+        switch (column) {
+        case 0: return adaptFrameForRole(e.getFrame(), getSampleRate(), role);
+        case 1: return int(e.getFrame());
+        case 2: return adaptValueForRole(e.getValue(), getScaleUnits(), role);
+        case 3: return int(e.getDuration());
+        case 4: return e.getLevel();
+        case 5: return e.getLabel();
+        default: return QVariant();
+        }
+    }
+
+    Command *getSetDataCommand(int row, int column, const QVariant &value, int role) override
+    {
+        if (row < 0 || row >= m_events.count()) return nullptr;
+        if (role != Qt::EditRole) return nullptr;
+
+        Event e0 = m_events.getEventByIndex(row);
+        Event e1;
+
+        switch (column) {
+        case 0: e1 = e0.withFrame(sv_frame_t(round(value.toDouble() *
+                                                   getSampleRate()))); break;
+        case 1: e1 = e0.withFrame(value.toInt()); break;
+        case 2: e1 = e0.withValue(float(value.toDouble())); break;
+        case 3: e1 = e0.withDuration(value.toInt()); break;
+        case 4: e1 = e0.withLevel(float(value.toDouble())); break;
+        case 5: e1 = e0.withLabel(value.toString()); break;
+        }
+
+        EditCommand *command = new EditCommand(this, tr("Edit Data"));
+        command->remove(e0);
+        command->add(e1);
+        return command->finish();
+    }
+
+    SortType getSortType(int column) const override
+    {
+        if (column == 5) return SortAlphabetical;
+        return SortNumeric;
+    }
+
+    /**
+     * NoteExportable methods.
+     */
+
+    NoteList getNotes() const override {
+        return getNotesStartingWithin(getStartFrame(),
+                                      getEndFrame() - getStartFrame());
+    }
+
+    NoteList getNotesActiveAt(sv_frame_t frame) const override {
+
+        NoteList notes;
+        EventVector ee = m_events.getEventsCovering(frame);
+        for (const auto &e: ee) {
+            notes.push_back(e.toNoteData(getSampleRate(),
+                                         getScaleUnits() != "Hz"));
+        }
+        return notes;
+    }
+    
+    NoteList getNotesStartingWithin(sv_frame_t startFrame,
+                                    sv_frame_t duration) const override {
+
+        NoteList notes;
+        EventVector ee = m_events.getEventsStartingWithin(startFrame, duration);
+        for (const auto &e: ee) {
+            notes.push_back(e.toNoteData(getSampleRate(),
+                                         getScaleUnits() != "Hz"));
+        }
+        return notes;
+    }
+
+    /**
+     * XmlExportable methods.
+     */
     
     void toXml(QTextStream &out,
                QString indent = "",
                QString extraAttributes = "") const override {
 

              .arg(extraAttributes));
 
         m_events.toXml(out, indent, QString("dimensions=\"3\""));
     }
 
-    /**
-     * TabularModel methods.  
-     */
-
-    int getRowCount() const override {
-        return m_events.count();
-    }
-    
-    int getColumnCount() const override {
-        return 6;
-    }
-
-    bool isColumnTimeValue(int column) const override {
-        // NB duration is not a "time value" -- that's for columns
-        // whose sort ordering is exactly that of the frame time
-        return (column < 2);
-    }
-
-    sv_frame_t getFrameForRow(int row) const override {
-        if (row < 0 || row >= m_events.count()) {
-            return 0;
-        }
-        Event e = m_events.getEventByIndex(row);
-        return e.getFrame();
-    }
-
-    int getRowForFrame(sv_frame_t frame) const override {
-        return m_events.getIndexForEvent(Event(frame));
-    }
-    
-    QString getHeading(int column) const override {
-        switch (column) {
-        case 0: return tr("Time");
-        case 1: return tr("Frame");
-        case 2: return tr("Pitch");
-        case 3: return tr("Duration");
-        case 4: return tr("Level");
-        case 5: return tr("Label");
-        default: return tr("Unknown");
-        }
-    }
-
-    QVariant getData(int row, int column, int role) const override {
-
-        if (row < 0 || row >= m_events.count()) {
-            return QVariant();
-        }
-
-        Event e = m_events.getEventByIndex(row);
-
-        switch (column) {
-        case 0: return adaptFrameForRole(e.getFrame(), getSampleRate(), role);
-        case 1: return int(e.getFrame());
-        case 2: return adaptValueForRole(e.getValue(), getScaleUnits(), role);
-        case 3: return int(e.getDuration());
-        case 4: return e.getLevel();
-        case 5: return e.getLabel();
-        default: return QVariant();
-        }
-    }
-
-    class EditCommand : public Command
-    {
-    public:
-        //!!! borrowed ptr
-        EditCommand(NoteModel *model, QString name) :
-            m_model(model), m_name(name) { }
-
-        QString getName() const override {
-            return m_name;
-        }
-
-        void addPoint(Event e) {
-            m_add.insert(e);
-        }
-        void deletePoint(Event e) {
-            m_remove.insert(e);
-        }
-        
-        void execute() override {
-            for (const Event &e: m_add) m_model->addPoint(e);
-            for (const Event &e: m_remove) m_model->deletePoint(e);
-        }
-
-        void unexecute() override {
-            for (const Event &e: m_remove) m_model->addPoint(e);
-            for (const Event &e: m_add) m_model->deletePoint(e);
-        }
-
-    private:
-        NoteModel *m_model;
-        std::set<Event> m_add;
-        std::set<Event> m_remove;
-        QString m_name;
-    };
-
-    //!!! rename Point to Note throughout? Just because we can now?
-    void addPoint(Event e) {
-
-        bool allChange = false;
-           
-        {
-            QMutexLocker locker(&m_mutex);
-            m_events.add(e);
-//!!!???        if (point.getLabel() != "") m_hasTextLabels = true;
-
-            float v = e.getValue();
-            if (!ISNAN(v) && !ISINF(v)) {
-                if (!m_haveExtents || v < m_valueMinimum) {
-                    m_valueMinimum = v; allChange = true;
-                }
-                if (!m_haveExtents || v > m_valueMaximum) {
-                    m_valueMaximum = v; allChange = true;
-                }
-                m_haveExtents = true;
-            }
-            
-            sv_frame_t f = e.getFrame();
-
-            if (!m_notifyOnAdd) {
-                if (m_sinceLastNotifyMin == -1 || f < m_sinceLastNotifyMin) {
-                    m_sinceLastNotifyMin = f;
-                }
-                if (m_sinceLastNotifyMax == -1 || f > m_sinceLastNotifyMax) {
-                    m_sinceLastNotifyMax = f;
-                }
-            }
-        }
-        
-        if (m_notifyOnAdd) {
-            emit modelChangedWithin(e.getFrame(),
-                                    e.getFrame() + e.getDuration() + m_resolution);
-        }
-        if (allChange) {
-            emit modelChanged();
-        }
-    }
-    
-    void deletePoint(Event e) {
-        {
-            QMutexLocker locker(&m_mutex);
-            m_events.remove(e);
-        }
-        emit modelChangedWithin(e.getFrame(),
-                                e.getFrame() + e.getDuration() + m_resolution);
-    }
-    
-    EventVector getPoints() const /*!!! override? - and/or rename? */ {
-        EventVector ee;
-        for (int i = 0; i < m_events.count(); ++i) {
-            ee.push_back(m_events.getEventByIndex(i));
-        }
-        return ee;
-    }
-
-    //!!! bleah
-    EventVector getPoints(sv_frame_t start, sv_frame_t end) const {
-        return m_events.getEventsSpanning(start, end - start);        
-    }
-    
-    int getPointCount() const {
-        return m_events.count();
-    }
-
-    bool isEmpty() const {
-        return m_events.isEmpty();
-    }
-
-    bool containsPoint(const Event &e) const {
-        return m_events.contains(e);
-    }
-
-    Command *getSetDataCommand(int row, int column, const QVariant &value, int role) override
-    {
-        if (row < 0 || row >= m_events.count()) return nullptr;
-        if (role != Qt::EditRole) return nullptr;
-
-        Event e0 = m_events.getEventByIndex(row);
-        Event e1;
-
-        switch (column) {
-        case 0: e1 = e0.withFrame(sv_frame_t(round(value.toDouble() *
-                                                   getSampleRate()))); break;
-        case 1: e1 = e0.withFrame(value.toInt()); break;
-        case 2: e1 = e0.withValue(float(value.toDouble())); break;
-        case 3: e1 = e0.withDuration(value.toInt()); break;
-        case 4: e1 = e0.withLevel(float(value.toDouble())); break;
-        case 5: e1 = e0.withLabel(value.toString()); break;
-        }
-
-        EditCommand *command = new EditCommand(this, tr("Edit Data"));
-        command->deletePoint(e0);
-        command->addPoint(e1);
-        return command;
-    }
-
-    SortType getSortType(int column) const override
-    {
-        if (column == 5) return SortAlphabetical;
-        return SortNumeric;
-    }
-
-    /**
-     * NoteExportable methods.
-     */
-
-    NoteList getNotes() const override {
-        return getNotesStartingWithin(getStartFrame(),
-                                      getEndFrame() - getStartFrame());
-    }
-
-    NoteList getNotesActiveAt(sv_frame_t frame) const override {
-
-        NoteList notes;
-        EventVector ee = m_events.getEventsCovering(frame);
-        for (const auto &e: ee) {
-            notes.push_back(e.toNoteData(getSampleRate(),
-                                         getScaleUnits() != "Hz"));
-        }
-        return notes;
-    }
-    
-    NoteList getNotesStartingWithin(sv_frame_t startFrame,
-                                    sv_frame_t duration) const override {
-
-        NoteList notes;
-        EventVector ee = m_events.getEventsStartingWithin(startFrame, duration);
-        for (const auto &e: ee) {
-            notes.push_back(e.toNoteData(getSampleRate(),
-                                         getScaleUnits() != "Hz"));
-        }
-        return notes;
-    }
-
 protected:
     sv_samplerate_t m_sampleRate;
     int m_resolution;
 
     float m_valueMinimum;