diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp index f825bd238f..0a155fe9e5 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.cpp +++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp @@ -27,38 +27,39 @@ # include #include +#include +#include +#include #include #include -#include -#include #include -#include -# include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include -#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -221,9 +222,9 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) double scale = getScale(); BRepBuilderAPI_Copy BuilderCopy(shape); - TopoDS_Shape myShape = BuilderCopy.Shape(); + TopoDS_Shape copyShape = BuilderCopy.Shape(); - gp_Pnt gpCenter = TechDraw::findCentroid(myShape, + gp_Pnt gpCenter = TechDraw::findCentroid(copyShape, dirDetail); Base::Vector3d shapeCenter = Base::Vector3d(gpCenter.X(),gpCenter.Y(),gpCenter.Z()); @@ -231,15 +232,15 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) gp_Ax2 vaBase; viewAxis = dvp->getViewAxis(shapeCenter, dirDetail, true); - myShape = TechDraw::moveShape(myShape, //centre on origin + copyShape = TechDraw::moveShape(copyShape, //centre on origin -shapeCenter); - gpCenter = TechDraw::findCentroid(myShape, //sb origin! + gpCenter = TechDraw::findCentroid(copyShape, //sb origin! dirDetail); shapeCenter = Base::Vector3d(gpCenter.X(),gpCenter.Y(),gpCenter.Z()); Bnd_Box bbxSource; bbxSource.SetGap(0.0); - BRepBndLib::Add(myShape, bbxSource); + BRepBndLib::Add(copyShape, bbxSource); double diag = sqrt(bbxSource.SquareExtent()); Base::Vector3d extentFar,extentNear; @@ -269,7 +270,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) gp_Vec extrudeDir(extrudeVec.x,extrudeVec.y,extrudeVec.z); TopoDS_Shape tool = BRepPrimAPI_MakePrism(aProjFace, extrudeDir, false, true).Shape(); - BRepAlgoAPI_Common mkCommon(myShape,tool); + BRepAlgoAPI_Common mkCommon(copyShape,tool); if (!mkCommon.IsDone()) { Base::Console().Log("DVD::execute - mkCommon not done\n"); return new App::DocumentObjectExecReturn("DVD::execute - mkCommon not done"); @@ -286,6 +287,11 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) Base::Console().Warning("DVD::execute - mkCommon.Shape is not a solid!\n"); } TopoDS_Shape detail = mkCommon.Shape(); + +// BRepTools::Write(tool, "DVDTool.brep"); //debug +// BRepTools::Write(copyShape, "DVDCopy.brep"); //debug +// BRepTools::Write(detail, "DVDdetail.brep"); //debug + Bnd_Box testBox; testBox.SetGap(0.0); BRepBndLib::Add(detail, testBox); @@ -305,7 +311,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) // TopoDS_Compound Comp; // builder.MakeCompound(Comp); // builder.Add(Comp, tool); -// builder.Add(Comp, myShape); +// builder.Add(Comp, copyShape); gp_Pnt inputCenter; try { diff --git a/src/Mod/TechDraw/Gui/QGIMatting.cpp b/src/Mod/TechDraw/Gui/QGIMatting.cpp index eedb639794..0b1d810586 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.cpp +++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp @@ -79,10 +79,9 @@ QGIMatting::QGIMatting() : void QGIMatting::draw() { prepareGeometryChange(); - double radiusFudge = 1.25; //keep slightly larger than fudge in App/DVDetail to prevent bleed through - double outerRadius = m_radius * radiusFudge; - m_width = outerRadius; - m_height = outerRadius; + double radiusFudge = 1.5; //keep slightly larger than fudge in App/DVDetail to prevent bleed through + m_width = m_radius * radiusFudge; + m_height = m_radius * radiusFudge; QRectF outline(-m_width,-m_height,2.0 * m_width,2.0 * m_height); QPainterPath ppOut; ppOut.addRect(outline);