OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0026174: Data Exchange, IGES - Loss of color after the second write of file

Browse Source 
A copy of myface is made, where further on the copy the geometry changes. We connect the face, wire, edge of the original shape with the one whose geometry was changed. This is done in order to get the original shape in the TransferWire() and TransferEdge() methods.
This commit is contained in:
ssafarov
2021-11-15 18:15:33 +03:00
parent e463b2f685
commit 6ba81a695f
8 changed files with 187 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/BRepToIGES/BRepToIGES_BRWire.cxx
View File

@@ -111,7 +111,8 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
}
else if (start.ShapeType() == TopAbs_EDGE) {
TopoDS_Edge E = TopoDS::Edge(start);
res = TransferEdge(E, Standard_False);
TopTools_DataMapOfShapeShape anEmptyMap;
res = TransferEdge(E, anEmptyMap, Standard_False);
}
else if (start.ShapeType() == TopAbs_WIRE) {
TopoDS_Wire W = TopoDS::Wire(start);
@@ -249,17 +250,18 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferVertex
//=============================================================================
Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge
(const TopoDS_Edge& myedge,
const Standard_Boolean isBRepMode)
(const TopoDS_Edge& theEdge,
const TopTools_DataMapOfShapeShape& theOriginMap,
const Standard_Boolean theIsBRepMode)
{
Handle(IGESData_IGESEntity) res;
if ( myedge.IsNull()) return res;
if (theEdge.IsNull()) return res;
// returns the 3d curve of the edge and the parameter range
TopLoc_Location L;
Standard_Real First, Last, U1, U2;
Handle(IGESData_IGESEntity) ICurve;
Handle(Geom_Curve) Curve3d = BRep_Tool::Curve(myedge, L, First, Last);
Handle(Geom_Curve) Curve3d = BRep_Tool::Curve(theEdge, L, First, Last);
//#28 rln 19.10.98 UKI60155, etc.
//Only Bezier will be converted into B-Spline, not Conic. This conertation
@@ -275,7 +277,7 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge
else
Curve3d = Handle(Geom_Curve)::DownCast(Curve3d->Copy());
if (myedge.Orientation() == TopAbs_REVERSED && !isBRepMode) {
if (theEdge.Orientation() == TopAbs_REVERSED && !theIsBRepMode) {
U1 = Curve3d->ReversedParameter(Last);
U2 = Curve3d->ReversedParameter(First);
Curve3d->Reverse();
@@ -296,7 +298,9 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge
if (!ICurve.IsNull()) res = ICurve;
SetShapeResult ( myedge, res );
// In the reverted face's case find an origin by the reverted
TopoDS_Edge anEdge = !theOriginMap.IsEmpty() ? TopoDS::Edge(theOriginMap.Find(theEdge)) : theEdge;
SetShapeResult ( anEdge, res );
return res;
}
@@ -306,22 +310,23 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge
// TransferEdge
//=============================================================================
Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge& myedge,
const TopoDS_Face& myface,
const Standard_Real length,
const Standard_Boolean isBRepMode)
Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge& theEdge,
const TopoDS_Face& theFace,
const TopTools_DataMapOfShapeShape& theOriginMap,
const Standard_Real theLength,
const Standard_Boolean theIsBRepMode)
{
Handle(IGESData_IGESEntity) res;
if ( myedge.IsNull() || GetPCurveMode() ==0 ||
( ! isBRepMode && BRep_Tool::Degenerated ( myedge ) ) ) return res;
if (theEdge.IsNull() || GetPCurveMode() ==0 ||
( ! theIsBRepMode && BRep_Tool::Degenerated (theEdge) ) ) return res;
//S4181 pdn 23.04.99 adjusting length factor according to analytic mode.
Standard_Real myLen = length;
Standard_Boolean analyticMode = ( GetConvertSurfaceMode() ==0 && isBRepMode );
Standard_Real myLen = theLength;
Standard_Boolean analyticMode = ( GetConvertSurfaceMode() ==0 && theIsBRepMode );
// returns the 2d curve associated to myedge in the parametric space of myface
// returns the 2d curve associated to theEdge in the parametric space of theFace
Standard_Real First, Last;
Handle(Geom2d_Curve) Curve2d = BRep_Tool::CurveOnSurface(myedge, myface, First, Last);
Handle(Geom2d_Curve) Curve2d = BRep_Tool::CurveOnSurface(theEdge, theFace, First, Last);
Handle(IGESData_IGESEntity) ICurve2d;
//#29 rln 19.10.98
@@ -333,12 +338,12 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge&
// It is necessary to invert (u,v) surfaces of revolution.
TopLoc_Location L;
Handle(Geom_Surface) st = BRep_Tool::Surface(myface, L);
Handle(Geom_Surface) st = BRep_Tool::Surface(theFace, L);
if (st->IsKind(STANDARD_TYPE(Geom_Plane))){
return res;
}
Standard_Real Ufirst, Ulast, Vfirst, Vlast;
BRepTools::UVBounds(myface, Ufirst, Ulast, Vfirst, Vlast);
BRepTools::UVBounds(theFace, Ufirst, Ulast, Vfirst, Vlast);
Handle(Geom_Surface) Surf;
if (st->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
@@ -439,7 +444,7 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge&
//S4181 transfer functionality
gp_Trsf2d trans;
Standard_Real uFact = 1.;
if(isBRepMode && Surf->IsKind(STANDARD_TYPE(Geom_Plane))) {
if(theIsBRepMode && Surf->IsKind(STANDARD_TYPE(Geom_Plane))) {
trans.SetScale(gp_Pnt2d(0,0),1./GetUnit());
}
if(Surf->IsKind(STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion))) {
@@ -485,7 +490,7 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge&
Curve2d = sbe.TransformPCurve(Curve2d,trans1,1.,First,Last);
}
if (myedge.Orientation() == TopAbs_REVERSED) {
if (theEdge.Orientation() == TopAbs_REVERSED) {
Standard_Real tmpFirst = Curve2d->ReversedParameter(Last),
tmpLast = Curve2d->ReversedParameter(First);
Curve2d->Reverse();
@@ -503,7 +508,9 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferEdge (const TopoDS_Edge&
if (!ICurve2d.IsNull()) res = ICurve2d;
SetShapeResult ( myedge, res );
// In the reverted face's case find an origin by the reverted
TopoDS_Edge anEdge = !theOriginMap.IsEmpty() ? TopoDS::Edge(theOriginMap.Find(theEdge)) : theEdge;
SetShapeResult ( anEdge, res );
return res;
}
@@ -535,7 +542,8 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
AddWarning(mywire, "an Edge is a null entity");
}
else {
ent = TransferEdge(E, Standard_False);
TopTools_DataMapOfShapeShape anEmptyMap;
ent = TransferEdge(E, anEmptyMap, Standard_False);
if (!ent.IsNull()) Seq->Append(ent);
}
}
@@ -571,13 +579,14 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
//=============================================================================
Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
(const TopoDS_Wire & mywire,
const TopoDS_Face & myface,
Handle(IGESData_IGESEntity)& mycurve2d,
const Standard_Real length)
(const TopoDS_Wire & theWire,
const TopoDS_Face& theFace,
const TopTools_DataMapOfShapeShape& theOriginMap,
Handle(IGESData_IGESEntity)& theCurve2d,
const Standard_Real theLength)
{
Handle(IGESData_IGESEntity) res;
if ( mywire.IsNull()) return res;
if (theWire.IsNull()) return res;
Handle(IGESData_IGESEntity) ent3d ;
Handle(IGESData_IGESEntity) ent2d ;
@@ -586,45 +595,45 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
// create a 3d CompositeCurve and a 2d CompositeCurve
TopExp_Explorer TE(mywire, TopAbs_VERTEX);
TopExp_Explorer TE(theWire, TopAbs_VERTEX);
if ( TE.More()) {
// PTV OCC908 workaround for KAS:dev version
/*
BRepTools_WireExplorer WE;
for ( WE.Init(mywire,myface); WE.More(); WE.Next()) {
for ( WE.Init(theWire,theFace); WE.More(); WE.Next()) {
TopoDS_Edge E = WE.Current();
if (E.IsNull()) {
AddWarning(mywire, "an Edge is a null entity");
AddWarning(theWire, "an Edge is a null entity");
}
else {
ent3d = TransferEdge(E, Standard_False);
if (!ent3d.IsNull()) Seq3d->Append(ent3d);
ent2d = TransferEdge(E, myface, length, Standard_False);
ent2d = TransferEdge(E, theFace, theLength, Standard_False);
if (!ent2d.IsNull()) Seq2d->Append(ent2d);
}
}
*/
Handle(ShapeFix_Wire) aSFW =
new ShapeFix_Wire( mywire, myface, Precision::Confusion() );
new ShapeFix_Wire( theWire, theFace, Precision::Confusion() );
aSFW->FixReorder();
Handle(ShapeExtend_WireData) aSEWD = aSFW->WireData();
Standard_Integer nbE = aSEWD->NbEdges();
for (Standard_Integer windex = 1; windex <= nbE; windex++) {
TopoDS_Edge E = aSEWD->Edge( windex );
if (E.IsNull()) {
AddWarning(mywire, "an Edge is a null entity");
AddWarning(theWire, "an Edge is a null entity");
}
else {
ent3d = TransferEdge(E, Standard_False);
ent3d = TransferEdge(E, theOriginMap, Standard_False);
if (!ent3d.IsNull()) Seq3d->Append(ent3d);
ent2d = TransferEdge(E, myface, length, Standard_False);
ent2d = TransferEdge(E, theFace, theOriginMap, theLength, Standard_False);
if (!ent2d.IsNull()) Seq2d->Append(ent2d);
}
}
// OCC908 end of workaround
}
else
AddWarning(mywire, " no Vertex associated to the Wire");
AddWarning(theWire, " no Vertex associated to the Wire");
// Composite Curve 3D
Standard_Integer nb3d = Seq3d->Length();
@@ -649,7 +658,7 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
Standard_Integer nb2d = Seq2d->Length();
Handle(IGESData_HArray1OfIGESEntity) Tab2d;
if ( nb2d == 1 ) {
mycurve2d = ent2d;
theCurve2d = ent2d;
}
else if (nb2d >= 2) {
Tab2d = new IGESData_HArray1OfIGESEntity(1,nb2d);
@@ -661,10 +670,12 @@ Handle(IGESData_IGESEntity) BRepToIGES_BRWire ::TransferWire
}
Handle(IGESGeom_CompositeCurve) Comp = new IGESGeom_CompositeCurve;
Comp->Init(Tab2d);
mycurve2d = Comp;
theCurve2d = Comp;
}
SetShapeResult ( mywire, res );
// In the reverted face's case find an origin by the reverted
TopoDS_Wire aWire = !theOriginMap.IsEmpty() ? TopoDS::Wire(theOriginMap.Find(theWire)) : theWire;
SetShapeResult ( aWire, res );
return res;
}