From bd4a472b7d210bc6022b205fc2d382aa3ca9261d Mon Sep 17 00:00:00 2001 From: blacksun Date: Sun, 25 Sep 2016 08:14:29 +0000 Subject: [PATCH] Element editor : add new handler for arc to resize angle with mouse. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4722 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- .../qetgraphicshandlerutility.cpp | 22 +++ .../qetgraphicshandlerutility.h | 1 + sources/editor/arceditor.cpp | 8 +- .../editor/graphicspart/abstractpartellipse.h | 4 +- sources/editor/graphicspart/partarc.cpp | 174 +++++++++++++----- sources/editor/graphicspart/partarc.h | 8 +- 6 files changed, 162 insertions(+), 55 deletions(-) diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp index 80b2588c7..83faae926 100644 --- a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp +++ b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp @@ -169,6 +169,28 @@ QVector QetGraphicsHandlerUtility::pointsForLine(const QLineF &line) { return (QVector {line.p1(), line.p2()}); } +#include +/** + * @brief QetGraphicsHandlerUtility::pointsForArc + * Return the points for the given arc. + * The first value in the vector is the start point, the second the end point. + * @param rect + * @param start_angle : start angle in degree + * @param span_angle : span angle in degree; + * @return + */ +QVector QetGraphicsHandlerUtility::pointsForArc(const QRectF &rect, qreal start_angle, qreal span_angle) +{ + QVector vector; + QPainterPath path; + path.arcTo(rect, start_angle, 0); + vector.append(path.currentPosition()); + path.arcTo(rect, start_angle, span_angle); + vector.append(path.currentPosition()); + return vector; + +} + /** * @brief QetGraphicsHandlerUtility::rectForPosAtIndex * Return a rectangle after modification of the point '@pos' at index '@index' of original rectangle '@old_rect'. diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h index a74db520b..0a13ceb86 100644 --- a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h +++ b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h @@ -54,6 +54,7 @@ class QetGraphicsHandlerUtility public: static QVector pointsForRect (const QRectF &rect); static QVector pointsForLine (const QLineF &line); + static QVector pointsForArc (const QRectF &rect, qreal start_angle, qreal span_angle); static QRectF rectForPosAtIndex (const QRectF &old_rect, const QPointF &pos, int index); static QRectF mirrorRectForPosAtIndex (const QRectF &old_rect, const QPointF &pos, int index); static QLineF lineForPosAtIndex (const QLineF &old_line, const QPointF &pos, int index); diff --git a/sources/editor/arceditor.cpp b/sources/editor/arceditor.cpp index 738371bca..111e0980e 100644 --- a/sources/editor/arceditor.cpp +++ b/sources/editor/arceditor.cpp @@ -135,7 +135,7 @@ void ArcEditor::updateArcS() { if (m_locked) return; m_locked = true; - double value = ((start_angle -> value() * -1) + 90) * 16; + double value = start_angle->value() * 16; if (value != part->property("startAngle")) { @@ -156,7 +156,7 @@ void ArcEditor::updateArcA() { if (m_locked) return; m_locked = true; - double value = angle -> value() * -16; + double value = angle->value() * 16; if (value != part->property("spanAngle")) { @@ -204,8 +204,8 @@ void ArcEditor::updateForm() y->setValue(part->mapToScene(rect.topLeft()).y() + (rect.height()/2)); h->setValue(rect.width()); v->setValue(rect.height()); - start_angle -> setValue(((part->property("startAngle").toInt() / 16) - 90) * -1); - angle -> setValue(part->property("spanAngle").toInt() / -16); + start_angle->setValue(part->property("startAngle").toInt()/16); + angle->setValue(part->property("spanAngle").toInt()/16); activeConnections(true); } diff --git a/sources/editor/graphicspart/abstractpartellipse.h b/sources/editor/graphicspart/abstractpartellipse.h index 5c851d4ed..d93b106d8 100644 --- a/sources/editor/graphicspart/abstractpartellipse.h +++ b/sources/editor/graphicspart/abstractpartellipse.h @@ -73,8 +73,8 @@ class AbstractPartEllipse : public CustomElementGraphicPart protected: QList saved_points_; QRectF m_rect; - int m_start_angle; - int m_span_angle; + qreal m_start_angle; + qreal m_span_angle; }; #endif // ABSTRACTPARTELLIPSE_H diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp index 213bf5dde..b81f766ce 100644 --- a/sources/editor/graphicspart/partarc.cpp +++ b/sources/editor/graphicspart/partarc.cpp @@ -27,10 +27,7 @@ * @param parent : parent item */ PartArc::PartArc(QETElementEditor *editor, QGraphicsItem *parent) : - AbstractPartEllipse(editor, parent), - m_handler(10), - m_handler_index(-1), - m_undo_command(nullptr) + AbstractPartEllipse(editor, parent) { m_start_angle = 0; m_span_angle = -1440; @@ -87,8 +84,12 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, if (isSelected()) { drawCross(m_rect.center(), painter); - if (scene()->selectedItems().size() == 1) - m_handler.drawHandler(painter, m_handler.pointsForRect(m_rect)); + if (scene()->selectedItems().size() == 1) { + if (m_resize_mode == 3) + m_handler.drawHandler(painter, m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16)); + else + m_handler.drawHandler(painter, m_handler.pointsForRect(m_rect)); + } } } @@ -124,8 +125,8 @@ void PartArc::fromXml(const QDomElement &qde) { QSizeF(qde.attribute("width", "0").toDouble(), qde.attribute("height", "0").toDouble()) ); - m_start_angle = qde.attribute("start", "0").toInt() * 16; - m_span_angle = qde.attribute("angle", "-1440").toInt() * 16; + m_start_angle = qde.attribute("start", "0").toDouble() * 16; + m_span_angle = qde.attribute("angle", "-1440").toDouble() * 16; } QRectF PartArc::boundingRect() const @@ -179,19 +180,28 @@ void PartArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) return; } - int handler = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForRect(m_rect)); + if (m_resize_mode == 1 || m_resize_mode == 2) { + int handler = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForRect(m_rect)); - if (handler >= 0) - { - if (handler == 0 || handler == 2 || handler == 5 || handler == 7) - setCursor(Qt::SizeAllCursor); - else if (handler == 1 || handler == 6) - setCursor(Qt::SizeVerCursor); - else if (handler == 3 || handler == 4) - setCursor(Qt::SizeHorCursor); + if (handler >= 0) + { + if (handler == 0 || handler == 2 || handler == 5 || handler == 7) + setCursor(Qt::SizeAllCursor); + else if (handler == 1 || handler == 6) + setCursor(Qt::SizeVerCursor); + else if (handler == 3 || handler == 4) + setCursor(Qt::SizeHorCursor); + + return; + } } - else - CustomElementGraphicPart::hoverMoveEvent(event); + else if (m_resize_mode == 3) { + if (m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForArc(m_rect, m_start_angle, m_span_angle)) >= 0) + setCursor(Qt::SizeAllCursor); + return; + } + + CustomElementGraphicPart::hoverMoveEvent(event); } /** @@ -206,15 +216,43 @@ void PartArc::mousePressEvent(QGraphicsSceneMouseEvent *event) setCursor(Qt::ClosedHandCursor); if (isSelected()) { - m_handler_index = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForRect(m_rect)); + //resize rect + if (m_resize_mode == 1 || m_resize_mode == 2) { + m_handler_index = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForRect(m_rect)); - if(m_handler_index >= 0 && m_handler_index <= 7) //User click on an handler - { - m_undo_command = new QPropertyUndoCommand(this, "rect", QVariant(m_rect)); - m_undo_command->setText(tr("Modifier un arc")); - m_undo_command->enableAnimation(); - return; + if(m_handler_index >= 0 && m_handler_index <= 7) //User click on an handler + { + m_undo_command = new QPropertyUndoCommand(this, "rect", QVariant(m_rect)); + m_undo_command->setText(tr("Modifier un arc")); + m_undo_command->enableAnimation(); + return; + } } + //resize angle + if (m_resize_mode == 3) { + m_handler_index = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16)); + if (m_handler_index == 0) { + m_span_point = m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16).at(1); + + m_undo_command = new QPropertyUndoCommand(this, "startAngle", QVariant(m_start_angle)); + m_undo_command->setText(tr("Modifier un arc")); + m_undo_command->enableAnimation(); + + m_undo_command2 = new QPropertyUndoCommand(this, "spanAngle", QVariant(m_span_angle), m_undo_command); + m_undo_command2->setText(tr("Modifier un arc")); + m_undo_command2->enableAnimation(); + + return; + } + else if (m_handler_index == 1) { + m_undo_command = new QPropertyUndoCommand(this, "spanAngle", QVariant(m_span_angle)); + m_undo_command->setText(tr("Modifier un arc")); + m_undo_command->enableAnimation(); + + return; + } + } + } } @@ -228,18 +266,38 @@ void PartArc::mousePressEvent(QGraphicsSceneMouseEvent *event) */ void PartArc::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if(m_handler_index >= 0 && m_handler_index <= 7) - { - QPointF pos_ = event->modifiers() == Qt::ControlModifier ? event->pos() : mapFromScene(elementScene()->snapToGrid(event->scenePos())); - prepareGeometryChange(); + if (m_resize_mode == 1 || m_resize_mode == 2) { + if (m_handler_index >= 0 && m_handler_index <= 7) { + QPointF pos_ = event->modifiers() == Qt::ControlModifier ? event->pos() : mapFromScene(elementScene()->snapToGrid(event->scenePos())); + prepareGeometryChange(); - if (m_resize_mode == 1) - setRect(m_handler.rectForPosAtIndex(m_rect, pos_, m_handler_index)); - else - setRect(m_handler.mirrorRectForPosAtIndex(m_rect, pos_, m_handler_index)); + if (m_resize_mode == 1) + setRect(m_handler.rectForPosAtIndex(m_rect, pos_, m_handler_index)); + else + setRect(m_handler.mirrorRectForPosAtIndex(m_rect, pos_, m_handler_index)); + + return; + } } - else - CustomElementGraphicPart::mouseMoveEvent(event); + else if (m_resize_mode == 3) { + if (m_handler_index == 0 || m_handler_index == 1) { + QLineF line(m_rect.center(), event->pos()); + prepareGeometryChange(); + + if (m_handler_index == 0) { + setStartAngle(line.angle()*16); + setSpanAngle(line.angleTo(QLineF(m_rect.center(), m_span_point))*16); + } + else if (m_handler_index == 1) { + QLineF line2(m_rect.center(), m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16).at(0)); + setSpanAngle (line2.angleTo(line)*16); + } + + return; + } + } + + CustomElementGraphicPart::mouseMoveEvent(event); } /** @@ -255,18 +313,38 @@ void PartArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) switchResizeMode(); } - if (m_handler_index >= 0 && m_handler_index <= 7) - { - if (!m_rect.isValid()) - m_rect = m_rect.normalized(); + if (m_resize_mode == 1 || m_resize_mode == 2) { + if (m_handler_index >= 0 && m_handler_index <= 7) { + if (!m_rect.isValid()) + m_rect = m_rect.normalized(); - m_undo_command->setNewValue(QVariant(m_rect)); - elementScene()->undoStack().push(m_undo_command); - m_undo_command = nullptr; - m_handler_index = -1; + m_undo_command->setNewValue(QVariant(m_rect)); + elementScene()->undoStack().push(m_undo_command); + m_undo_command = nullptr; + m_handler_index = -1; + return; + } } - else - CustomElementGraphicPart::mouseReleaseEvent(event); + else if (m_resize_mode == 3) { + if (m_handler_index == 0) { + m_undo_command->setNewValue(QVariant(m_start_angle)); + m_undo_command2->setNewValue(QVariant(m_span_angle)); + elementScene()->undoStack().push(m_undo_command); + m_undo_command = nullptr; + m_undo_command2 = nullptr; + m_handler_index = -1; + return; + } + else if (m_handler_index == 1) { + m_undo_command->setNewValue(QVariant(m_span_angle)); + elementScene()->undoStack().push(m_undo_command); + m_undo_command = nullptr; + m_handler_index = -1; + return; + } + } + + CustomElementGraphicPart::mouseReleaseEvent(event); } void PartArc::switchResizeMode() @@ -275,6 +353,10 @@ void PartArc::switchResizeMode() m_resize_mode = 2; m_handler.setOuterColor(Qt::darkGreen); } + else if (m_resize_mode == 2 ) { + m_resize_mode = 3; + m_handler.setOuterColor(Qt::magenta); + } else { m_resize_mode = 1; m_handler.setOuterColor(Qt::blue); diff --git a/sources/editor/graphicspart/partarc.h b/sources/editor/graphicspart/partarc.h index dce6d4acc..fb4a05e2f 100644 --- a/sources/editor/graphicspart/partarc.h +++ b/sources/editor/graphicspart/partarc.h @@ -68,9 +68,11 @@ class PartArc : public AbstractPartEllipse void switchResizeMode(); private: - QetGraphicsHandlerUtility m_handler; - int m_handler_index; - QPropertyUndoCommand *m_undo_command; + QetGraphicsHandlerUtility m_handler = 10; + int m_handler_index = -1; + QPropertyUndoCommand *m_undo_command = nullptr; + QPropertyUndoCommand *m_undo_command2 = nullptr; int m_resize_mode = 1; + QPointF m_span_point; }; #endif