comparison layer/Layer.cpp @ 1439:b22a4df37095 single-point

Update to using export IDs stored in XmlExportables
author Chris Cannam
date Thu, 28 Mar 2019 11:55:31 +0000
parents c697186a8471
children 5554d5187494
comparison
equal deleted inserted replaced
1438:09d008b5c8f4 1439:b22a4df37095
645 } 645 }
646 646
647 stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5") 647 stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5")
648 .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName 648 .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
649 (LayerFactory::getInstance()->getLayerType(this)))) 649 (LayerFactory::getInstance()->getLayerType(this))))
650 .arg(getObjectExportId(this)) 650 .arg(getExportId())
651 .arg(encodeEntities(objectName())) 651 .arg(encodeEntities(objectName()))
652 .arg(getObjectExportId(getModel())) 652 .arg(getModel() ? getModel()->getExportId() : -1)
653 .arg(extraAttributes); 653 .arg(extraAttributes);
654 654
655 if (m_measureRects.empty()) { 655 if (m_measureRects.empty()) {
656 stream << QString("/>\n"); 656 stream << QString("/>\n");
657 return; 657 return;
679 } 679 }
680 680
681 stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n") 681 stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n")
682 .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName 682 .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
683 (LayerFactory::getInstance()->getLayerType(this)))) 683 (LayerFactory::getInstance()->getLayerType(this))))
684 .arg(getObjectExportId(this)) 684 .arg(getExportId())
685 .arg(encodeEntities(objectName())) 685 .arg(encodeEntities(objectName()))
686 .arg(getObjectExportId(getModel())) 686 .arg(getModel() ? getModel()->getExportId() : -1)
687 .arg(extraAttributes); 687 .arg(extraAttributes);
688 } 688 }
689 689