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

Conductor autonumerotation: Remove one autonum per diagram and add global autonums for the project.

Browse Source 
several diagram can share the same autonumerotation.
This is first step, need to be improved and readd some feature (disabled for first step).


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3239 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-07-31 10:02:33 +00:00
parent d1730f39bd
commit 6fce7010f8
23 changed files with 643 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sources/diagram.cpp
View File

@@ -47,13 +47,13 @@ QColor Diagram::background_color = Qt::white;
*/
Diagram::Diagram(QObject *parent) :
QGraphicsScene(parent),
project_(0),
diagram_qet_version_(-1),
draw_grid_(true),
use_border_(true),
draw_terminals_(true),
draw_colored_conductors_(true),
project_(0),
read_only_(false),
diagram_qet_version_(-1)
read_only_(false)
{
qgi_manager_ = new QGIManager(this);
setBackgroundBrush(Qt::white);
@@ -204,6 +204,22 @@ void Diagram::keyReleaseEvent(QKeyEvent *e) {
}
}
/**
* @brief Diagram::conductorsAutonumName
* @return the name of autonum to use.
*/
QString Diagram::conductorsAutonumName() const {
return m_conductors_autonum_name;
}
/**
* @brief Diagram::setConductorsAutonumName
* @param name, name of autonum to use.
*/
void Diagram::setConductorsAutonumName(const QString &name) {
m_conductors_autonum_name= name;
}
/**
Exporte le schema vers une image
@return Une QImage representant le schema
@@ -327,13 +343,6 @@ QDomDocument Diagram::toXml(bool whole_content) {
QDomElement default_conductor = document.createElement("defaultconductor");
defaultConductorProperties.toXml(default_conductor);
racine.appendChild(default_conductor);
//autonumerotation of conductor
if (!getNumerotation(Diagram::Conductors).isEmpty()) {
QDomElement autonum = document.createElement("autonum");
autonum.appendChild(getNumerotation(Diagram::Conductors).toXml(document, "conductor"));
racine.appendChild(autonum);
}
}
document.appendChild(racine);
@@ -504,16 +513,6 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
if (!default_conductor_elmt.isNull()) {
defaultConductorProperties.fromXml(default_conductor_elmt);
}
// find the first element autonum
QDomElement num_auto = root.firstChildElement("autonum");
if (!num_auto.isNull()) {
QDomElement num_conductor = num_auto.firstChildElement("conductor");
//set the auto-numerotation of conductor
if (!num_conductor.isNull()) {
NumerotationContext nc(num_conductor);
setNumerotation(Diagram::Conductors, nc);
}
}
}
// si la racine n'a pas d'enfant : le chargement est fini (schema vide)