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

Line editor : use QPropertyUndoCommand instead of ChangePartCommand

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4068 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-23 10:52:56 +00:00
parent 65d4b08c86
commit 5b8a6a9745
5 changed files with 213 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
sources/editor/graphicspart/partline.cpp
View File

@@ -139,46 +139,6 @@ void PartLine::fromXml(const QDomElement &qde) {
second_length = qde.attribute("length2", "1.5").toDouble();
}
/**
* @brief PartLine::p1
* @return the point p1 of line.
*/
QPointF PartLine::p1() const {
return m_line.p1();
}
/**
* @brief PartLine::setP1
* set first point to P1
* @param p1
*/
void PartLine::setP1(const QPointF &p1)
{
if (p1 == m_line.p1()) return;
prepareGeometryChange();
m_line.setP1(p1);
}
/**
* @brief PartLine::p2
* @return the point p2 of line
*/
QPointF PartLine::p2() const {
return m_line.p2();
}
/**
* @brief PartLine::setP2
* set second point to P2
* @param p2
*/
void PartLine::setP2(const QPointF &p2)
{
if (p2 == m_line.p2()) return;
prepareGeometryChange();
m_line.setP2(p2);
}
/**
* @brief PartLine::mousePressEvent
* Handle mouse press event
@@ -243,7 +203,7 @@ void PartLine::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
* @return the point p1 in scene coordinate
*/
QPointF PartLine::sceneP1() const {
return(mapToScene(p1()));
return(mapToScene(m_line.p1()));
}
/**
@@ -251,7 +211,7 @@ QPointF PartLine::sceneP1() const {
* @return the point p2 in scen coordinate
*/
QPointF PartLine::sceneP2() const {
return(mapToScene(p2()));
return(mapToScene(m_line.p2()));
}
/**
@@ -406,10 +366,10 @@ void PartLine::debugPaint(QPainter *painter)
painter -> setPen(Qt::red);
foreach(QPointF pointy, fourEndPoints(p1(), p2(), first_length))
foreach(QPointF pointy, fourEndPoints(m_line.p1(), m_line.p2(), first_length))
painter -> drawEllipse(pointy, 0.1, 0.1);
foreach(QPointF pointy, fourEndPoints(p2(), p1(), second_length))
foreach(QPointF pointy, fourEndPoints(m_line.p2(), m_line.p1(), second_length))
painter -> drawEllipse(pointy, 0.1, 0.1);
painter -> restore();
@@ -526,11 +486,44 @@ QLineF PartLine::line() const {
void PartLine::setLine(const QLineF &line)
{
if (m_line != line)
{
prepareGeometryChange();
m_line = line;
}
if (m_line == line) return;
prepareGeometryChange();
m_line = line;
emit lineChanged();
}
void PartLine::setFirstEndType(const Qet::EndType &et)
{
if (first_end == et) return;
prepareGeometryChange();
first_end = et;
emit firstEndTypeChanged();
}
void PartLine::setSecondEndType(const Qet::EndType &et)
{
if (second_end == et) return;
prepareGeometryChange();
second_end = et;
emit secondEndTypeChanged();
}
void PartLine::setFirstEndLength(const qreal &l)
{
qreal length = qMin(qAbs(l), m_line.length());
if (first_length == length) return;
prepareGeometryChange();
first_length = length;
emit firstEndLengthChanged();
}
void PartLine::setSecondEndLength(const qreal &l)
{
qreal length = qMin(qAbs(l), m_line.length());
if (second_length == length) return;
prepareGeometryChange();
second_length = length;
emit secondEndLengthChanged();
}
/**

33
sources/editor/graphicspart/partline.h
View File

@@ -37,24 +37,25 @@ class PartLine : public CustomElementGraphicPart
{
Q_OBJECT
Q_PROPERTY(QPointF p1 READ p1 WRITE setP1)
Q_PROPERTY(QPointF p2 READ p2 WRITE setP2)
Q_PROPERTY(Qet::EndType end1 READ firstEndType WRITE setFirstEndType)
Q_PROPERTY(Qet::EndType end2 READ secondEndType WRITE setSecondEndType)
Q_PROPERTY(qreal length1 READ firstEndLength WRITE setFirstEndLength)
Q_PROPERTY(qreal length2 READ secondEndLength WRITE setSecondEndLength)
Q_PROPERTY(QLineF line READ line WRITE setLine)
// constructors, destructor
// constructors, destructor
public:
PartLine(QETElementEditor *, QGraphicsItem * = 0);
virtual ~PartLine();
private:
PartLine(const PartLine &);
// attributes
PartLine(QETElementEditor *, QGraphicsItem * = 0);
virtual ~PartLine();
private:
PartLine(const PartLine &);
signals:
void lineChanged();
void firstEndTypeChanged();
void secondEndTypeChanged();
void firstEndLengthChanged();
void secondEndLengthChanged();
// methods
@@ -85,18 +86,14 @@ class PartLine : public CustomElementGraphicPart
QLineF line() const;
void setLine(const QLineF &line);
QPointF p1() const;
void setP1 (const QPointF &p1);
QPointF p2 () const;
void setP2 (const QPointF &p2);
Qet::EndType firstEndType() const {return first_end;}
void setFirstEndType(const Qet::EndType &et) {first_end = et;}
void setFirstEndType(const Qet::EndType &et);
Qet::EndType secondEndType() const {return second_end;}
void setSecondEndType(const Qet::EndType &et) {second_end = et;}
void setSecondEndType(const Qet::EndType &et);
qreal firstEndLength() const {return first_length;}
void setFirstEndLength(const qreal &l) {first_length = qMin(qAbs(l), m_line.length());}
void setFirstEndLength(const qreal &l);
qreal secondEndLength() const {return second_length;}
void setSecondEndLength(const qreal &l) {second_length = qMin(qAbs(l), m_line.length());}
void setSecondEndLength(const qreal &l);
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);