ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-15 03:10:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0021263: EDF 1868: Several use cases fail (regressions).

Browse Source
This commit is contained in:
jfa 2011-05-16 12:31:57 +00:00
parent 8298fa82d9
commit 7bb904513a
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -419,6 +419,7 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
bool addGroup; bool addGroup;
bool circularFoundAndAdded = false; bool circularFoundAndAdded = false;
bool circularFound10 = false;
bool incidentPipeFound = false; bool incidentPipeFound = false;
bool mainPipeFound = false; bool mainPipeFound = false;
bool mainPipeFoundAndAdded = false; bool mainPipeFoundAndAdded = false;
@ -519,6 +520,14 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
addGroup = true; addGroup = true;
circularFoundAndAdded = true; circularFoundAndAdded = true;
aGroup->SetName("CIRCULAR_QUARTER_PIPE"); aGroup->SetName("CIRCULAR_QUARTER_PIPE");
if (nbEdges == 10) {
circularFound10 = true;
}
}
else if (!circularFound10 && nbEdges == 10) {
circularFound10 = true;
addGroup = true;
aGroup->SetName("CIRCULAR_QUARTER_PIPE");
} }
} }
else if (nbEdges == 8) { else if (nbEdges == 8) {
@ -526,31 +535,39 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
mainPipeFound = true; mainPipeFound = true;
flangeFound = false; flangeFound = false;
TopExp_Explorer Ex(aGroupShapeTrsfInv,TopAbs_VERTEX); bool isNearZ0 = false;
bool isBelowZ0 = false;
TopExp_Explorer Ex (aGroupShapeTrsfInv,TopAbs_VERTEX);
while (Ex.More()) { while (Ex.More()) {
gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current())); gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
double x=aP.X(), y=aP.Y(), z=aP.Z(); double x=aP.X(), y=aP.Y(), z=aP.Z();
// tuy_princ_long_avant & tuy_princ_long_apres // tuy_princ_long_avant & tuy_princ_long_apres
bool isMain = (((z < Precision::Confusion()) || (x < Precision::Confusion())) && //bool isMain = (((z < Precision::Confusion()) || (x < Precision::Confusion())) &&
((y <= aR1Ext + Precision::Confusion()) || // ((y <= aR1Ext + Precision::Confusion()) ||
(y <= -(aR1Ext + Precision::Confusion())) || // (y <= -(aR1Ext + Precision::Confusion())) ||
(y <= theR1 + Precision::Confusion()) || // (y <= theR1 + Precision::Confusion()) ||
(y == -(theR1 + Precision::Confusion())))); // (y == -(theR1 + Precision::Confusion()))));
bool isMain = ((z < Precision::Confusion() || x < Precision::Confusion()) &&
(fabs(y) > theR1 - Precision::Confusion() ||
fabs(y) < Precision::Confusion()));
if (!isMain) { if (!isMain) {
mainPipeFound = false; mainPipeFound = false;
} }
// collerette // collerette
if (z < Precision::Confusion()) { //if (z < Precision::Confusion() && !isMain) {
flangeFound = true; // flangeFound = true;
if (!flangeFoundAndAdded) { // if (!flangeFoundAndAdded) {
flangeFoundAndAdded = true; // flangeFoundAndAdded = true;
addGroup = true; // addGroup = true;
aGroup->SetName("FLANGE"); // aGroup->SetName("FLANGE");
} // }
} //}
if (fabs(z) < Precision::Confusion()) isNearZ0 = true;
if (z < - Precision::Confusion()) isBelowZ0 = true;
// tuyau incident // tuyau incident
if ((Abs(x) > aR2Ext + Precision::Confusion()) || if ((Abs(x) > aR2Ext + Precision::Confusion()) ||
@ -567,6 +584,14 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
addGroup = true; addGroup = true;
aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE"); aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE");
} }
if (isNearZ0 && !isBelowZ0) {
flangeFound = true;
if (!flangeFoundAndAdded) {
flangeFoundAndAdded = true;
addGroup = true;
aGroup->SetName("FLANGE");
}
}
if (!addGroup && (!incidentPipeFound && if (!addGroup && (!incidentPipeFound &&
!mainPipeFound && !mainPipeFound &&
!flangeFound && !flangeFound &&