comparison data/model/SparseTimeValueModel.h @ 1655:0cfb882155a6 single-point

Fixes: completion should default to 100 (it never gets set if we aren't a transform target); events added to time-value model should be denied durations; forward the overspill and matching search functions

         m_haveTextLabels(false),
         m_notifier(this,
                    notifyOnAdd ?
                    DeferredNotifier::NOTIFY_ALWAYS :
                    DeferredNotifier::NOTIFY_DEFERRED),
-        m_completion(0) {
+        m_completion(100) {
         // Model is playable, but may not sound (if units not Hz or
         // range unsuitable)
         PlayParameterRepository::getInstance()->addPlayable(this);
     }
 

         m_haveTextLabels(false),
         m_notifier(this,
                    notifyOnAdd ?
                    DeferredNotifier::NOTIFY_ALWAYS :
                    DeferredNotifier::NOTIFY_DEFERRED),
-        m_completion(0) {
+        m_completion(100) {
         // Model is playable, but may not sound (if units not Hz or
         // range unsuitable)
         PlayParameterRepository::getInstance()->addPlayable(this);
     }
 

     float getValueMaximum() const { return m_valueMaximum; }
     
     int getCompletion() const { return m_completion; }
 
     void setCompletion(int completion, bool update = true) {
-
+        
         {   QMutexLocker locker(&m_mutex);
             if (m_completion == completion) return;
             m_completion = completion;
         }
 

         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 getEventsWithin(sv_frame_t f, sv_frame_t duration,
+                                int overspill = 0) const {
+        return m_events.getEventsWithin(f, duration, overspill);
     }
     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);
+    }
+    bool getNearestEventMatching(sv_frame_t startSearchAt,
+                                 std::function<bool(Event)> predicate,
+                                 EventSeries::Direction direction,
+                                 Event &found) const {
+        return m_events.getNearestEventMatching
+            (startSearchAt, predicate, direction, found);
     }
     
     /**
      * Editing methods.
      */

 
         bool allChange = false;
            
         {
             QMutexLocker locker(&m_mutex);
-            m_events.add(e);
+            m_events.add(e.withoutDuration()); // can't have duration here
 
             if (e.getLabel() != "") {
                 m_haveTextLabels = true;
             }