diff data/model/test/TestSparseModels.h @ 1643:7a23dfe65d66 single-point

Update NoteModel to use EventSeries. This is incomplete and won't provide enough to update svgui for it yet; must also refactor to avoid duplication of nasty APIs when updating the rest of the models

--- a/data/model/test/TestSparseModels.h	Wed Mar 13 14:46:54 2019 +0000
+++ b/data/model/test/TestSparseModels.h	Wed Mar 13 14:50:10 2019 +0000
@@ -93,18 +93,19 @@
         QCOMPARE(m.getPoints().size(), 3);
         QCOMPARE(*m.getPoints().begin(), p1);
         QCOMPARE(*m.getPoints().rbegin(), p3);
-
+/*!!!
         auto pp = m.getPoints(20, 30);
         QCOMPARE(pp.size(), 2);
         QCOMPARE(*pp.begin(), p1);
         QCOMPARE(*pp.rbegin(), p2);
-
+        
         pp = m.getPoints(40, 50);
         QCOMPARE(pp.size(), 0);
 
         pp = m.getPoints(50, 50);
         QCOMPARE(pp.size(), 1);
         QCOMPARE(*pp.begin(), p3);
+*/
     }
 
     void s1d_xml() {
@@ -136,11 +137,11 @@
 
     void note_extents() {
         NoteModel m(100, 10, false);
-        NoteModel::Point p1(20, 123.4f, 40, 0.8f, "note 1");
+        Event p1(20, 123.4f, 40, 0.8f, "note 1");
         m.addPoint(p1);
         QCOMPARE(m.isEmpty(), false);
         QCOMPARE(m.getPointCount(), 1);
-        NoteModel::Point p2(50, 124.3f, 30, 0.9f, "note 2");
+        Event p2(50, 124.3f, 30, 0.9f, "note 2");
         m.addPoint(p2);
         QCOMPARE(m.isEmpty(), false);
         QCOMPARE(m.getPointCount(), 2);
@@ -150,8 +151,8 @@
         QCOMPARE(m.getStartFrame(), 20);
         QCOMPARE(m.getEndFrame(), 80);
         QCOMPARE(m.containsPoint(p1), true);
-        QCOMPARE(m.getValueMinimum(), 123.4);
-        QCOMPARE(m.getValueMaximum(), 124.3);
+        QCOMPARE(m.getValueMinimum(), 123.4f);
+        QCOMPARE(m.getValueMaximum(), 124.3f);
         m.deletePoint(p1);
         QCOMPARE(m.getPointCount(), 1);
         QCOMPARE(m.getPoints().size(), 1);
@@ -163,9 +164,9 @@
              
     void note_sample() {
         NoteModel m(100, 10, false);
-        NoteModel::Point p1(20, 123.4f, 20, 0.8f, "note 1");
-        NoteModel::Point p2(20, 124.3f, 10, 0.9f, "note 2");
-        NoteModel::Point p3(50, 126.3f, 30, 0.9f, "note 3");
+        Event p1(20, 123.4f, 10, 0.8f, "note 1");
+        Event p2(20, 124.3f, 20, 0.9f, "note 2");
+        Event p3(50, 126.3f, 30, 0.9f, "note 3");
         m.addPoint(p1);
         m.addPoint(p2);
         m.addPoint(p3);
@@ -181,21 +182,22 @@
 
         pp = m.getPoints(30, 50);
         QCOMPARE(pp.size(), 1);
-        QCOMPARE(*pp.begin(), p1);
+        QCOMPARE(*pp.begin(), p2);
 
         pp = m.getPoints(40, 50);
         QCOMPARE(pp.size(), 0);
 
+        //!!! this is a poor api
         pp = m.getPoints(50, 50);
-        QCOMPARE(pp.size(), 1);
-        QCOMPARE(*pp.begin(), p3);
+        QCOMPARE(pp.size(), 0);
+//        QCOMPARE(*pp.begin(), p3);
     }
 
     void note_xml() {
         NoteModel m(100, 10, false);
-        NoteModel::Point p1(20, 123.4f, 20, 0.8f, "note 1");
-        NoteModel::Point p2(20, 124.3f, 10, 0.9f, "note 2");
-        NoteModel::Point p3(50, 126.3f, 30, 0.9f, "note 3");
+        Event p1(20, 123.4f, 20, 0.8f, "note 1");
+        Event p2(20, 124.3f, 10, 0.9f, "note 2");
+        Event p3(50, 126.3f, 30, 0.9f, "note 3");
         m.setScaleUnits("Hz");
         m.addPoint(p1);
         m.addPoint(p2);
@@ -205,10 +207,10 @@
         m.toXml(str);
         str.flush();
         QString expected =
-            "<model id='3' name='' sampleRate='100' start='20' end='60' type='sparse' dimensions='3' resolution='10' notifyOnAdd='false' dataset='2'  subtype='note' valueQuantization='0' minimum='123.4' maximum='126.3' units='Hz'/>\n"
+            "<model id='3' name='' sampleRate='100' start='20' end='80' type='sparse' dimensions='3' resolution='10' notifyOnAdd='false' dataset='2' subtype='note' valueQuantization='0' minimum='123.4' maximum='126.3' units='Hz' />\n"
             "<dataset id='2' dimensions='3'>\n"
+            "  <point frame='20' value='124.3' duration='10' level='0.9' label='note 2' />\n"
             "  <point frame='20' value='123.4' duration='20' level='0.8' label='note 1' />\n"
-            "  <point frame='20' value='124.3' duration='10' level='0.9' label='note 2' />\n"
             "  <point frame='50' value='126.3' duration='30' level='0.9' label='note 3' />\n"
             "</dataset>\n";
         expected.replace("\'", "\"");
@@ -218,7 +220,6 @@
         }
         QCOMPARE(xml, expected);
     }
-    
         
 };