comparison base/Event.h @ 1663:a77a7e8c085c single-point

Update ImageModel

     Event withLabel(QString label) const {
         Event p(*this);
         p.m_label = label;
         return p;
     }
+
+    bool hasUri() const { return m_uri != QString(); }
+    QString getURI() const { return m_uri; }
+
+    Event withURI(QString uri) const {
+        Event p(*this);
+        p.m_uri = uri;
+        return p;
+    }
     
     bool hasLevel() const { return m_haveLevel; }
     float getLevel() const { return m_haveLevel ? m_level : 0.f; }
 
     Event withLevel(float level) const {

         if (m_haveReferenceFrame != p.m_haveReferenceFrame) return false;
         if (m_haveReferenceFrame &&
             (m_referenceFrame != p.m_referenceFrame)) return false;
         
         if (m_label != p.m_label) return false;
+        if (m_uri != p.m_uri) return false;
         
         return true;
     }
 
     bool operator!=(const Event &p) const {

         }
         if (m_haveReferenceFrame && (m_referenceFrame != p.m_referenceFrame)) {
             return m_referenceFrame < p.m_referenceFrame;
         }
         
-        return m_label < p.m_label;
+        if (m_label != p.m_label) {
+            return m_label < p.m_label;
+        }
+        return m_uri < p.m_uri;
     }
 
     void toXml(QTextStream &stream,
                QString indent = "",
                QString extraAttributes = "") const {

         if (m_haveLevel) stream << QString("level=\"%1\" ").arg(m_level);
         if (m_haveReferenceFrame) stream << QString("referenceFrame=\"%1\" ")
                                       .arg(m_referenceFrame);
         stream << QString("label=\"%1\" ")
             .arg(XmlExportable::encodeEntities(m_label));
+        if (m_uri != QString()) {
+            stream << QString("uri=\"%1\" ")
+                .arg(XmlExportable::encodeEntities(m_uri));
+        }
         stream << extraAttributes << "/>\n";
     }
 
     QString toXmlString(QString indent = "",
                         QString extraAttributes = "") const {

                 list << QString("%1").arg(m_level);
             }
         }
         
         if (m_label != "") list << m_label;
+        if (m_uri != "") list << m_uri;
         
         return list.join(delimiter);
     }
 
     uint hash(uint seed = 0) const {

         if (m_haveValue) h ^= qHash(m_value);
         if (m_haveLevel) h ^= qHash(m_level);
         h ^= qHash(m_frame);
         if (m_haveDuration) h ^= qHash(m_duration);
         if (m_haveReferenceFrame) h ^= qHash(m_referenceFrame);
+        h ^= qHash(m_uri);
         return h;
     }
     
 private:
     // The order of fields here is chosen to minimise overall size of struct.

     float m_level;
     sv_frame_t m_frame;
     sv_frame_t m_duration;
     sv_frame_t m_referenceFrame;
     QString m_label;
+    QString m_uri;
 };
 
 inline uint qHash(const Event &e, uint seed = 0) {
     return e.hash(seed);
 }