| [qet] [3580] Minor change : Change behavior of shape creation in diagram editor, to be same has element editor |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3580
Author: blacksun
Date: 2014-12-30 00:18:00 +0100 (Tue, 30 Dec 2014)
Log Message:
-----------
Minor change : Change behavior of shape creation in diagram editor, to be same has element editor
Modified Paths:
--------------
trunk/sources/dvevent/dveventaddshape.cpp
trunk/sources/dvevent/dveventaddshape.h
trunk/sources/qetgraphicsitem/qetshapeitem.cpp
trunk/sources/qetgraphicsitem/qetshapeitem.h
Modified: trunk/sources/dvevent/dveventaddshape.cpp
===================================================================
--- trunk/sources/dvevent/dveventaddshape.cpp 2014-12-28 19:19:49 UTC (rev 3579)
+++ trunk/sources/dvevent/dveventaddshape.cpp 2014-12-29 23:18:00 UTC (rev 3580)
@@ -34,13 +34,17 @@
m_shape_item (nullptr),
m_help_horiz (nullptr),
m_help_verti (nullptr)
-{}
+{
+ m_dv -> setContextMenuPolicy(Qt::NoContextMenu);
+}
/**
* @brief DVEventAddShape::~DVEventAddShape
*/
-DVEventAddShape::~DVEventAddShape() {
- if (m_running || m_abort) {
+DVEventAddShape::~DVEventAddShape()
+{
+ if (m_running || m_abort)
+ {
m_diagram -> removeItem(m_shape_item);
delete m_shape_item;
}
@@ -55,49 +59,43 @@
* @param event : event of mouse press
* @return : true if this event is managed, otherwise false
*/
-bool DVEventAddShape::mousePressEvent(QMouseEvent *event) {
-
+bool DVEventAddShape::mousePressEvent(QMouseEvent *event)
+{
if (!m_dv->isInteractive() && m_diagram->isReadOnly()) return false;
QPointF pos = m_dv->mapToScene(event->pos());
- //@m_running false => shape isn't created yet, we create a new shape
- if (m_running == false && event -> button() == Qt::LeftButton) {
- m_shape_item = new QetShapeItem(pos, pos, m_shape_type);
- m_dv -> setContextMenuPolicy (Qt::NoContextMenu);
- m_diagram -> addItem (m_shape_item);
- m_running = true;
- return true;
- }
+ //Action for left mouse click
+ if (event -> button() == Qt::LeftButton)
+ {
+ //Create shape item
+ if (!m_shape_item)
+ {
+ m_shape_item = new QetShapeItem(pos, pos, m_shape_type);
+ m_diagram -> addItem (m_shape_item);
+ m_running = true;
+ return true;
+ }
- //At this point m_shape_item must be created
- if (!m_shape_item) return false;
+ //If current item isn't a polyline, add it with an undo command
+ if (m_shape_type != QetShapeItem::Polyline)
+ {
+ m_shape_item -> setP2 (pos);
+ m_diagram -> undoStack().push (new AddItemCommand<QetShapeItem *> (m_shape_item, m_diagram));
+ m_shape_item = nullptr; //< set to nullptr for create new shape at next left clic
+ }
+ //Else add a new point to polyline
+ else
+ {
+ m_shape_item -> setNextPoint (pos);
+ }
- // Next left click finish all shape item except the polyline
- if (m_shape_type != QetShapeItem::Polyline && event->button() == Qt::LeftButton) {
- m_shape_item -> setP2 (pos);
- m_diagram -> undoStack().push (new AddItemCommand<QetShapeItem *> (m_shape_item, m_diagram));
- m_dv -> setContextMenuPolicy(Qt::DefaultContextMenu);
- m_running = false;
return true;
}
- // Next left click create new segment for polyline
- if (m_shape_type == QetShapeItem::Polyline && event -> button() == Qt::LeftButton) {
- m_shape_item -> setNextPoint (Diagram::snapToGrid(pos)); //< this point is ok for pos
- m_shape_item -> setNextPoint (Diagram::snapToGrid(pos)); //< Add new point for next segment. the pos of this point
- //< can be changed by calling QetShapItem::setP2()
+ if (event -> button() == Qt::RightButton)
return true;
- }
- // If shape item is polyline and click is right button, the shape item is finish
- // m_running is set to false at the release of right button.
- if (m_shape_type == QetShapeItem::Polyline && event -> button() == Qt::RightButton) {
- m_shape_item -> setP2 (pos);
- m_diagram -> undoStack().push (new AddItemCommand<QetShapeItem *> (m_shape_item, m_diagram));
- return true;
- }
-
return false;
}
@@ -107,13 +105,17 @@
* @param event : event of mouse move
* @return : true if this event is managed, otherwise false
*/
-bool DVEventAddShape::mouseMoveEvent(QMouseEvent *event) {
+bool DVEventAddShape::mouseMoveEvent(QMouseEvent *event)
+{
updateHelpCross(event->pos());
if (!m_running) return false;
- if (m_shape_item && event -> buttons() == Qt::NoButton) {
+
+ if (m_shape_item && event -> buttons() == Qt::NoButton)
+ {
m_shape_item -> setP2 (m_dv -> mapToScene (event -> pos()));
return true;
}
+
return false;
}
@@ -123,37 +125,82 @@
* @param event : event of mouse release
* @return : true if this event is managed, otherwise false
*/
-bool DVEventAddShape::mouseReleaseEvent(QMouseEvent *event) {
- //When the shape is polyline, we set default context menu to diagram view
- //only when the right button is released
- if (m_shape_type == QetShapeItem::Polyline && event -> button() == Qt::RightButton ) {
- m_dv -> setContextMenuPolicy(Qt::DefaultContextMenu);
+bool DVEventAddShape::mouseReleaseEvent(QMouseEvent *event)
+{
+ if (event -> button() == Qt::RightButton)
+ {
+ //If shape is created, we manage right click
+ if (m_shape_item)
+ {
+ //Shape is a polyline and have three points or more we just remove the last point
+ if (m_shape_type == QetShapeItem::Polyline && (m_shape_item -> pointsCount() >= 3) )
+ {
+ m_shape_item -> removePoints();
+ m_shape_item -> setP2(m_dv -> mapToScene (event -> pos())); //Set the new last point under the cursor
+ return true;
+ }
+
+ //For other case, we remove item from scene
+ m_diagram -> removeItem(m_shape_item);
+ delete m_shape_item;
+ m_shape_item = nullptr;
+ return true;
+ }
+
+ //Else (no shape), we set to false the running status
+ //for indicate to the owner of this event that everything is done
m_running = false;
return true;
}
+
return false;
}
/**
+ * @brief DVEventAddShape::mouseDoubleClickEvent
+ * @param event
+ * @return
+ */
+bool DVEventAddShape::mouseDoubleClickEvent(QMouseEvent *event)
+{
+ //If current item is a polyline, add it with an undo command
+ if (m_shape_item && m_shape_type == QetShapeItem::Polyline && event -> button() == Qt::LeftButton)
+ {
+ m_shape_item -> setP2 (m_dv -> mapToScene (event -> pos()));
+ m_diagram -> undoStack().push (new AddItemCommand<QetShapeItem *> (m_shape_item, m_diagram));
+ m_shape_item = nullptr; //< set to nullptr for create new shape at next left clic
+ return true;
+ }
+
+ return false;
+}
+
+/**
* @brief DVEventAddShape::updateHelpCross
* Create and update the position of the cross to help user for draw new shape
* @param event
*/
-void DVEventAddShape::updateHelpCross(const QPoint &p) {
- //If line isn't created yet, we create it.
- if (!m_help_horiz || !m_help_verti) {
+void DVEventAddShape::updateHelpCross(const QPoint &p)
+{
+ //If line isn't created yet, we create it.
+ if (!m_help_horiz || !m_help_verti)
+ {
QPen pen;
pen.setWidthF(0.4);
pen.setCosmetic(true);
pen.setColor(Qt::darkGray);
- //Add +5 for each line, because the topleft of diagram isn't draw at position (0:0) but (5:5)
- if (!m_help_horiz) {
+
+ //Add +5 for each line, because the topleft of diagram isn't draw at position (0:0) but (5:5)
+ if (!m_help_horiz)
+ {
m_help_horiz = new QGraphicsLineItem(m_diagram -> border_and_titleblock.rowsHeaderWidth() + 5, 0,
m_diagram -> border_and_titleblock.diagramWidth() + 5, 0,
0, m_diagram);
m_help_horiz->setPen(pen);
}
- if (!m_help_verti) {
+
+ if (!m_help_verti)
+ {
m_help_verti = new QGraphicsLineItem(0, m_diagram -> border_and_titleblock.columnsHeaderHeight() + 5,
0, m_diagram -> border_and_titleblock.diagramHeight() + 5,
0, m_diagram);
@@ -161,7 +208,7 @@
}
}
- //Update the position of the cross
+ //Update the position of the cross
QPointF point = Diagram::snapToGrid(m_dv->mapToScene(p));
m_help_horiz->setY(point.y());
Modified: trunk/sources/dvevent/dveventaddshape.h
===================================================================
--- trunk/sources/dvevent/dveventaddshape.h 2014-12-28 19:19:49 UTC (rev 3579)
+++ trunk/sources/dvevent/dveventaddshape.h 2014-12-29 23:18:00 UTC (rev 3580)
@@ -28,17 +28,18 @@
public:
DVEventAddShape(DiagramView *dv, QetShapeItem::ShapeType shape_type);
virtual ~DVEventAddShape ();
- virtual bool mousePressEvent (QMouseEvent *event);
- virtual bool mouseMoveEvent (QMouseEvent *event);
- virtual bool mouseReleaseEvent (QMouseEvent *event);
+ virtual bool mousePressEvent (QMouseEvent *event);
+ virtual bool mouseMoveEvent (QMouseEvent *event);
+ virtual bool mouseReleaseEvent (QMouseEvent *event);
+ virtual bool mouseDoubleClickEvent (QMouseEvent *event);
private:
void updateHelpCross (const QPoint &p);
protected:
- QetShapeItem::ShapeType m_shape_type;
- QetShapeItem *m_shape_item;
- QGraphicsLineItem *m_help_horiz, *m_help_verti;
+ QetShapeItem::ShapeType m_shape_type;
+ QetShapeItem *m_shape_item;
+ QGraphicsLineItem *m_help_horiz, *m_help_verti;
};
#endif // DVEVENTADDSHAPE_H
Modified: trunk/sources/qetgraphicsitem/qetshapeitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/qetshapeitem.cpp 2014-12-28 19:19:49 UTC (rev 3579)
+++ trunk/sources/qetgraphicsitem/qetshapeitem.cpp 2014-12-29 23:18:00 UTC (rev 3580)
@@ -94,6 +94,15 @@
}
/**
+ * @brief QetShapeItem::pointCount
+ * @return the number of point in the polygon
+ */
+int QetShapeItem::pointsCount() const
+{
+ return m_polygon.size();
+}
+
+/**
* @brief QetShapeItem::setNextPoint
* Add a new point to the curent polygon
* @param P the new point.
@@ -105,6 +114,29 @@
}
/**
+ * @brief QetShapeItem::removePoints
+ * Number of point to remove on the polygon
+ * If @number is superior to number of polygon points-2,
+ * all points of polygon will be removed except the first two (minimum point for the polygon);
+ */
+void QetShapeItem::removePoints(int number)
+{
+ if (pointsCount() == 2 || number < 1) return;
+ if ((pointsCount()-2) < number)
+ number = pointsCount() - 2;
+
+ int i = 0;
+ do
+ {
+ i++;
+ prepareGeometryChange();
+ m_polygon.pop_back();
+ setTransformOriginPoint(boundingRect().center());
+
+ } while (i < number);
+}
+
+/**
* @brief QetShapeItem::boundingRect
* @return the bounding rect of this item
*/
Modified: trunk/sources/qetgraphicsitem/qetshapeitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/qetshapeitem.h 2014-12-28 19:19:49 UTC (rev 3579)
+++ trunk/sources/qetgraphicsitem/qetshapeitem.h 2014-12-29 23:18:00 UTC (rev 3580)
@@ -60,8 +60,12 @@
virtual void editProperty();
virtual QString name() const;
- void setP2 (QPointF P2);
+ void setP2 (QPointF P2);
+
+ //Methods available for polygon shape
+ int pointsCount () const;
void setNextPoint (QPointF P);
+ void removePoints (int number = 1);
QRectF boundingRect() const;
QPainterPath shape() const;