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

Minor fix

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4049 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-13 12:01:02 +00:00
parent f02a9a0572
commit e31695382f
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/dvevent/dveventaddshape.cpp
View File

@@ -64,6 +64,8 @@ bool DVEventAddShape::mousePressEvent(QMouseEvent *event)
if (!m_dv->isInteractive() && m_diagram->isReadOnly()) return false;
QPointF pos = m_dv->mapToScene(event->pos());
if (event->modifiers() != Qt::ControlModifier)
pos = Diagram::snapToGrid(pos);
//Action for left mouse click
if (event -> button() == Qt::LeftButton)
@@ -112,7 +114,11 @@ bool DVEventAddShape::mouseMoveEvent(QMouseEvent *event)
if (m_shape_item && event -> buttons() == Qt::NoButton)
{
m_shape_item -> setP2 (m_dv -> mapToScene (event -> pos()));
QPointF pos = m_dv->mapToScene(event->pos());
if (event->modifiers() != Qt::ControlModifier)
pos = Diagram::snapToGrid(pos);
m_shape_item -> setP2 (pos);
return true;
}
@@ -136,7 +142,12 @@ bool DVEventAddShape::mouseReleaseEvent(QMouseEvent *event)
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
QPointF pos = m_dv->mapToScene(event->pos());
if (event->modifiers() != Qt::ControlModifier)
pos = Diagram::snapToGrid(pos);
m_shape_item -> setP2(pos); //Set the new last point under the cursor
return true;
}
@@ -166,7 +177,9 @@ 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()));
//<double clic is used to finish polyline, but they also add two points at the same pos
//<(double clic is a double press event), so we remove the last point of polyline
m_shape_item->removePoints();
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;