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

Conductor Autonum now works with variables. Folio Autonumberings added to conductor autonum

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4674 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-08-29 15:37:42 +00:00
parent 342b69b210
commit 230700f845
31 changed files with 604 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
sources/qetproject.cpp
View File

@@ -424,6 +424,14 @@ QHash <QString, QString> QETProject::elementAutoNumHash() {
return m_element_autonum_formula;
}
/**
* @brief QETProject::conductorAutoNumHash
* @return Title and Formula Hash
*/
QHash <QString, QString> QETProject::conductorAutoNumHash() {
return m_conductor_autonum_formula;
}
/**
* @brief QETProject::elementAutoNumFormula
* @param element autonum title
@@ -436,13 +444,32 @@ QString QETProject::elementAutoNumFormula (QString key) const {
}
/**
* @brief QETProject::elementAutoNumFormula
* @brief QETProject::conductorAutoNumFormula
* @param conductor autonum title
* @return Formula of element autonum stored in conductor autonum
*/
QString QETProject::conductorAutoNumFormula (QString key) const {
if (m_conductor_autonum.contains(key))
return m_conductor_autonum_formula[key];
else return "";
}
/**
* @brief QETProject::elementAutoNumCurrentFormula
* @return current formula being used by project
*/
QString QETProject::elementAutoNumFormula () const {
QString QETProject::elementAutoNumCurrentFormula() const {
return m_current_element_formula;
}
/**
* @brief QETProject::conductorAutoNumCurrentFormula
* @return current formula being used by project
*/
QString QETProject::conductorAutoNumCurrentFormula() const {
return m_current_conductor_formula;
}
/**
* @brief QETProject::elementCurrentAutoNum
* @return current element autonum title
@@ -451,6 +478,14 @@ QString QETProject::elementCurrentAutoNum () const {
return m_current_element_autonum;
}
/**
* @brief QETProject::conductorCurrentAutoNum
* @return current element autonum title
*/
QString QETProject::conductorCurrentAutoNum () const {
return m_current_conductor_autonum;
}
/**
* @brief QETProject::folioAutoNum
* @return All value of folio autonum stored in project
@@ -470,6 +505,26 @@ void QETProject::addConductorAutoNum(QString key, NumerotationContext context) {
m_conductor_autonum.insert(key, context);
}
/**
* @brief QETProject::addConductorAutoNumFormula
* Add the new formula
* @param formula
*/
void QETProject::addConductorAutoNumFormula(QString key, QString formula) {
m_conductor_autonum_formula.insert(key, formula);
}
/**
* @brief QETProject::setConductorAutoNumCurrentFormula
* Add the formula and title to the current formula and current autonum
* @param formula
* @param title
*/
void QETProject::setConductorAutoNumCurrentFormula(QString formula, QString title) {
m_current_conductor_formula = formula;
m_current_conductor_autonum = title;
}
/**
* @brief QETProject::addElementAutoNumFormula
* Add the new formula
@@ -1049,7 +1104,7 @@ QList <Diagram *> QETProject::addNewDiagramFolioList() {
diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties());
diagram_folio_list -> defaultConductorProperties = defaultConductorProperties();
diagram_folio_list -> border_and_titleblock.setTitle(tr("Liste des Folios"));
diagram_folio_list -> border_and_titleblock.setTitle(tr("Liste des Folios"));
// no need to display rows and columns
diagram_folio_list -> border_and_titleblock.displayRows(false);
diagram_folio_list -> border_and_titleblock.displayColumns(false);
@@ -1353,11 +1408,14 @@ void QETProject::readDefaultPropertiesXml(QDomDocument &xml_project)
}
if (!conds_autonums.isNull())
{
m_current_conductor_autonum = conds_autonums.attribute("current_autonum");
m_current_conductor_formula = conds_autonums.attribute("current_formula");
foreach (QDomElement elmt, QET::findInDomElement(conds_autonums, "conductor_autonum"))
{
NumerotationContext nc;
nc.fromXml(elmt);
m_conductor_autonum.insert(elmt.attribute("title"), nc);
m_conductor_autonum_formula.insert(elmt.attribute("title"),elmt.attribute("formula"));
}
}
if (!folio_autonums.isNull())
@@ -1434,14 +1492,19 @@ void QETProject::writeDefaultPropertiesXml(QDomElement &xml_element) {
}
xml_element.appendChild(xrefs_elmt);
//Export conductors autonums
QDomElement conds_autonums = xml_document.createElement("conductors_autonums");
//Export Conductor Autonums
QDomElement conductor_autonums = xml_document.createElement("conductors_autonums");
conductor_autonums.setAttribute("current_autonum", m_current_conductor_autonum);
conductor_autonums.setAttribute("current_formula", m_current_conductor_formula);
foreach (QString key, conductorAutoNum().keys()) {
QDomElement cond_autonum = conductorAutoNum(key).toXml(xml_document, "conductor_autonum");
cond_autonum.setAttribute("title", key);
conds_autonums.appendChild(cond_autonum);
QDomElement conductor_autonum = conductorAutoNum(key).toXml(xml_document, "conductor_autonum");
if (key != "" && conductorAutoNumFormula(key) != "") {
conductor_autonum.setAttribute("title", key);
conductor_autonum.setAttribute("formula", conductorAutoNumFormula(key));
conductor_autonums.appendChild(conductor_autonum);
}
}
xml_element.appendChild(conds_autonums);
xml_element.appendChild(conductor_autonums);
//Export Folio Autonums
QDomElement folio_autonums = xml_document.createElement("folio_autonums");