comparison data/model/PathModel.h @ 1677:f97d64b8674f single-point

Make XmlExportables store their export IDs and always obtain a new one, avoiding reuse when an object is allocated at the same heap location as a previous one. This makes the ID system stable enough to be used in the export tests.

      * XmlExportable methods.
      */
     void toXml(QTextStream &out,
                        QString indent = "",
                        QString extraAttributes = "") const override {
+
+        // Our dataset doesn't have its own export ID, we just use
+        // ours. Actually any model could do that, since datasets
+        // aren't in the same id-space as models when re-read
         
         Model::toXml
             (out,
              indent,
              QString("type=\"sparse\" dimensions=\"2\" resolution=\"%1\" "
                      "notifyOnAdd=\"%2\" dataset=\"%3\" subtype=\"path\" %4")
              .arg(m_resolution)
              .arg("true") // always true after model reaches 100% -
                           // subsequent points are always notified
-             .arg(getObjectExportId(&m_points))
+             .arg(getExportId())
              .arg(extraAttributes));
 
         out << indent << QString("<dataset id=\"%1\" dimensions=\"2\">\n")
-            .arg(getObjectExportId(&m_points));
+            .arg(getExportId());
         
         for (PathPoint p: m_points) {
             p.toXml(out, indent + "  ", "");
         }