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

Fixed ghost elements.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1944 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-09-27 18:59:16 +00:00
parent 787b292056
commit 808ea1f494
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/ghostelement.cpp
View File

@@ -19,6 +19,7 @@
#include "qet.h" #include "qet.h"
#include "terminal.h" #include "terminal.h"
#include "elementtextitem.h" #include "elementtextitem.h"
#include "diagramcommands.h"
/** /**
Constructeur Constructeur
@@ -53,7 +54,7 @@ GhostElement::~GhostElement() {
ajouter les bons couples (id, adresse). ajouter les bons couples (id, adresse).
@return true si l'import a reussi, false sinon @return true si l'import a reussi, false sinon
*/ */
bool GhostElement::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr) { bool GhostElement::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool handle_inputs_rotation) {
// instancie les bornes decrites dans l'element XML // instancie les bornes decrites dans l'element XML
terminalsFromXml(e, table_id_adr); terminalsFromXml(e, table_id_adr);
@@ -78,14 +79,19 @@ bool GhostElement::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr)
// on peut desormais confectionner le rendu de l'element // on peut desormais confectionner le rendu de l'element
generateDrawings(); generateDrawings();
// position, selection et orientation // position, selection
setPos(e.attribute("x").toDouble(), e.attribute("y").toDouble()); setPos(e.attribute("x").toDouble(), e.attribute("y").toDouble());
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
// orientation
bool conv_ok; bool conv_ok;
int read_ori = e.attribute("orientation").toInt(&conv_ok); int read_ori = e.attribute("orientation").toInt(&conv_ok);
if (!conv_ok || read_ori < 0 || read_ori > 3) read_ori = ori.defaultOrientation(); if (!conv_ok || read_ori < 0 || read_ori > 3) read_ori = ori.defaultOrientation();
if (handle_inputs_rotation) {
RotateElementsCommand::rotateElement(this, (QET::Orientation)read_ori);
} else {
setOrientation((QET::Orientation)read_ori); setOrientation((QET::Orientation)read_ori);
}
return(true); return(true);
} }

2
sources/ghostelement.h
View File

@@ -44,7 +44,7 @@ class GhostElement : public CustomElement {
// methodes // methodes
public: public:
bool fromXml(QDomElement &, QHash<int, Terminal *> &); virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false);
protected: protected:
QRectF minimalBoundingRect() const; QRectF minimalBoundingRect() const;