kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]fix bad 3d dimensions

Browse Source 
- mapToPage was left in place when converting to using
  projectPoint instead of projectToPlane.
This commit is contained in:
wandererfan
2023-03-25 15:59:04 -04:00
committed by WandererFan
parent 5aeba7a46f
commit 20e44eba50
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@@ -648,9 +648,8 @@ pointPair DrawViewDimension::getPointsOneEdge(ReferenceVector references)
gp_Pnt gEnd1 = BRep_Tool::Pnt(TopExp::LastVertex(edge));
pointPair pts(DrawUtil::toVector3d(gEnd0), DrawUtil::toVector3d(gEnd1));
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -682,9 +681,8 @@ pointPair DrawViewDimension::getPointsTwoEdges(ReferenceVector references)
}
pointPair pts = closestPoints(geometry0, geometry1);
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -721,9 +719,8 @@ pointPair DrawViewDimension::getPointsTwoVerts(ReferenceVector references)
gp_Pnt gPoint1 = BRep_Tool::Pnt(vertex1);
pointPair pts(DrawUtil::toVector3d(gPoint0), DrawUtil::toVector3d(gPoint1));
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -761,9 +758,8 @@ pointPair DrawViewDimension::getPointsEdgeVert(ReferenceVector references)
}
pointPair pts = closestPoints(geometry0, geometry1);
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -791,9 +787,8 @@ arcPoints DrawViewDimension::getArcParameters(ReferenceVector references)
}
const TopoDS_Edge& edge = TopoDS::Edge(geometry);
arcPoints pts = arcPointsFromEdge(edge);
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -913,6 +908,7 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge)
pts.arcEnds.second(DrawUtil::toVector3d(props.Value()));
props.SetParameter(pMid);
pts.onCurve.first(DrawUtil::toVector3d(props.Value()));
pts.onCurve.second(DrawUtil::toVector3d(props.Value()));
pts.midArc = DrawUtil::toVector3d(props.Value());
if (adapt.GetType() == GeomAbs_Circle) {
@@ -1117,9 +1113,8 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references
}
anglePoints pts(DrawUtil::toVector3d(gApex), DrawUtil::toVector3d(gFar0),
DrawUtil::toVector3d(gFar1));
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -1164,9 +1159,8 @@ anglePoints DrawViewDimension::getAnglePointsThreeVerts(ReferenceVector referenc
gp_Pnt point2 = BRep_Tool::Pnt(vertex2);
anglePoints pts(DrawUtil::toVector3d(point1), DrawUtil::toVector3d(point0),
DrawUtil::toVector3d(point2));
pts.move(getViewPart()->getOriginalCentroid());
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
pts.mapToPage(getViewPart());
return pts;
}
@@ -1178,7 +1172,6 @@ DrawViewPart* DrawViewDimension::getViewPart() const
return dynamic_cast<TechDraw::DrawViewPart*>(References2D.getValues().at(0));
}
//return the references controlling this dimension. 3d references are used when available
//otherwise 2d references are returned. no checking is performed. Result is pairs of (object, subName)
ReferenceVector DrawViewDimension::getEffectiveReferences() const