Fix internal path support of pen style.
--HG-- branch : develop
This commit is contained in:
parent
32a16890a7
commit
13a93ef5df
|
@ -370,7 +370,7 @@
|
|||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
<xs:attribute name="typeLine" type="xs:string"/>
|
||||
<xs:attribute name="typeLine" type="curvePenStyle"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="tools" minOccurs="0" maxOccurs="unbounded">
|
||||
|
|
|
@ -354,11 +354,7 @@ QPainterPath VPiecePath::PainterPath(const VContainer *data) const
|
|||
|
||||
if (not points.isEmpty())
|
||||
{
|
||||
path.moveTo(points.at(0));
|
||||
for (qint32 i = 1; i < points.count(); ++i)
|
||||
{
|
||||
path.lineTo(points.at(i));
|
||||
}
|
||||
path.addPolygon(QPolygonF(points));
|
||||
path.setFillRule(Qt::WindingFill);
|
||||
}
|
||||
|
||||
|
|
|
@ -703,7 +703,7 @@ void DialogPiecePath::InitPathTab()
|
|||
ui->lineEditName->setClearButtonEnabled(true);
|
||||
#endif
|
||||
|
||||
FillComboBoxTypeLine(ui->comboBoxPenType, LineStylesPics());
|
||||
FillComboBoxTypeLine(ui->comboBoxPenType, CurvePenStylesPics());
|
||||
|
||||
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogPiecePath::NameChanged);
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ void VisToolPiecePath::RefreshGeometry()
|
|||
|
||||
if (m_path.CountNodes() > 0)
|
||||
{
|
||||
DrawPath(this, m_path.PainterPath(Visualization::data), mainColor, Qt::SolidLine, Qt::RoundCap);
|
||||
DrawPath(this, m_path.PainterPath(Visualization::data), mainColor, m_path.GetPenType(), Qt::RoundCap);
|
||||
|
||||
const QVector<VPointF> nodes = m_path.PathNodePoints(Visualization::data);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user