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

Always draw circle for Button type.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-10-23 12:33:54 +03:00
parent 6f5969a357
commit 233efde704
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/vgeometry/vplacelabelitem.cpp
View File

@ -28,7 +28,7 @@
#include "vplacelabelitem.h" #include "vplacelabelitem.h"
#include "vplacelabelitem_p.h" #include "vplacelabelitem_p.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "vellipticalarc.h" #include "varc.h"
#include <QPolygonF> #include <QPolygonF>
#include <QTransform> #include <QTransform>
@ -286,17 +286,19 @@ PlaceLabelImg VPlaceLabelItem::LabelShape(const VContainer *data) const
auto ButtonShape = [center, t, this]() auto ButtonShape = [center, t, this]()
{ {
const qreal radius = qMin(d->wValue/2.0, d->hValue/2.0);
QPolygonF shape1; QPolygonF shape1;
shape1 << QPointF(center->x(), center->y() - d->hValue/2.0) shape1 << QPointF(center->x(), center->y() - radius)
<< QPointF(center->x(), center->y() + d->hValue/2.0); << QPointF(center->x(), center->y() + radius);
QPolygonF shape2; QPolygonF shape2;
shape2 << QPointF(center->x() - d->wValue/2.0, center->y()) shape2 << QPointF(center->x() - radius, center->y())
<< QPointF(center->x() + d->wValue/2.0, center->y()); << QPointF(center->x() + radius, center->y());
const qreal circleSize = 0.85; const qreal circleSize = 0.85;
VEllipticalArc elArc(*center, d->wValue/2.0*circleSize, d->hValue/2.0*circleSize, 0, 360, 0); VArc arc(*center, radius*circleSize, 0, 360);
QPolygonF shape3(elArc.GetPoints()); arc.SetApproximationScale(10);
QPolygonF shape3(arc.GetPoints());
if (not shape3.isClosed() && not shape3.isEmpty()) if (not shape3.isClosed() && not shape3.isEmpty())
{ {
shape3 << shape3.first(); shape3 << shape3.first();