kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]fix Leader position override by QGIView

Browse Source
This commit is contained in:
wandererfan
2019-12-24 07:31:31 -05:00
committed by WandererFan
parent 14913bb581
commit 29138d7225
2 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/Mod/TechDraw/Gui/QGILeaderLine.cpp
View File

@@ -75,7 +75,7 @@ QGILeaderLine::QGILeaderLine(QGraphicsItem* myParent,
TechDraw::DrawLeaderLine* leader) :
m_parentItem(myParent),
m_lineColor(Qt::black),
m_hasHover(false),
// m_hasHover(false),
m_blockDraw(false)
{
@@ -91,6 +91,8 @@ QGILeaderLine::QGILeaderLine(QGraphicsItem* myParent,
m_line = new QGIPrimPath();
addToGroup(m_line);
m_line->setNormalColor(getNormalColor());
m_line->setFlag(QGraphicsItem::ItemIsSelectable, false);
m_line->setAcceptHoverEvents(false);
m_line->setPrettyNormal();
m_line->setPos(0.0,0.0);
@@ -130,13 +132,6 @@ QGILeaderLine::QGILeaderLine(QGraphicsItem* myParent,
m_editPath, SIGNAL(pointsUpdated(QPointF, std::vector<QPointF>)),
this , SLOT (onLineEditFinished(QPointF, std::vector<QPointF>))
);
QObject::connect(
m_editPath, SIGNAL(selected(bool)),
this , SLOT (select(bool)));
QObject::connect( //do we care?
m_editPath, SIGNAL(hover(bool)),
this , SLOT (hover(bool)));
}
QVariant QGILeaderLine::itemChange(GraphicsItemChange change, const QVariant &value)
@@ -144,13 +139,9 @@ QVariant QGILeaderLine::itemChange(GraphicsItemChange change, const QVariant &va
// Base::Console().Message("QGILL::itemChange(%d)\n", change);
if (change == ItemSelectedHasChanged && scene()) {
if(isSelected()) {
m_editPath->setSelected(true);
m_arrow1->setSelected(true);
m_arrow2->setSelected(true);
setPrettySel();
} else {
m_editPath->setSelected(false);
m_arrow1->setSelected(false);
m_arrow2->setSelected(false);
setPrettyNormal();
}
draw();
} else if(change == ItemSceneChange && scene()) {
@@ -159,6 +150,44 @@ QVariant QGILeaderLine::itemChange(GraphicsItemChange change, const QVariant &va
return QGIView::itemChange(change, value);
}
//QGILL isn't draggable so skip QGIV::mousePress have event
void QGILeaderLine::mousePressEvent(QGraphicsSceneMouseEvent * event)
{
// Base::Console().Message("QGILL::mousePressEvent() - %s\n",getViewName());
QGraphicsItem::mousePressEvent(event);
}
//void QGILeaderLine::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
//{
// QGraphicsItem::mouseMoveEvent(event);
//}
//QGILL isn't draggable so skip QGIV::mouseRelease
void QGILeaderLine::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
{
// Base::Console().Message("QGILL::mouseReleaseEvent() - %s\n",getViewName());
QGraphicsItem::mouseReleaseEvent(event);
}
void QGILeaderLine::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
// Base::Console().Message("QGILL::hoverEnter() - selected; %d\n",isSelected());
if (!isSelected()) {
setPrettyPre();
}
QGIView::hoverEnterEvent(event);
}
void QGILeaderLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
// Base::Console().Message("QGILL::hoverLeave() - selected; %d\n",isSelected());
if(!isSelected()) {
setPrettyNormal();
}
QGIView::hoverLeaveEvent(event);
}
void QGILeaderLine::onSourceChange(TechDraw::DrawView* newParent)
{
// Base::Console().Message("QGILL::onSoureChange(%s)\n",newParent->getNameInDocument());
@@ -173,18 +202,28 @@ void QGILeaderLine::onSourceChange(TechDraw::DrawView* newParent)
}
}
void QGILeaderLine::select(bool state)
{
setSelected(state);
// draw();
void QGILeaderLine::setPrettyNormal() {
// Base::Console().Message("QGILL::setPrettyNormal()\n");
m_line->setPrettyNormal();
m_arrow1->setPrettyNormal();
m_arrow2->setPrettyNormal();
}
void QGILeaderLine::hover(bool state)
{
m_hasHover = state;
// draw();
void QGILeaderLine::setPrettyPre() {
// Base::Console().Message("QGILL::setPrettyPre()\n");
m_line->setPrettyPre();
m_arrow1->setPrettyPre();
m_arrow2->setPrettyPre();
}
void QGILeaderLine::setPrettySel() {
// Base::Console().Message("QGILL::setPrettySel()\n");
m_line->setPrettySel();
m_arrow1->setPrettySel();
m_arrow2->setPrettySel();
}
void QGILeaderLine::closeEdit(void)
{
// Base::Console().Message("QGIL::closeEdit()\n");

10
src/Mod/TechDraw/Gui/QGILeaderLine.h
View File

@@ -82,12 +82,18 @@ public:
double getLineWidth(void);
double getEdgeFuzz(void) const;
virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
//void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void setPrettyNormal();
void setPrettyPre();
void setPrettySel();
public Q_SLOTS:
void onLineEditFinished(QPointF attach, std::vector<QPointF> deltas); //QGEPath is finished editing points
void select(bool state);
void hover(bool state);
virtual void onSourceChange(TechDraw::DrawView* newParent) override;
Q_SIGNALS: