aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with spline's control point.

Browse Source 
Fix infinite redrawing.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-10-28 19:21:47 +03:00
parent d3cf15f5b8
commit 969dd163bf
4 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
View File

@ -61,7 +61,8 @@ VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint3
controlPoints(),
sceneType(SceneObject::Unknown),
m_isHovered(false),
detailsMode(false)
detailsMode(false),
m_parentRefresh(false)
{
InitDefShape();
setAcceptHoverEvents(true);
@ -98,26 +99,39 @@ void VAbstractSpline::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
const QSharedPointer<VAbstractCurve> curve = VAbstractTool::data.GeometricObject<VAbstractCurve>(m_id);
setPen(QPen(CorrectColor(this, curve->GetColor()), width, LineStyleToPenStyle(curve->GetPenStyle()), Qt::RoundCap));
RefreshCtrlPoints();
if (m_isHovered || detailsMode)
auto PaintSpline = [this, curve](QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
painter->save();
if (m_isHovered || detailsMode)
{
painter->save();
QPen arrowPen(pen());
arrowPen.setStyle(Qt::SolidLine);
QPen arrowPen(pen());
arrowPen.setStyle(Qt::SolidLine);
painter->setPen(arrowPen);
painter->setBrush(brush());
painter->setPen(arrowPen);
painter->setBrush(brush());
painter->drawPath(VAbstractCurve::ShowDirection(curve->DirectionArrows(),
ScaleWidth(VAbstractCurve::lengthCurveDirectionArrow,
SceneScale(scene()))));
painter->drawPath(VAbstractCurve::ShowDirection(curve->DirectionArrows(),
ScaleWidth(VAbstractCurve::lengthCurveDirectionArrow,
SceneScale(scene()))));
painter->restore();
painter->restore();
}
QGraphicsPathItem::paint(painter, option, widget);
};
if (not m_parentRefresh)
{
RefreshCtrlPoints();
m_parentRefresh = true;
PaintSpline(painter, option, widget);
}
else
{
m_parentRefresh = false;
PaintSpline(painter, option, widget);
}
QGraphicsPathItem::paint(painter, option, widget);
}
//---------------------------------------------------------------------------------------------------------------------
@ -156,12 +170,22 @@ void VAbstractSpline::DetailsMode(bool mode)
void VAbstractSpline::AllowHover(bool enabled)
{
setAcceptHoverEvents(enabled);
foreach (auto *point, controlPoints)
{
point->setAcceptHoverEvents(enabled);
}
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractSpline::AllowSelecting(bool enabled)
{
setFlag(QGraphicsItem::ItemIsSelectable, enabled);
foreach (auto *point, controlPoints)
{
point->setFlag(QGraphicsItem::ItemIsSelectable, enabled);
}
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
View File

@ -148,6 +148,8 @@ protected:
private:
Q_DISABLE_COPY(VAbstractSpline)
bool m_parentRefresh;
void InitDefShape();
};

5
src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
View File

@ -296,6 +296,11 @@ void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, const Sp
void VToolSpline::EnableToolMove(bool move)
{
this->setFlag(QGraphicsItem::ItemIsMovable, move);
foreach (auto *point, controlPoints)
{
point->setFlag(QGraphicsItem::ItemIsMovable, move);
}
}
//---------------------------------------------------------------------------------------------------------------------

5
src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
View File

@ -292,6 +292,11 @@ void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, cons
void VToolSplinePath::EnableToolMove(bool move)
{
this->setFlag(QGraphicsItem::ItemIsMovable, move);
foreach (auto *point, controlPoints)
{
point->setFlag(QGraphicsItem::ItemIsMovable, move);
}
}
//---------------------------------------------------------------------------------------------------------------------