diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 073a6f81f..ff76811e5 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -226,6 +226,9 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void) inputCenter, Scale.getValue()); buildGeometryObject(mirroredShape,inputCenter); +#if MOD_TECHDRAW_HANDLE_FACES + extractFaces(); +#endif //#if MOD_TECHDRAW_HANDLE_FACES TopoDS_Compound sectionCompound = findSectionPlaneIntersections(rawShape); TopoDS_Shape mirroredSection = TechDrawGeometry::mirrorShape(sectionCompound, diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index cce913a79..98d035da7 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -151,17 +151,20 @@ void QGIFace::setHighlighted(bool b) void QGIFace::setFill(QColor c, Qt::BrushStyle s) { m_colNormalFill = c; - m_styleCurr = s; + //m_styleCurr = s; + m_styleNormal = s; } void QGIFace::setFill(QBrush b) { m_colNormalFill = b.color(); - m_styleCurr = b.style(); + //m_styleCurr = b.style(); + m_styleNormal = b.style(); } void QGIFace::resetFill() { m_colNormalFill = m_colDefFill; - m_styleCurr = m_styleDef; + //m_styleCurr = m_styleDef; + m_styleNormal = m_styleDef; } QRectF QGIFace::boundingRect() const @@ -176,7 +179,7 @@ QPainterPath QGIFace::shape() const void QGIFace::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) { QStyleOptionGraphicsItem myOption(*option); - myOption.state &= ~QStyle::State_Selected; + //myOption.state &= ~QStyle::State_Selected; m_pen.setColor(m_colCurrent); setPen(m_pen); diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.cpp b/src/Mod/TechDraw/Gui/QGIViewSection.cpp index 0af07eb2b..a3abc1815 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSection.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSection.cpp @@ -79,6 +79,8 @@ void QGIViewSection::drawSectionFace() QGIFace* newFace = drawFace(*fit,-1); //TODO: do we need to know which sectionFace this QGIFace came from? newFace->setZValue(ZVALUE::SECTIONFACE); newFace->setFill(faceColor, Qt::SolidPattern); + newFace->setPrettyNormal(); + newFace->setAcceptHoverEvents(false); newFace->setFlag(QGraphicsItem::ItemIsSelectable, false); newFace->setAcceptHoverEvents(false); } diff --git a/src/Mod/TechDraw/Gui/ZVALUE.h b/src/Mod/TechDraw/Gui/ZVALUE.h index 1bfcfac08..75834212f 100644 --- a/src/Mod/TechDraw/Gui/ZVALUE.h +++ b/src/Mod/TechDraw/Gui/ZVALUE.h @@ -4,8 +4,8 @@ namespace ZVALUE { const int BACKGROUND = -999999; const int TEMPLATE = -1000; const int SVGTEMPLATE = -500; - const int SECTIONFACE = 10; - const int FACE = 20; + const int FACE = 10; + const int SECTIONFACE = 20; const int HATCH = 25; const int HIDEDGE = 27; const int EDGE = 30;