kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 00:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into terminal_strip

Browse Source
This commit is contained in:
joshua
2021-05-21 19:18:16 +02:00
parent 507c1b4f73 fdbfca9a8c
commit 6660caa70f
26 changed files with 250 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/qetproject.cpp
View File

@@ -1420,15 +1420,13 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
QDomElement diagram_xml_element = diagram_nodes
.at(i)
.toElement();
Diagram *diagram = new Diagram(this);
auto diagram = new Diagram(this);
m_diagrams_list << diagram;
int diagram_order = -1;
if (!QET::attributeIsAnInteger(diagram_xml_element,
QStringLiteral("order"),
&diagram_order))
diagram_order = 500000;
addDiagram(diagram, diagram_order-1);
connect(&diagram->border_and_titleblock, &BorderTitleBlock::needFolioData,
this, &QETProject::updateDiagramsFolioData);
connect(diagram, &Diagram::usedTitleBlockTemplateChanged,
this, &QETProject::usedTitleBlockTemplateChanged);
diagram->initFromXml(diagram_xml_element);
if(dlgWaiting)
@@ -1436,6 +1434,8 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
}
}
updateDiagramsFolioData();
//Initialise links between elements in this project
//and refresh the text of conductor
if(dlgWaiting)