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

Update number of terminal, add new constructor and setNumber function.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2610 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
cfdev
2013-11-13 11:55:27 +00:00
parent 319ef76b86
commit 7541214038
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sources/terminal.cpp
View File

@@ -71,12 +71,12 @@ void Terminal::init(QPointF pf, QET::Orientation o, QString number) {
@param e Element auquel cette borne appartient @param e Element auquel cette borne appartient
@param s Scene sur laquelle figure cette borne @param s Scene sur laquelle figure cette borne
*/ */
Terminal::Terminal(QPointF pf, QET::Orientation o, QString num, Element *e, Diagram *s) : Terminal::Terminal(QPointF pf, QET::Orientation o, Element *e, Diagram *s) :
QGraphicsItem(e, s), QGraphicsItem(e, s),
parent_element_(e), parent_element_(e),
hovered_color_(Terminal::neutralColor) hovered_color_(Terminal::neutralColor)
{ {
init(pf, o, num); init(pf, o, "_");
} }
/** /**
@@ -87,12 +87,28 @@ Terminal::Terminal(QPointF pf, QET::Orientation o, QString num, Element *e, Diag
@param e Element auquel cette borne appartient @param e Element auquel cette borne appartient
@param s Scene sur laquelle figure cette borne @param s Scene sur laquelle figure cette borne
*/ */
Terminal::Terminal(qreal pf_x, qreal pf_y, QET::Orientation o, QString num, Element *e, Diagram *s) : Terminal::Terminal(qreal pf_x, qreal pf_y, QET::Orientation o, Element *e, Diagram *s) :
QGraphicsItem(e, s), QGraphicsItem(e, s),
parent_element_(e), parent_element_(e),
hovered_color_(Terminal::neutralColor) hovered_color_(Terminal::neutralColor)
{ {
init(QPointF(pf_x, pf_y), o, num); init(QPointF(pf_x, pf_y), o, "_");
}
/**
initialise une borne
@param pf position du point d'amarrage pour un conducteur
@param o orientation de la borne : Qt::Horizontal ou Qt::Vertical
@param num number of terminal (ex 3 - 4 for NO)
@param e Element auquel cette borne appartient
@param s Scene sur laquelle figure cette borne
*/
Terminal::Terminal(QPointF pf, QET::Orientation o, QString num, Element *e, Diagram *s) :
QGraphicsItem(e, s),
parent_element_(e),
hovered_color_(Terminal::neutralColor)
{
init(pf, o, num);
} }
/** /**
@@ -128,6 +144,15 @@ QET::Orientation Terminal::orientation() const {
} else return(ori_); } else return(ori_);
} }
/**
* @brief Terminal::setNumber
* @param number
*/
void Terminal::setNumber(QString number) {
number_terminal_ = number;
}
/** /**
Attribue un conductor a la borne Attribue un conductor a la borne
@param f Le conducteur a rattacher a cette borne @param f Le conducteur a rattacher a cette borne
@@ -489,7 +514,7 @@ bool Terminal::fromXml(QDomElement &terminal) {
qFuzzyCompare(terminal.attribute("x").toDouble(), dock_elmt_.x()) && qFuzzyCompare(terminal.attribute("x").toDouble(), dock_elmt_.x()) &&
qFuzzyCompare(terminal.attribute("y").toDouble(), dock_elmt_.y()) && qFuzzyCompare(terminal.attribute("y").toDouble(), dock_elmt_.y()) &&
terminal.attribute("orientation").toInt() == ori_ && terminal.attribute("orientation").toInt() == ori_ &&
terminal.attribute("number").toInt() == number_terminal_ terminal.attribute("number") == number_terminal_
); );
} }
@@ -506,3 +531,4 @@ Diagram *Terminal::diagram() const {
Element *Terminal::parentElement() const { Element *Terminal::parentElement() const {
return(parent_element_); return(parent_element_);
} }

4
sources/terminal.h
View File

@@ -31,8 +31,9 @@ class Terminal : public QGraphicsItem {
// constructors, destructor // constructors, destructor
public: public:
Terminal(QPointF, QET::Orientation, Element * = 0, Diagram * = 0);
Terminal(qreal, qreal, QET::Orientation, Element * = 0, Diagram * = 0);
Terminal(QPointF, QET::Orientation, QString number, Element * = 0, Diagram * = 0); Terminal(QPointF, QET::Orientation, QString number, Element * = 0, Diagram * = 0);
Terminal(qreal, qreal, QET::Orientation, QString number, Element * = 0, Diagram * = 0);
virtual ~Terminal(); virtual ~Terminal();
private: private:
@@ -62,6 +63,7 @@ class Terminal : public QGraphicsItem {
QET::Orientation orientation() const; QET::Orientation orientation() const;
QPointF dockConductor() const; QPointF dockConductor() const;
QString number() const; QString number() const;
void setNumber(QString number);
void updateConductor(); void updateConductor();
bool isLinkedTo(Terminal *); bool isLinkedTo(Terminal *);
bool canBeLinkedTo(Terminal *); bool canBeLinkedTo(Terminal *);