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

Basic Shapes: Move coords corrected for XML, DXF export

Browse Source 
(Bounding Rectangle had to be updated with each move)



git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2912 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
abhishekm71
2014-03-07 12:34:47 +00:00
parent b969f86d55
commit 7242854045
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/diagramcommands.cpp
View File

@@ -497,6 +497,10 @@ void MoveElementsCommand::move(const QPointF &actual_movement) {
// deplace les shapes // deplace les shapes
foreach (QetShapeItem *dsi, content_to_move.shapes) { foreach (QetShapeItem *dsi, content_to_move.shapes) {
dsi -> setPos(dsi -> pos() + actual_movement); dsi -> setPos(dsi -> pos() + actual_movement);
QRectF rec = dsi -> boundingRect();
rec.translate(actual_movement);
dsi -> setBoundingRect(rec);
dsi -> setPos(dsi -> pos() - actual_movement);
} }
} }

25
sources/qetgraphicsitem/qetshapeitem.cpp
View File

@@ -124,6 +124,31 @@ void QetShapeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
} }
} }
void QetShapeItem::mousePressEvent(QGraphicsSceneMouseEvent *e)
{
_origMousePress = mapToScene(e -> pos());
first_move_ = true;
if (e -> modifiers() & Qt::ControlModifier) {
setSelected(!isSelected());
}
QGraphicsItem::mousePressEvent(e);
}
void QetShapeItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
{
if (diagram()) diagram() -> endMoveElements();
QPointF newCoord = mapToScene(e -> pos());
if (newCoord != _origMousePress) {
//translate bounding rectangle
QRectF rec = boundingRect();
rec.translate(newCoord - _origMousePress);
setBoundingRect(rec);
setPos(pos() - newCoord + _origMousePress);
}
if (!(e -> modifiers() & Qt::ControlModifier)) QGraphicsItem::mouseReleaseEvent(e);
}
bool QetShapeItem::fromXml(const QDomElement &e) bool QetShapeItem::fromXml(const QDomElement &e)
{ {

5
sources/qetgraphicsitem/qetshapeitem.h
View File

@@ -42,6 +42,7 @@ class QetShapeItem : public QetGraphicsItem
virtual QDomElement toXml(QDomDocument &document) const; virtual QDomElement toXml(QDomDocument &document) const;
void setWritingXml(bool writing) { _writingXml = writing; } void setWritingXml(bool writing) { _writingXml = writing; }
virtual void editProperty(); virtual void editProperty();
QRectF boundingRect() const;
private: private:
ShapeType _shapeType; ShapeType _shapeType;
@@ -52,11 +53,13 @@ class QetShapeItem : public QetGraphicsItem
bool _isFullyBuilt; bool _isFullyBuilt;
QPointF _lineP1; QPointF _lineP1;
QPointF _lineP2; QPointF _lineP2;
QPointF _origMousePress;
bool _writingXml; bool _writingXml;
protected: protected:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
QRectF boundingRect() const; virtual void mousePressEvent(QGraphicsSceneMouseEvent *e);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *e);
QPainterPath shape() const; QPainterPath shape() const;
}; };