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

Passage des elements XML des schemas en anglais

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@76 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-03-09 19:18:55 +00:00
parent e90a2271a6
commit 1ddd93826c
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
conducer.cpp
View File

@@ -384,19 +384,19 @@ void Conducer::destroy() {
*/
bool Conducer::valideXml(QDomElement &e){
// verifie le nom du tag
if (e.tagName() != "conducteur") return(false);
if (e.tagName() != "conducer") return(false);
// verifie la presence des attributs minimaux
if (!e.hasAttribute("borne1")) return(false);
if (!e.hasAttribute("borne2")) return(false);
if (!e.hasAttribute("terminal1")) return(false);
if (!e.hasAttribute("terminal2")) return(false);
bool conv_ok;
// parse l'abscisse
e.attribute("borne1").toInt(&conv_ok);
e.attribute("terminal1").toInt(&conv_ok);
if (!conv_ok) return(false);
// parse l'ordonnee
e.attribute("borne2").toInt(&conv_ok);
e.attribute("terminal2").toInt(&conv_ok);
if (!conv_ok) return(false);
return(true);
}
@@ -752,9 +752,9 @@ bool Conducer::fromXml(QDomElement &e) {
}
QDomElement Conducer::toXml(QDomDocument &d, QHash<Terminal *, int> &table_adr_id) const {
QDomElement e = d.createElement("conducteur");
e.setAttribute("borne1", table_adr_id.value(terminal1));
e.setAttribute("borne2", table_adr_id.value(terminal2));
QDomElement e = d.createElement("conducer");
e.setAttribute("terminal1", table_adr_id.value(terminal1));
e.setAttribute("terminal2", table_adr_id.value(terminal2));
e.setAttribute("num", text_item -> toPlainText());
// on n'exporte les segments du conducteur que si ceux-ci ont

20
diagram.cpp
View File

@@ -149,13 +149,13 @@ QDomDocument Diagram::toXml(bool diagram) {
QDomDocument document;
// racine de l'arbre XML
QDomElement racine = document.createElement("schema");
QDomElement racine = document.createElement("diagram");
// proprietes du schema
if (diagram) {
if (!border_and_inset.author().isNull()) racine.setAttribute("auteur", border_and_inset.author());
if (!border_and_inset.author().isNull()) racine.setAttribute("author", border_and_inset.author());
if (!border_and_inset.date().isNull()) racine.setAttribute("date", border_and_inset.date().toString("yyyyMMdd"));
if (!border_and_inset.title().isNull()) racine.setAttribute("titre", border_and_inset.title());
if (!border_and_inset.title().isNull()) racine.setAttribute("title", border_and_inset.title());
if (!border_and_inset.fileName().isNull()) racine.setAttribute("filename", border_and_inset.fileName());
if (!border_and_inset.folio().isNull()) racine.setAttribute("folio", border_and_inset.folio());
racine.setAttribute("cols", border_and_inset.nbColumn());
@@ -197,7 +197,7 @@ QDomDocument Diagram::toXml(bool diagram) {
// enregistrement des conducteurs
if (liste_conducers.isEmpty()) return(document);
QDomElement conducers = document.createElement("conducteurs");
QDomElement conducers = document.createElement("conducers");
foreach(Conducer *cond, liste_conducers) {
conducers.appendChild(cond -> toXml(document, table_adr_id));
}
@@ -221,12 +221,12 @@ bool Diagram::fromXml(QDomDocument &document, QPointF position, bool consider_in
QDomElement racine = document.documentElement();
// le premier element doit etre un schema
/// @todo renommer schema en diagram
if (racine.tagName() != "schema") return(false);
if (racine.tagName() != "diagram") return(false);
// lecture des attributs de ce schema
if (consider_informations) {
border_and_inset.setAuthor(racine.attribute("auteur"));
border_and_inset.setTitle(racine.attribute("titre"));
border_and_inset.setAuthor(racine.attribute("author"));
border_and_inset.setTitle(racine.attribute("title"));
border_and_inset.setDate(QDate::fromString(racine.attribute("date"), "yyyyMMdd"));
border_and_inset.setFileName(racine.attribute("filename"));
border_and_inset.setFolio(racine.attribute("folio"));
@@ -317,15 +317,15 @@ bool Diagram::fromXml(QDomDocument &document, QPointF position, bool consider_in
for (QDomNode node = racine.firstChild() ; !node.isNull() ; node = node.nextSibling()) {
// on s'interesse a l'element XML "conducteurs" (= groupe de conducteurs)
QDomElement conducers = node.toElement();
if(conducers.isNull() || conducers.tagName() != "conducteurs") continue;
if(conducers.isNull() || conducers.tagName() != "conducers") continue;
// parcours des enfants de l'element XML "conducteurs"
for (QDomNode n = conducers.firstChild() ; !n.isNull() ; n = n.nextSibling()) {
// on s'interesse a l'element XML "element" (elements eux-memes)
QDomElement f = n.toElement();
if (f.isNull() || !Conducer::valideXml(f)) continue;
// verifie que les bornes que le conducteur relie sont connues
int id_p1 = f.attribute("borne1").toInt();
int id_p2 = f.attribute("borne2").toInt();
int id_p1 = f.attribute("terminal1").toInt();
int id_p2 = f.attribute("terminal2").toInt();
if (table_adr_id.contains(id_p1) && table_adr_id.contains(id_p2)) {
// pose le conducteur... si c'est possible
Terminal *p1 = table_adr_id.value(id_p1);

8
element.cpp
View File

@@ -299,7 +299,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr) {
ce recensement servira lors de la mise en place des fils
*/
QList<QDomElement> liste_terminals;
foreach(QDomElement qde, findInDomElement(e, "bornes", "borne")) {
foreach(QDomElement qde, findInDomElement(e, "terminals", "terminal")) {
if (Terminal::valideXml(qde)) liste_terminals << qde;
}
@@ -347,7 +347,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr) {
setPos(e.attribute("x").toDouble(), e.attribute("y").toDouble());
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
bool conv_ok;
int read_ori = e.attribute("sens").toInt(&conv_ok);
int read_ori = e.attribute("orientation").toInt(&conv_ok);
if (!conv_ok || read_ori < 0 || read_ori > 3) read_ori = defaultOrientation();
setOrientation((Terminal::Orientation)read_ori);
setSelected(e.attribute("selected") == "selected");
@@ -375,7 +375,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
element.setAttribute("x", pos().x());
element.setAttribute("y", pos().y());
if (isSelected()) element.setAttribute("selected", "selected");
element.setAttribute("sens", QString("%1").arg(orientation()));
element.setAttribute("orientation", QString("%1").arg(orientation()));
/* recupere le premier id a utiliser pour les bornes de cet element */
int id_terminal = 0;
@@ -389,7 +389,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
}
// enregistrement des bornes de l'appareil
QDomElement terminals = document.createElement("bornes");
QDomElement terminals = document.createElement("terminals");
// pour chaque enfant de l'element
foreach(QGraphicsItem *child, children()) {
// si cet enfant est une borne

4
terminal.cpp
View File

@@ -364,7 +364,7 @@ QList<Conducer *> Terminal::conducers() const {
@return un QDomElement representant cette borne
*/
QDomElement Terminal::toXml(QDomDocument &doc) const {
QDomElement qdo = doc.createElement("borne");
QDomElement qdo = doc.createElement("terminal");
qdo.setAttribute("x", amarrage_elmt.x());
qdo.setAttribute("y", amarrage_elmt.y());
qdo.setAttribute("orientation", sens);
@@ -378,7 +378,7 @@ QDomElement Terminal::toXml(QDomDocument &doc) const {
*/
bool Terminal::valideXml(QDomElement &terminal) {
// verifie le nom du tag
if (terminal.tagName() != "borne") return(false);
if (terminal.tagName() != "terminal") return(false);
// verifie la presence des attributs minimaux
if (!terminal.hasAttribute("x")) return(false);