Mercurial > hg > svgui

changeset 1439:b22a4df37095 single-point

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to using export IDs stored in XmlExportables
author Chris Cannam
date Thu, 28 Mar 2019 11:55:31 +0000
parents 09d008b5c8f4
children 5554d5187494
files layer/Layer.cpp view/View.cpp
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/layer/Layer.cpp	Fri Mar 22 17:49:15 2019 +0000
+++ b/layer/Layer.cpp	Thu Mar 28 11:55:31 2019 +0000
@@ -647,9 +647,9 @@
     stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5")
         .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
-        .arg(getObjectExportId(this))
+        .arg(getExportId())
         .arg(encodeEntities(objectName()))
-        .arg(getObjectExportId(getModel()))
+        .arg(getModel() ? getModel()->getExportId() : -1)
         .arg(extraAttributes);
 
     if (m_measureRects.empty()) {
@@ -681,9 +681,9 @@
     stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n")
         .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
-        .arg(getObjectExportId(this))
+        .arg(getExportId())
         .arg(encodeEntities(objectName()))
-        .arg(getObjectExportId(getModel()))
+        .arg(getModel() ? getModel()->getExportId() : -1)
         .arg(extraAttributes);
 }
 
--- a/view/View.cpp	Fri Mar 22 17:49:15 2019 +0000
+++ b/view/View.cpp	Thu Mar 28 11:55:31 2019 +0000
@@ -234,7 +234,7 @@
     for (LayerList::const_iterator i = m_layerStack.begin();
          i != m_layerStack.end(); ++i) { 
         if ((*i)->needsTextLabelHeight()) {
-            sortedLayers[getObjectExportId(*i)] = *i;
+            sortedLayers[(*i)->getExportId()] = *i;
         }
     }