[TD]fix loss of line style
This commit is contained in:
@@ -51,7 +51,8 @@ QGIEdge::QGIEdge(int index) :
|
||||
setFill(Qt::NoBrush);
|
||||
}
|
||||
|
||||
//NOTE this refers to Qt cosmetic lines
|
||||
// NOTE this refers to Qt cosmetic lines (a line with minimum width),
|
||||
// not FreeCAD cosmetic lines
|
||||
void QGIEdge::setCosmetic(bool state)
|
||||
{
|
||||
// Base::Console().Message("QGIE::setCosmetic(%d)\n", state);
|
||||
|
||||
@@ -59,7 +59,8 @@ QGIPrimPath::QGIPrimPath():
|
||||
m_colOverride = false;
|
||||
m_colNormal = getNormalColor();
|
||||
m_colCurrent = m_colNormal;
|
||||
m_styleCurrent = Qt::SolidLine;
|
||||
m_styleNormal = Qt::SolidLine;
|
||||
m_styleCurrent = m_styleNormal;
|
||||
m_pen.setStyle(m_styleCurrent);
|
||||
m_capStyle = prefCapStyle();
|
||||
m_pen.setCapStyle(m_capStyle);
|
||||
@@ -207,6 +208,7 @@ void QGIPrimPath::setWidth(double w)
|
||||
void QGIPrimPath::setStyle(Qt::PenStyle s)
|
||||
{
|
||||
// Base::Console().Message("QGIPP::setStyle(QTPS: %d)\n", s);
|
||||
m_styleNormal = s;
|
||||
m_styleCurrent = s;
|
||||
}
|
||||
|
||||
@@ -214,6 +216,7 @@ void QGIPrimPath::setStyle(int s)
|
||||
{
|
||||
// Base::Console().Message("QGIPP::setStyle(int: %d)\n", s);
|
||||
m_styleCurrent = static_cast<Qt::PenStyle>(s);
|
||||
m_styleNormal = static_cast<Qt::PenStyle>(s);
|
||||
}
|
||||
|
||||
void QGIPrimPath::setNormalColor(QColor c)
|
||||
@@ -308,6 +311,7 @@ void QGIPrimPath::paint ( QPainter * painter, const QStyleOptionGraphicsItem * o
|
||||
|
||||
m_pen.setWidthF(m_width);
|
||||
m_pen.setColor(m_colCurrent);
|
||||
m_pen.setStyle(m_styleCurrent);
|
||||
setPen(m_pen);
|
||||
|
||||
m_brush.setColor(m_fillColorCurrent);
|
||||
|
||||
@@ -289,8 +289,6 @@ void QGIViewPart::drawAllEdges()
|
||||
item->setNormalColor(PreferencesGui::getAccessibleQColor(PreferencesGui::normalQColor()));
|
||||
item->setStyle(Qt::SolidLine);
|
||||
if ((*itGeom)->getCosmetic()) {
|
||||
item->setCosmetic(true);
|
||||
|
||||
// cosmetic edge - format appropriately
|
||||
int source = (*itGeom)->source();
|
||||
if (source == COSMETICEDGE) {
|
||||
|
||||
Reference in New Issue
Block a user