Support delete action if you select tool from label.
--HG-- branch : develop
This commit is contained in:
parent
939e849560
commit
5679158b56
|
@ -48,6 +48,7 @@ VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsIte
|
||||||
radius = qApp->toPixel(DefPointRadius/*mm*/, Unit::Mm);
|
radius = qApp->toPixel(DefPointRadius/*mm*/, Unit::Mm);
|
||||||
namePoint = new VGraphicsSimpleTextItem(this);
|
namePoint = new VGraphicsSimpleTextItem(this);
|
||||||
connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::ShowContextMenu);
|
connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::ShowContextMenu);
|
||||||
|
connect(namePoint, &VGraphicsSimpleTextItem::DeleteTool, this, &VToolPoint::DeleteFromLabel);
|
||||||
namePoint->setBrush(Qt::black);
|
namePoint->setBrush(Qt::black);
|
||||||
lineName = new QGraphicsLineItem(this);
|
lineName = new QGraphicsLineItem(this);
|
||||||
lineName->setPen(QPen(Qt::black));
|
lineName->setPen(QPen(Qt::black));
|
||||||
|
@ -182,6 +183,12 @@ void VToolPoint::Disable(bool disable)
|
||||||
DisableItem(this, disable);
|
DisableItem(this, disable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VToolPoint::DeleteFromLabel()
|
||||||
|
{
|
||||||
|
DeleteTool(); //Leave this method immediately after call!!!
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
/**
|
/**
|
||||||
* @brief mouseReleaseEvent handle mouse release events.
|
* @brief mouseReleaseEvent handle mouse release events.
|
||||||
|
|
|
@ -56,6 +56,7 @@ public slots:
|
||||||
virtual void SetFactor(qreal factor);
|
virtual void SetFactor(qreal factor);
|
||||||
virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
|
virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
|
||||||
void Disable(bool disable);
|
void Disable(bool disable);
|
||||||
|
void DeleteFromLabel();
|
||||||
protected:
|
protected:
|
||||||
/** @brief radius radius circle. */
|
/** @brief radius radius circle. */
|
||||||
qreal radius;
|
qreal radius;
|
||||||
|
|
|
@ -46,6 +46,7 @@ VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent)
|
||||||
this->setFlag(QGraphicsItem::ItemIsMovable, true);
|
this->setFlag(QGraphicsItem::ItemIsMovable, true);
|
||||||
this->setFlag(QGraphicsItem::ItemIsSelectable, true);
|
this->setFlag(QGraphicsItem::ItemIsSelectable, true);
|
||||||
this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
|
this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
|
||||||
|
this->setFlag(QGraphicsItem::ItemIsFocusable, true);
|
||||||
this->setAcceptHoverEvents(true);
|
this->setAcceptHoverEvents(true);
|
||||||
QFont font = this->font();
|
QFont font = this->font();
|
||||||
font.setPointSize(font.pointSize()+20);
|
font.setPointSize(font.pointSize()+20);
|
||||||
|
@ -156,3 +157,17 @@ void VGraphicsSimpleTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
||||||
}
|
}
|
||||||
QGraphicsSimpleTextItem::mouseReleaseEvent(event);
|
QGraphicsSimpleTextItem::mouseReleaseEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VGraphicsSimpleTextItem::keyReleaseEvent(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
switch (event->key())
|
||||||
|
{
|
||||||
|
case Qt::Key_Delete:
|
||||||
|
emit DeleteTool();
|
||||||
|
return; //Leave this method immediately after call!!!
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
QGraphicsSimpleTextItem::keyReleaseEvent ( event );
|
||||||
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ signals:
|
||||||
* @param event context menu event.
|
* @param event context menu event.
|
||||||
*/
|
*/
|
||||||
void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
|
void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
|
||||||
|
void DeleteTool();
|
||||||
protected:
|
protected:
|
||||||
QVariant itemChange ( GraphicsItemChange change, const QVariant &value );
|
QVariant itemChange ( GraphicsItemChange change, const QVariant &value );
|
||||||
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event );
|
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event );
|
||||||
|
@ -65,6 +66,7 @@ protected:
|
||||||
virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event );
|
virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event );
|
||||||
virtual void mousePressEvent( QGraphicsSceneMouseEvent * event );
|
virtual void mousePressEvent( QGraphicsSceneMouseEvent * event );
|
||||||
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event );
|
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event );
|
||||||
|
virtual void keyReleaseEvent ( QKeyEvent * event );
|
||||||
private:
|
private:
|
||||||
/** @brief fontSize label font size. */
|
/** @brief fontSize label font size. */
|
||||||
qint32 fontSize;
|
qint32 fontSize;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user