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

Fix Multiple Folio Sequential Autonumberings. Corrects save/open behavior for folio sequentials in projects with multiple autonums

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4666 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-08-25 16:28:11 +00:00
parent 5575959a9e
commit 1ad45dbc80
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sources/diagram.cpp
View File

@@ -480,20 +480,19 @@ QDomDocument Diagram::toXml(bool whole_content) {
//Folio Sequential Variables //Folio Sequential Variables
if (!m_elmt_unitfolio_max.isEmpty() || !m_elmt_tenfolio_max.isEmpty() || !m_elmt_hundredfolio_max.isEmpty()) { if (!m_elmt_unitfolio_max.isEmpty() || !m_elmt_tenfolio_max.isEmpty() || !m_elmt_hundredfolio_max.isEmpty()) {
QDomElement folioContainedAutonum = document.createElement("elementautonumfoliosequentials"); QDomElement folioContainedAutonum = document.createElement("elementautonumfoliosequentials");
QHash<QString, QStringList>::iterator i;
if (!m_elmt_unitfolio_max.isEmpty()) { if (!m_elmt_unitfolio_max.isEmpty()) {
QDomElement elmtfolioseq = document.createElement("elementunitfolioseq"); QDomElement elmtfolioseq = document.createElement("elementunitfolioseq");
elementFolioSequentialsToXml(&m_elmt_unitfolio_max, &elmtfolioseq, "sequf_"); elementFolioSequentialsToXml(&m_elmt_unitfolio_max, &elmtfolioseq, "sequf_", "unitfolioseq", &document);
folioContainedAutonum.appendChild(elmtfolioseq); folioContainedAutonum.appendChild(elmtfolioseq);
} }
if (!m_elmt_tenfolio_max.isEmpty()) { if (!m_elmt_tenfolio_max.isEmpty()) {
QDomElement elmtfolioseq = document.createElement("elementtenfolioseq"); QDomElement elmtfolioseq = document.createElement("elementtenfolioseq");
elementFolioSequentialsToXml(&m_elmt_tenfolio_max, &elmtfolioseq, "seqtf_"); elementFolioSequentialsToXml(&m_elmt_tenfolio_max, &elmtfolioseq, "seqtf_", "tenfolioseq", &document);
folioContainedAutonum.appendChild(elmtfolioseq); folioContainedAutonum.appendChild(elmtfolioseq);
} }
if (!m_elmt_hundredfolio_max.isEmpty()) { if (!m_elmt_hundredfolio_max.isEmpty()) {
QDomElement elmtfolioseq = document.createElement("elementhundredfolioseq"); QDomElement elmtfolioseq = document.createElement("elementhundredfolioseq");
elementFolioSequentialsToXml(&m_elmt_hundredfolio_max, &elmtfolioseq, "seqhf_"); elementFolioSequentialsToXml(&m_elmt_hundredfolio_max, &elmtfolioseq, "seqhf_", "hundredfolioseq", &document);
folioContainedAutonum.appendChild(elmtfolioseq); folioContainedAutonum.appendChild(elmtfolioseq);
} }
racine.appendChild(folioContainedAutonum); racine.appendChild(folioContainedAutonum);
@@ -601,13 +600,15 @@ QDomDocument Diagram::toXml(bool whole_content) {
+ * @param hash to retrieve content with content + * @param hash to retrieve content with content
+ * @param sequential type + * @param sequential type
+ */ + */
void Diagram::elementFolioSequentialsToXml(QHash<QString, QStringList> *hash, QDomElement *domElement, QString seq_type) { void Diagram::elementFolioSequentialsToXml(QHash<QString, QStringList> *hash, QDomElement *domElement, QString seq_type, QString type, QDomDocument *doc) {
QHash<QString, QStringList>::iterator i; QHash<QString, QStringList>::iterator i;
for (i = hash->begin(); i != hash->end(); i++) { for (i = hash->begin(); i != hash->end(); i++) {
domElement->setAttribute("title", i.key()); QDomElement folioseq = doc->createElement(type);
folioseq.setAttribute("title", i.key());
for (int j = 0; j < i.value().size(); j++) { for (int j = 0; j < i.value().size(); j++) {
domElement->setAttribute(seq_type + QString::number(j+1), i.value().at(j)); folioseq.setAttribute(seq_type + QString::number(j+1), i.value().at(j));
} }
domElement->appendChild(folioseq);
} }
} }
@@ -701,9 +702,9 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
// Load Freeze New Element // Load Freeze New Element
m_freeze_new_elements_ = root.attribute("freezeNewElement").toInt(); m_freeze_new_elements_ = root.attribute("freezeNewElement").toInt();
elementFolioSequentialsFromXml(root, &m_elmt_unitfolio_max, "elementunitfolioseq","sequf_"); elementFolioSequentialsFromXml(root, &m_elmt_unitfolio_max, "elementunitfolioseq","sequf_","unitfolioseq");
elementFolioSequentialsFromXml(root, &m_elmt_tenfolio_max, "elementtenfolioseq","seqtf_"); elementFolioSequentialsFromXml(root, &m_elmt_tenfolio_max, "elementtenfolioseq","seqtf_", "tenfolioseq");
elementFolioSequentialsFromXml(root, &m_elmt_hundredfolio_max, "elementhundredfolioseq","seqhf_"); elementFolioSequentialsFromXml(root, &m_elmt_hundredfolio_max, "elementhundredfolioseq","seqhf_", "hundredfolioseq");
} }
// if child haven't got a child, loading is finish (diagram is empty) // if child haven't got a child, loading is finish (diagram is empty)
@@ -884,17 +885,20 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
* @param hash to be loaded with content * @param hash to be loaded with content
* @param folioSeq type * @param folioSeq type
* @param seq type * @param seq type
* @param type of sequential
*/ */
void Diagram::elementFolioSequentialsFromXml(const QDomElement &root, QHash<QString, QStringList>* hash, QString folioSeq, QString seq) { void Diagram::elementFolioSequentialsFromXml(const QDomElement &root, QHash<QString, QStringList>* hash, QString folioSeq, QString seq, QString type) {
foreach (QDomElement folioSeqAutoNum, QET::findInDomElement(root, "elementautonumfoliosequentials", folioSeq)) { foreach (QDomElement folioSeqAutoNum, QET::findInDomElement(root, "elementautonumfoliosequentials", folioSeq)) {
QString title = folioSeqAutoNum.attribute("title"); for(QDomElement folioseq = folioSeqAutoNum.firstChildElement(type); !folioseq.isNull(); folioseq = folioseq.nextSiblingElement(type)) {
QStringList unit; QString title = folioseq.attribute("title");
int i = 1; QStringList list;
while (folioSeqAutoNum.hasAttribute(seq + QString::number(i))) { int i = 1;
unit << folioSeqAutoNum.attribute(seq + QString::number(i)); while (folioseq.hasAttribute(seq + QString::number(i))) {
i++; list << folioseq.attribute(seq + QString::number(i));
i++;
}
hash->insert(title,list);
} }
hash->insert(title,unit);
} }
} }

4
sources/diagram.h
View File

@@ -158,8 +158,8 @@ class Diagram : public QGraphicsScene
void write(const QDomElement &); void write(const QDomElement &);
bool wasWritten() const; bool wasWritten() const;
QDomElement writeXml(QDomDocument &) const; QDomElement writeXml(QDomDocument &) const;
void elementFolioSequentialsToXml(QHash<QString, QStringList>*, QDomElement *, QString); void elementFolioSequentialsToXml(QHash<QString, QStringList>*, QDomElement *, QString, QString, QDomDocument *);
void elementFolioSequentialsFromXml(const QDomElement&, QHash<QString, QStringList>*, QString, QString); void elementFolioSequentialsFromXml(const QDomElement&, QHash<QString, QStringList>*, QString, QString, QString);
// methods related to graphics items addition/removal on the diagram // methods related to graphics items addition/removal on the diagram
void initElementsLinks(); void initElementsLinks();

2
sources/projectview.cpp
View File

@@ -897,6 +897,8 @@ void ProjectView::loadDiagrams() {
addDiagram(sv); addDiagram(sv);
} }
this->currentDiagram()->diagram()->loadElmtFolioSeq();
// If project have the folios list, move it at the beginning of the project // If project have the folios list, move it at the beginning of the project
if (m_project -> getFolioSheetsQuantity()) { if (m_project -> getFolioSheetsQuantity()) {
for (int i = 0; i < m_project->getFolioSheetsQuantity(); i++) for (int i = 0; i < m_project->getFolioSheetsQuantity(); i++)

2
sources/ui/autonumberingdockwidget.cpp
View File

@@ -154,7 +154,7 @@ void AutoNumberingDockWidget::setActive() {
//Element //Element
QString element_formula = project_->elementAutoNumFormula(); QString element_formula = project_->elementAutoNumFormula();
QString active_element_autonum = project_->elementAutoNumHash().key(element_formula); QString active_element_autonum = project_->elementCurrentAutoNum();
int el_index = ui->m_element_cb->findText(active_element_autonum); int el_index = ui->m_element_cb->findText(active_element_autonum);
ui->m_element_cb->setCurrentIndex(el_index); ui->m_element_cb->setCurrentIndex(el_index);