mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
0033379: Coding - Processing Clang-15 warnings
Fixed warning generated by Clang++-15
This commit is contained in:
parent
52cbf180cd
commit
1d0a88f015
src
AdvApp2Var
BOPAlgo
BRepAlgo
BRepFill
BRepMesh
BRepTools
BRepTopAdaptor
ChFi3d
DDataStd
Draw
Express
Geom2dGcc
GeomliteTest
Graphic3d
IGESData
IGESFile
IntPatch
IntStart
Interface
Poly
Prs3d
QABugs
RWGltf
RWMesh
SWDRAW
ShapeFix
TopOpeBRepBuild
TopOpeBRepBuild_FaceBuilder.cxxTopOpeBRepBuild_Grid.cxxTopOpeBRepBuild_GridEE.cxxTopOpeBRepBuild_Merge.cxxTopOpeBRepBuild_WireEdgeClassifier.cxxTopOpeBRepBuild_WireEdgeSet.cxxTopOpeBRepBuild_makefaces.cxx
TopOpeBRepDS
XSControl
XmlMDataStd
Xw
math
@ -911,10 +911,9 @@ int macrmsg_(const char *,//crout,
|
|||||||
/* Parameter adjustments */
|
/* Parameter adjustments */
|
||||||
ct -= ct_len;
|
ct -= ct_len;
|
||||||
(void )ct; // unused
|
(void )ct; // unused
|
||||||
|
(void )xt; // unused
|
||||||
|
(void )it; // unused
|
||||||
|
|
||||||
--xt;
|
|
||||||
--it;
|
|
||||||
|
|
||||||
/* Function Body */
|
/* Function Body */
|
||||||
mamdlng_(cln, 3L);
|
mamdlng_(cln, 3L);
|
||||||
|
|
||||||
|
@ -512,7 +512,6 @@ void Path (const GeomAdaptor_Surface& aGAS,
|
|||||||
Standard_Integer aNbWaysInside = 0;
|
Standard_Integer aNbWaysInside = 0;
|
||||||
BOPAlgo_EdgeInfo *pOnlyWayIn = NULL;
|
BOPAlgo_EdgeInfo *pOnlyWayIn = NULL;
|
||||||
|
|
||||||
Standard_Integer aCurIndexE = 0;
|
|
||||||
anIt.Initialize(aLEInfo);
|
anIt.Initialize(aLEInfo);
|
||||||
for (; anIt.More(); anIt.Next()) {
|
for (; anIt.More(); anIt.Next()) {
|
||||||
BOPAlgo_EdgeInfo& anEI=anIt.ChangeValue();
|
BOPAlgo_EdgeInfo& anEI=anIt.ChangeValue();
|
||||||
@ -521,7 +520,6 @@ void Path (const GeomAdaptor_Surface& aGAS,
|
|||||||
anIsNotPassed=!anEI.Passed();
|
anIsNotPassed=!anEI.Passed();
|
||||||
//
|
//
|
||||||
if (anIsOut && anIsNotPassed) {
|
if (anIsOut && anIsNotPassed) {
|
||||||
aCurIndexE++;
|
|
||||||
//
|
//
|
||||||
// Is there one way to go out of the vertex
|
// Is there one way to go out of the vertex
|
||||||
// we have to use it only.
|
// we have to use it only.
|
||||||
|
@ -401,12 +401,9 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
|
|||||||
//---------------------------------------------------------
|
//---------------------------------------------------------
|
||||||
// Classification of wires ones compared to the others.
|
// Classification of wires ones compared to the others.
|
||||||
//---------------------------------------------------------
|
//---------------------------------------------------------
|
||||||
Standard_Integer j,i = 1;
|
|
||||||
|
|
||||||
for (it.Initialize(wires) ; it.More(); it.Next()) {
|
for (it.Initialize(wires) ; it.More(); it.Next()) {
|
||||||
TopoDS_Wire& W1 = TopoDS::Wire(it.Value());
|
TopoDS_Wire& W1 = TopoDS::Wire(it.Value());
|
||||||
TopTools_ListIteratorOfListOfShape it2(wires);
|
TopTools_ListIteratorOfListOfShape it2(wires);
|
||||||
j = 1;
|
|
||||||
|
|
||||||
if (IsClosed(W1)) {
|
if (IsClosed(W1)) {
|
||||||
TopoDS_Shape aLocalShape = myFace.EmptyCopied();
|
TopoDS_Shape aLocalShape = myFace.EmptyCopied();
|
||||||
@ -422,10 +419,8 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
|
|||||||
Store (W2,W1,keyIsIn,keyContains);
|
Store (W2,W1,keyIsIn,keyContains);
|
||||||
}
|
}
|
||||||
it2.Next();
|
it2.Next();
|
||||||
j++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
TopTools_ListOfShape WireExt;
|
TopTools_ListOfShape WireExt;
|
||||||
|
|
||||||
|
@ -140,10 +140,9 @@ static void SeqOfVertices (const TopoDS_Wire& W,
|
|||||||
TopTools_SequenceOfShape& S)
|
TopTools_SequenceOfShape& S)
|
||||||
{
|
{
|
||||||
S.Clear();
|
S.Clear();
|
||||||
Standard_Integer jj, cpt = 0;
|
Standard_Integer jj;
|
||||||
TopExp_Explorer PE;
|
TopExp_Explorer PE;
|
||||||
for (PE.Init(W,TopAbs_VERTEX); PE.More(); PE.Next()) {
|
for (PE.Init(W,TopAbs_VERTEX); PE.More(); PE.Next()) {
|
||||||
cpt++;
|
|
||||||
Standard_Boolean trouve=Standard_False;
|
Standard_Boolean trouve=Standard_False;
|
||||||
for (jj=1;jj<=S.Length() && (!trouve);jj++) {
|
for (jj=1;jj<=S.Length() && (!trouve);jj++) {
|
||||||
if (S.Value(jj).IsSame(PE.Current())) trouve = Standard_True;
|
if (S.Value(jj).IsSame(PE.Current())) trouve = Standard_True;
|
||||||
@ -819,7 +818,6 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
|
|||||||
report = (nbmax != nbmin || contS >= GeomAbs_C1 );
|
report = (nbmax != nbmin || contS >= GeomAbs_C1 );
|
||||||
|
|
||||||
// initialization of the map
|
// initialization of the map
|
||||||
Standard_Integer nbE = 0;
|
|
||||||
TopTools_ListOfShape Empty;
|
TopTools_ListOfShape Empty;
|
||||||
for (i=1; i<=nbSects; i++) {
|
for (i=1; i<=nbSects; i++) {
|
||||||
TopoDS_Wire W = TopoDS::Wire(myWork(i));
|
TopoDS_Wire W = TopoDS::Wire(myWork(i));
|
||||||
@ -827,7 +825,6 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
|
|||||||
TopoDS_Edge E = TopoDS::Edge(anExp.Current());
|
TopoDS_Edge E = TopoDS::Edge(anExp.Current());
|
||||||
myMap.Bind(E,Empty);
|
myMap.Bind(E,Empty);
|
||||||
myMap(E).Append(E);
|
myMap(E).Append(E);
|
||||||
nbE++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1474,15 +1471,11 @@ void BRepFill_CompatibleWires::SameNumberByACR(const Standard_Boolean report)
|
|||||||
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap;
|
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap;
|
||||||
//TopTools_ListIteratorOfListOfShape itlist;
|
//TopTools_ListIteratorOfListOfShape itlist;
|
||||||
TopoDS_Edge Ancestor;
|
TopoDS_Edge Ancestor;
|
||||||
Standard_Integer nbedge, nblist=0;
|
|
||||||
Standard_Boolean found = Standard_False;
|
Standard_Boolean found = Standard_False;
|
||||||
|
|
||||||
for (itmap.Initialize(myMap);itmap.More()&&(!found);itmap.Next()) {
|
for (itmap.Initialize(myMap);itmap.More()&&(!found);itmap.Next()) {
|
||||||
nblist++;
|
|
||||||
TopTools_ListIteratorOfListOfShape itlist(itmap.Value());
|
TopTools_ListIteratorOfListOfShape itlist(itmap.Value());
|
||||||
nbedge = 0;
|
|
||||||
while (itlist.More()&&(!found)) {
|
while (itlist.More()&&(!found)) {
|
||||||
nbedge++;
|
|
||||||
TopoDS_Edge ECur = TopoDS::Edge(itlist.Value());
|
TopoDS_Edge ECur = TopoDS::Edge(itlist.Value());
|
||||||
|
|
||||||
if (Ecur.IsSame(ECur)) {
|
if (Ecur.IsSame(ECur)) {
|
||||||
|
@ -770,9 +770,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
|
|||||||
TopTools_DataMapOfShapeSequenceOfShape MapSeqVer;
|
TopTools_DataMapOfShapeSequenceOfShape MapSeqVer;
|
||||||
BRepFill_DataMapOfShapeSequenceOfPnt MapSeqPar;
|
BRepFill_DataMapOfShapeSequenceOfPnt MapSeqPar;
|
||||||
|
|
||||||
Standard_Integer vv = 0;
|
|
||||||
for(ProfExp.Init(myProfile); ProfExp.More(); ProfExp.Next()) {
|
for(ProfExp.Init(myProfile); ProfExp.More(); ProfExp.Next()) {
|
||||||
vv++;
|
|
||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
// Return two faces separated by the bissectrice.
|
// Return two faces separated by the bissectrice.
|
||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
|
@ -635,9 +635,6 @@ struct CDelaBella : IDelaBella
|
|||||||
// 2. DELETE VISIBLE FACES & ADD NEW ONES
|
// 2. DELETE VISIBLE FACES & ADD NEW ONES
|
||||||
// (we also build silhouette (vertex loop) between visible & invisible faces)
|
// (we also build silhouette (vertex loop) between visible & invisible faces)
|
||||||
|
|
||||||
int del = 0;
|
|
||||||
int add = 0;
|
|
||||||
|
|
||||||
// push first visible face onto stack (of visible faces)
|
// push first visible face onto stack (of visible faces)
|
||||||
Face* stack = _f;
|
Face* stack = _f;
|
||||||
_f->next = _f; // old trick to use list pointers as 'on-stack' markers
|
_f->next = _f; // old trick to use list pointers as 'on-stack' markers
|
||||||
@ -656,7 +653,6 @@ struct CDelaBella : IDelaBella
|
|||||||
|
|
||||||
// delete visible face
|
// delete visible face
|
||||||
_f->Free(&cache);
|
_f->Free(&cache);
|
||||||
del++;
|
|
||||||
|
|
||||||
// check all 3 neighbors
|
// check all 3 neighbors
|
||||||
for (int e = 0; e < 3; e++)
|
for (int e = 0; e < 3; e++)
|
||||||
@ -667,7 +663,6 @@ struct CDelaBella : IDelaBella
|
|||||||
if (n->dot(*_q) <= 0) // if neighbor is not visible we have slihouette edge
|
if (n->dot(*_q) <= 0) // if neighbor is not visible we have slihouette edge
|
||||||
{
|
{
|
||||||
// build face
|
// build face
|
||||||
add++;
|
|
||||||
|
|
||||||
// ab: given face adjacency [index][],
|
// ab: given face adjacency [index][],
|
||||||
// it provides [][2] vertex indices on shared edge (CCW order)
|
// it provides [][2] vertex indices on shared edge (CCW order)
|
||||||
@ -724,11 +719,6 @@ struct CDelaBella : IDelaBella
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if add<del+2 hungry hull has consumed some point
|
|
||||||
// that means we can't do delaunay for some under precision reasons
|
|
||||||
// although convex hull would be fine with it
|
|
||||||
assert(add == del + 2);
|
|
||||||
|
|
||||||
// 3. SEW SIDES OF CONE BUILT ON SLIHOUTTE SEGMENTS
|
// 3. SEW SIDES OF CONE BUILT ON SLIHOUTTE SEGMENTS
|
||||||
|
|
||||||
hull = face_alloc + 2 * i - 4 + 1; // last added face
|
hull = face_alloc + 2 * i - 4 + 1; // last added face
|
||||||
|
@ -47,9 +47,9 @@
|
|||||||
|
|
||||||
#ifdef MacOS
|
#ifdef MacOS
|
||||||
#define strcasecmp(p,q) strcmp(p,q)
|
#define strcasecmp(p,q) strcmp(p,q)
|
||||||
#elseif _WIN32
|
#elif _WIN32
|
||||||
#define strcasecmp strcmp
|
#define strcasecmp strcmp
|
||||||
#elseif AIX
|
#elif AIX
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -95,10 +95,5 @@ void BRepTopAdaptor_Tool::SetTopolTool(const Handle(BRepTopAdaptor_TopolTool)& T
|
|||||||
myTopolTool=TT;
|
myTopolTool=TT;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BRepTopAdaptor_Tool::Destroy() {
|
void BRepTopAdaptor_Tool::Destroy() {}
|
||||||
int i;
|
|
||||||
i=0;
|
|
||||||
i++;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -145,9 +145,9 @@ static void Indices ( const Standard_Integer n,
|
|||||||
Standard_Integer & icmoins)
|
Standard_Integer & icmoins)
|
||||||
{
|
{
|
||||||
if (ic== (n-1)) icplus=0;
|
if (ic== (n-1)) icplus=0;
|
||||||
else icplus=ic+1;
|
else icplus=ic+1;
|
||||||
if (ic==0) icmoins=n-1;
|
if (ic==0) icmoins=n-1;
|
||||||
else icmoins=ic-1;
|
else icmoins=ic-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
@ -525,7 +525,7 @@ static void CalculBatten (const Handle (GeomAdaptor_Surface)& ASurf,
|
|||||||
else if (contraint2)
|
else if (contraint2)
|
||||||
anglebig=Abs(ang2)>1.2;
|
anglebig=Abs(ang2)>1.2;
|
||||||
if (isplane && (Abs(ang1)>M_PI/2 || Abs(ang2)>M_PI/2))
|
if (isplane && (Abs(ang1)>M_PI/2 || Abs(ang2)>M_PI/2))
|
||||||
isplane=Standard_False;
|
isplane=Standard_False;
|
||||||
if (anglebig && !isplane) {
|
if (anglebig && !isplane) {
|
||||||
CalculDroite(p2d1,xdir,ydir,pcurve);
|
CalculDroite(p2d1,xdir,ydir,pcurve);
|
||||||
}
|
}
|
||||||
@ -1063,7 +1063,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
|
|||||||
Standard_Integer jfp = 0,ii;
|
Standard_Integer jfp = 0,ii;
|
||||||
Standard_Integer ic,icplus,icmoins,icplus2,
|
Standard_Integer ic,icplus,icmoins,icplus2,
|
||||||
sense,index = 0,indice,isurf1,isurf2;
|
sense,index = 0,indice,isurf1,isurf2;
|
||||||
Standard_Integer cbplus=0, n3d=0,IVtx = 0,nb;
|
Standard_Integer n3d=0,IVtx = 0,nb;
|
||||||
Standard_Boolean sameside,trouve,isfirst;
|
Standard_Boolean sameside,trouve,isfirst;
|
||||||
Standard_Real pardeb ,parfin,xdir,ydir;
|
Standard_Real pardeb ,parfin,xdir,ydir;
|
||||||
Standard_Real tolapp=1.e-4,maxapp = 0.,maxapp1 = 0.,avedev;
|
Standard_Real tolapp=1.e-4,maxapp = 0.,maxapp1 = 0.,avedev;
|
||||||
@ -1369,17 +1369,17 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
|
|||||||
if (cp1.IsOnArc()){
|
if (cp1.IsOnArc()){
|
||||||
ChFi3d_cherche_vertex(Arc,cp1.Arc(),Vcom,trouve);
|
ChFi3d_cherche_vertex(Arc,cp1.Arc(),Vcom,trouve);
|
||||||
if (trouve) angedg=Abs(ChFi3d_AngleEdge(Vcom,Arc,cp1.Arc()));
|
if (trouve) angedg=Abs(ChFi3d_AngleEdge(Vcom,Arc,cp1.Arc()));
|
||||||
if (!cp1.Arc().IsSame(Arc) && Abs(angedg-M_PI)<0.01){
|
if (!cp1.Arc().IsSame(Arc) && Abs(angedg-M_PI)<0.01){
|
||||||
Evive.SetValue(ic,cp1.Arc());
|
Evive.SetValue(ic,cp1.Arc());
|
||||||
ChFi3d_edge_common_faces(myEFMap(cp1.Arc()),F1,F2);
|
ChFi3d_edge_common_faces(myEFMap(cp1.Arc()),F1,F2);
|
||||||
if (!Fvive.Value(ic,icplus).IsSame(F1) && !Fvive.Value(ic,icplus).IsSame(F2)) {
|
if (!Fvive.Value(ic,icplus).IsSame(F1) && !Fvive.Value(ic,icplus).IsSame(F2)) {
|
||||||
if (Fvive.Value(ic,icmoins).IsSame(F2)) {
|
if (Fvive.Value(ic,icmoins).IsSame(F2)) {
|
||||||
Fvive.SetValue(ic,icplus,F1);
|
Fvive.SetValue(ic,icplus,F1);
|
||||||
Fvive.SetValue(icplus,ic,F1);
|
Fvive.SetValue(icplus,ic,F1);
|
||||||
numfa.SetValue(ic,icplus,DStr.AddShape(F1));
|
numfa.SetValue(ic,icplus,DStr.AddShape(F1));
|
||||||
numfa.SetValue(icplus,ic,DStr.AddShape(F1));
|
numfa.SetValue(icplus,ic,DStr.AddShape(F1));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Fvive.SetValue(ic,icplus,F2);
|
Fvive.SetValue(ic,icplus,F2);
|
||||||
Fvive.SetValue(icplus,ic,F2);
|
Fvive.SetValue(icplus,ic,F2);
|
||||||
numfa.SetValue(ic,icplus,DStr.AddShape(F2));
|
numfa.SetValue(ic,icplus,DStr.AddShape(F2));
|
||||||
@ -1579,7 +1579,6 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
|
|||||||
Indices(nedge,ic,icplus,icmoins);
|
Indices(nedge,ic,icplus,icmoins);
|
||||||
Indices(nedge,icplus,icplus2,ic);
|
Indices(nedge,icplus,icplus2,ic);
|
||||||
if (!oksea.Value(ic)) {
|
if (!oksea.Value(ic)) {
|
||||||
cbplus++;
|
|
||||||
if (sharp.Value(ic)) {
|
if (sharp.Value(ic)) {
|
||||||
if (!samedge.Value(ic)){
|
if (!samedge.Value(ic)){
|
||||||
para=BRep_Tool::Parameter(V1,TopoDS::Edge(Evive.Value(ic)));
|
para=BRep_Tool::Parameter(V1,TopoDS::Edge(Evive.Value(ic)));
|
||||||
@ -1682,7 +1681,6 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
|
|||||||
if (oksea.Value(icmoins)) {
|
if (oksea.Value(icmoins)) {
|
||||||
oksea.SetValue(icmoins,Standard_False);
|
oksea.SetValue(icmoins,Standard_False);
|
||||||
inters=Standard_False;
|
inters=Standard_False;
|
||||||
cbplus++;
|
|
||||||
}
|
}
|
||||||
if (sens.Value(ic)==1) {
|
if (sens.Value(ic)==1) {
|
||||||
para=p.Value(ic,icmoins) + ec;
|
para=p.Value(ic,icmoins) + ec;
|
||||||
@ -1698,7 +1696,6 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
|
|||||||
if(oksea.Value(ic)) {
|
if(oksea.Value(ic)) {
|
||||||
oksea.SetValue(ic,Standard_False);
|
oksea.SetValue(ic,Standard_False);
|
||||||
inters=Standard_False;
|
inters=Standard_False;
|
||||||
cbplus++;
|
|
||||||
}
|
}
|
||||||
if (nconges!=1) {
|
if (nconges!=1) {
|
||||||
Standard_Real parold,parnew;
|
Standard_Real parold,parnew;
|
||||||
|
@ -702,15 +702,13 @@ static Standard_Integer DDataStd_SetIntArrayTest (Draw_Interpretor& di,
|
|||||||
TDF_Label label;
|
TDF_Label label;
|
||||||
DDF::AddLabel(DF, arg[2], label);
|
DDF::AddLabel(DF, arg[2], label);
|
||||||
Standard_Boolean isDelta = Draw::Atoi(arg[3]) != 0;
|
Standard_Boolean isDelta = Draw::Atoi(arg[3]) != 0;
|
||||||
Standard_Integer From = Draw::Atoi(arg[4]), To = Draw::Atoi( arg[5] ), j;
|
Standard_Integer From = Draw::Atoi(arg[4]), To = Draw::Atoi( arg[5] );
|
||||||
di << "Array of Standard_Integer with bounds from = " << From << " to = " << To << "\n";
|
di << "Array of Standard_Integer with bounds from = " << From << " to = " << To << "\n";
|
||||||
Handle(TDataStd_IntegerArray) A = TDataStd_IntegerArray::Set(label, From, To, isDelta);
|
Handle(TDataStd_IntegerArray) A = TDataStd_IntegerArray::Set(label, From, To, isDelta);
|
||||||
|
|
||||||
j = 6;
|
|
||||||
Standard_Integer k = 100;
|
Standard_Integer k = 100;
|
||||||
for(Standard_Integer i = From; i<=To; i++) {
|
for(Standard_Integer i = From; i<=To; i++) {
|
||||||
A->SetValue(i, ++k);
|
A->SetValue(i, ++k);
|
||||||
j++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -958,7 +958,6 @@ static Standard_Real ParseValue (char*& theName)
|
|||||||
// replace , and first and last () by space
|
// replace , and first and last () by space
|
||||||
if (argc > 1)
|
if (argc > 1)
|
||||||
{
|
{
|
||||||
Standard_Integer i = 2;
|
|
||||||
while (*p != '(') { ++p; }
|
while (*p != '(') { ++p; }
|
||||||
*p = ' ';
|
*p = ' ';
|
||||||
++p;
|
++p;
|
||||||
@ -971,7 +970,6 @@ static Standard_Real ParseValue (char*& theName)
|
|||||||
{
|
{
|
||||||
*p = ' ';
|
*p = ' ';
|
||||||
++p;
|
++p;
|
||||||
++i;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -130,7 +130,6 @@ Standard_Boolean Express_Select::GenerateClass() const
|
|||||||
if (!aSeqMember->IsEmpty())
|
if (!aSeqMember->IsEmpty())
|
||||||
anOS << "class StepData_SelectMember;\n";
|
anOS << "class StepData_SelectMember;\n";
|
||||||
|
|
||||||
Standard_Integer jj = 1;
|
|
||||||
for (Standard_Integer i = 1; i <= myItems->Length(); i++)
|
for (Standard_Integer i = 1; i <= myItems->Length(); i++)
|
||||||
{
|
{
|
||||||
Handle(Express_Item) anItem = myItems->Value (i);
|
Handle(Express_Item) anItem = myItems->Value (i);
|
||||||
@ -144,7 +143,6 @@ Standard_Boolean Express_Select::GenerateClass() const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
anOS << "class " << anItem->CPPName() << ";\n";
|
anOS << "class " << anItem->CPPName() << ";\n";
|
||||||
jj++;
|
|
||||||
}
|
}
|
||||||
anOS << "\n";
|
anOS << "\n";
|
||||||
|
|
||||||
|
@ -60,13 +60,11 @@ Geom2dGcc_FunctionTanCirCu(const gp_Circ2d& Circ ,
|
|||||||
Standard_Real aLast = Geom2dGcc_CurveTool::LastParameter(Curve);
|
Standard_Real aLast = Geom2dGcc_CurveTool::LastParameter(Curve);
|
||||||
Standard_Real aStep = (aLast - aFirst)/aNbSamp;
|
Standard_Real aStep = (aLast - aFirst)/aNbSamp;
|
||||||
Standard_Real anX = aFirst + aStep/2.;
|
Standard_Real anX = aFirst + aStep/2.;
|
||||||
Standard_Integer aNbP = 0;
|
|
||||||
gp_XY aLoc(0., 0.);
|
gp_XY aLoc(0., 0.);
|
||||||
|
|
||||||
while (anX <= aLast) {
|
while (anX <= aLast) {
|
||||||
aLoc += (Geom2dGcc_CurveTool::Value(Curve, anX)).XY();
|
aLoc += (Geom2dGcc_CurveTool::Value(Curve, anX)).XY();
|
||||||
anX += aStep;
|
anX += aStep;
|
||||||
aNbP++;
|
|
||||||
}
|
}
|
||||||
myWeight = Max((aLoc - TheCirc.Location().XY()).SquareModulus(), TheCirc.Radius());
|
myWeight = Max((aLoc - TheCirc.Location().XY()).SquareModulus(), TheCirc.Radius());
|
||||||
// Modified by Sergey KHROMOV - Thu Apr 5 09:51:25 2001 End
|
// Modified by Sergey KHROMOV - Thu Apr 5 09:51:25 2001 End
|
||||||
|
@ -1550,7 +1550,6 @@ static Standard_Integer compBsplSur (Draw_Interpretor& , Standard_Integer n, con
|
|||||||
Standard_Integer nbP = 100;
|
Standard_Integer nbP = 100;
|
||||||
Standard_Real aStepU = (aUmax - aUmin)/nbP;
|
Standard_Real aStepU = (aUmax - aUmin)/nbP;
|
||||||
Standard_Real aStepV = (aVmax - aVmin)/nbP;
|
Standard_Real aStepV = (aVmax - aVmin)/nbP;
|
||||||
Standard_Integer nbErr =0;
|
|
||||||
Standard_Integer i =1;
|
Standard_Integer i =1;
|
||||||
for( ; i <= nbP +1; i++)
|
for( ; i <= nbP +1; i++)
|
||||||
{
|
{
|
||||||
@ -1564,7 +1563,6 @@ static Standard_Integer compBsplSur (Draw_Interpretor& , Standard_Integer n, con
|
|||||||
Standard_Real aDist = aP1.SquareDistance(aP2);
|
Standard_Real aDist = aP1.SquareDistance(aP2);
|
||||||
if(aDist > Precision::SquareConfusion())
|
if(aDist > Precision::SquareConfusion())
|
||||||
{
|
{
|
||||||
nbErr++;
|
|
||||||
Standard_Real aD = sqrt(aDist);
|
Standard_Real aD = sqrt(aDist);
|
||||||
std::cout<<"Surfaces differ for U,V,Dist: "<<aU<<" "<<aV<<" "<<aD<<std::endl;
|
std::cout<<"Surfaces differ for U,V,Dist: "<<aU<<" "<<aV<<" "<<aD<<std::endl;
|
||||||
}
|
}
|
||||||
|
@ -216,7 +216,6 @@ void Graphic3d_PBRMaterial::GenerateEnvLUT (const Handle(Image_PixMap)& theLUT,
|
|||||||
{
|
{
|
||||||
Standard_ShortReal aCosV = x / Standard_ShortReal(theLUT->SizeX() - 1);
|
Standard_ShortReal aCosV = x / Standard_ShortReal(theLUT->SizeX() - 1);
|
||||||
Graphic3d_Vec3 aView = lutGenView (aCosV);
|
Graphic3d_Vec3 aView = lutGenView (aCosV);
|
||||||
unsigned int aCount = 0;
|
|
||||||
Graphic3d_Vec2 aResult = Graphic3d_Vec2 (0.f);
|
Graphic3d_Vec2 aResult = Graphic3d_Vec2 (0.f);
|
||||||
for (unsigned int i = 0; i < theNbIntegralSamples; ++i)
|
for (unsigned int i = 0; i < theNbIntegralSamples; ++i)
|
||||||
{
|
{
|
||||||
@ -225,7 +224,6 @@ void Graphic3d_PBRMaterial::GenerateEnvLUT (const Handle(Image_PixMap)& theLUT,
|
|||||||
Graphic3d_Vec3 aLight = lutGenReflect (aView, aHalf);
|
Graphic3d_Vec3 aLight = lutGenReflect (aView, aHalf);
|
||||||
if (aLight.z() >= 0.f)
|
if (aLight.z() >= 0.f)
|
||||||
{
|
{
|
||||||
++aCount;
|
|
||||||
Standard_ShortReal aCosVH = aView.Dot (aHalf);
|
Standard_ShortReal aCosVH = aView.Dot (aHalf);
|
||||||
Standard_ShortReal aGeometryFactor = lutGenGeometryFactor (aLight.z(),
|
Standard_ShortReal aGeometryFactor = lutGenGeometryFactor (aLight.z(),
|
||||||
aCosV,
|
aCosV,
|
||||||
|
@ -121,12 +121,10 @@ Handle(Graphic3d_ShaderObject) Graphic3d_ShaderObject::CreateFromSource (TCollec
|
|||||||
{
|
{
|
||||||
const ShaderVariable& aVar = aVarListIter.Value();
|
const ShaderVariable& aVar = aVarListIter.Value();
|
||||||
Standard_Integer aStageLower = IntegerLast(), aStageUpper = IntegerFirst();
|
Standard_Integer aStageLower = IntegerLast(), aStageUpper = IntegerFirst();
|
||||||
Standard_Integer aNbStages = 0;
|
|
||||||
for (Standard_Integer aStageIter = Graphic3d_TOS_VERTEX; aStageIter <= (Standard_Integer )Graphic3d_TOS_COMPUTE; aStageIter = aStageIter << 1)
|
for (Standard_Integer aStageIter = Graphic3d_TOS_VERTEX; aStageIter <= (Standard_Integer )Graphic3d_TOS_COMPUTE; aStageIter = aStageIter << 1)
|
||||||
{
|
{
|
||||||
if ((aVar.Stages & aStageIter) != 0)
|
if ((aVar.Stages & aStageIter) != 0)
|
||||||
{
|
{
|
||||||
++aNbStages;
|
|
||||||
aStageLower = Min (aStageLower, aStageIter);
|
aStageLower = Min (aStageLower, aStageIter);
|
||||||
aStageUpper = Max (aStageUpper, aStageIter);
|
aStageUpper = Max (aStageUpper, aStageIter);
|
||||||
}
|
}
|
||||||
|
@ -1088,13 +1088,12 @@ Standard_Boolean IGESData_ParamReader::ReadEnts
|
|||||||
Standard_Integer indmax = index+thenbitem*thetermsz-1;
|
Standard_Integer indmax = index+thenbitem*thetermsz-1;
|
||||||
val = new IGESData_HArray1OfIGESEntity (index , indmax);
|
val = new IGESData_HArray1OfIGESEntity (index , indmax);
|
||||||
Standard_Integer ind = index;
|
Standard_Integer ind = index;
|
||||||
Standard_Integer nbneg = 0, nbnul = 0;
|
Standard_Integer nbnul = 0;
|
||||||
|
|
||||||
Standard_Integer i; // svv Jan11 2000 : porting on DEC
|
Standard_Integer i; // svv Jan11 2000 : porting on DEC
|
||||||
for (i = FirstRead(); i > 0; i = NextRead()) {
|
for (i = FirstRead(); i > 0; i = NextRead()) {
|
||||||
Standard_Integer nval;
|
Standard_Integer nval;
|
||||||
if (!ReadingEntityNumber(i,nval)) nval = 0; //return Standard_False;
|
if (!ReadingEntityNumber(i,nval)) nval = 0; //return Standard_False;
|
||||||
if (nval < 0) nbneg ++;
|
|
||||||
if (nval > 0) {
|
if (nval > 0) {
|
||||||
DeclareAndCast(IGESData_IGESEntity,anent,IR->BoundEntity(nval));
|
DeclareAndCast(IGESData_IGESEntity,anent,IR->BoundEntity(nval));
|
||||||
if (anent.IsNull()) nbnul ++;
|
if (anent.IsNull()) nbnul ++;
|
||||||
|
@ -227,12 +227,9 @@ Standard_Integer IGESFile_Read
|
|||||||
char *res1, *res2, *nom, *num; char* parval;
|
char *res1, *res2, *nom, *num; char* parval;
|
||||||
int *v; int typarg;
|
int *v; int typarg;
|
||||||
int nbparam;
|
int nbparam;
|
||||||
|
|
||||||
|
|
||||||
Standard_Integer nn=0;
|
|
||||||
int ns; //szv#4:S4163:12Mar99 i unused
|
int ns; //szv#4:S4163:12Mar99 i unused
|
||||||
while ( (ns = iges_lirpart(&v,&res1,&res2,&nom,&num,&nbparam)) != 0) {
|
while ( (ns = iges_lirpart(&v,&res1,&res2,&nom,&num,&nbparam)) != 0) {
|
||||||
nn++;
|
|
||||||
recupnp = 0;
|
recupnp = 0;
|
||||||
recupne = (ns+1)/2; // numero entite
|
recupne = (ns+1)/2; // numero entite
|
||||||
// if(recupne > IR->NbEntities()) {
|
// if(recupne > IR->NbEntities()) {
|
||||||
|
@ -3287,7 +3287,6 @@ void IntPatch_PrmPrmIntersection::PointDepart(Handle(IntSurf_LineOn2S)& LineOn2S
|
|||||||
M2.ResetAnd();
|
M2.ResetAnd();
|
||||||
//
|
//
|
||||||
int newind=0;
|
int newind=0;
|
||||||
long unsigned Compt=0;
|
|
||||||
int ok=0;
|
int ok=0;
|
||||||
int indicepointtraite = 0;
|
int indicepointtraite = 0;
|
||||||
Standard_Integer k,nu,nv;
|
Standard_Integer k,nu,nv;
|
||||||
@ -3330,22 +3329,18 @@ void IntPatch_PrmPrmIntersection::PointDepart(Handle(IntSurf_LineOn2S)& LineOn2S
|
|||||||
//
|
//
|
||||||
Standard_Integer nu1=-1,nu2=-1;
|
Standard_Integer nu1=-1,nu2=-1;
|
||||||
Standard_Integer nv1=0, nv2=0;
|
Standard_Integer nv1=0, nv2=0;
|
||||||
int nbsur1 = 0;
|
|
||||||
for(nu=0;nu1<0 && nu<SU1;nu++) {
|
for(nu=0;nu1<0 && nu<SU1;nu++) {
|
||||||
for(nv=0;nu1<0 && nv<SV1;nv++) {
|
for(nv=0;nu1<0 && nv<SV1;nv++) {
|
||||||
if( aIPD.xIP1(nu, nv) ==(Standard_Integer) newind ) {
|
if( aIPD.xIP1(nu, nv) ==(Standard_Integer) newind ) {
|
||||||
nbsur1++;
|
|
||||||
aIPD.xIP1(nu, nv)=indicepointtraite;
|
aIPD.xIP1(nu, nv)=indicepointtraite;
|
||||||
nu1=nu; nv1=nv;
|
nu1=nu; nv1=nv;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(nu1>=0) {
|
if(nu1>=0) {
|
||||||
int nbsur2 = 0;
|
|
||||||
for(nu=0;nu2<0 && nu<SU2;nu++) {
|
for(nu=0;nu2<0 && nu<SU2;nu++) {
|
||||||
for(nv=0;nu2<0 && nv<SV2;nv++) {
|
for(nv=0;nu2<0 && nv<SV2;nv++) {
|
||||||
if( aIPD.xIP2(nu, nv)==(Standard_Integer) newind ) {
|
if( aIPD.xIP2(nu, nv)==(Standard_Integer) newind ) {
|
||||||
nbsur2++;
|
|
||||||
aIPD.xIP2(nu, nv)=indicepointtraite;
|
aIPD.xIP2(nu, nv)=indicepointtraite;
|
||||||
nu2=nu; nv2=nv;
|
nu2=nu; nv2=nv;
|
||||||
}
|
}
|
||||||
@ -3360,7 +3355,6 @@ void IntPatch_PrmPrmIntersection::PointDepart(Handle(IntSurf_LineOn2S)& LineOn2S
|
|||||||
S2->FirstUParameter()+nu2*du2,
|
S2->FirstUParameter()+nu2*du2,
|
||||||
S2->FirstVParameter()+nv2*dv2);
|
S2->FirstVParameter()+nv2*dv2);
|
||||||
LineOn2S->Add(POn2S);
|
LineOn2S->Add(POn2S);
|
||||||
Compt++;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//-- aucun point du triangle n a ete trouve assez proche
|
//-- aucun point du triangle n a ete trouve assez proche
|
||||||
@ -3438,7 +3432,6 @@ void IntPatch_PrmPrmIntersection::PointDepart(Handle(IntSurf_LineOn2S)& LineOn2S
|
|||||||
IntSurf_PntOn2S POn2S;
|
IntSurf_PntOn2S POn2S;
|
||||||
POn2S.SetValue(P,U1_3,V1_3,U2_3,V2_3);
|
POn2S.SetValue(P,U1_3,V1_3,U2_3,V2_3);
|
||||||
LineOn2S->Add(POn2S);
|
LineOn2S->Add(POn2S);
|
||||||
Compt++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,9 +87,6 @@ void IntStart_SearchInside::Perform (TheFunction& Func,
|
|||||||
|
|
||||||
math_FunctionSetRoot Rsnld(Func,toler);
|
math_FunctionSetRoot Rsnld(Func,toler);
|
||||||
|
|
||||||
Standard_Integer REJET_OK=0;
|
|
||||||
Standard_Integer REJET_KO=0;
|
|
||||||
|
|
||||||
//-- lbr le 15 mai 97
|
//-- lbr le 15 mai 97
|
||||||
umin+=du*0.01;
|
umin+=du*0.01;
|
||||||
vmin+=dv*0.01;
|
vmin+=dv*0.01;
|
||||||
@ -142,7 +139,6 @@ void IntStart_SearchInside::Perform (TheFunction& Func,
|
|||||||
Standard_Real rvalf = Valf(1);
|
Standard_Real rvalf = Valf(1);
|
||||||
Standard_Real DistPP = Pextrm1.SquareDistance(Pextrm2);
|
Standard_Real DistPP = Pextrm1.SquareDistance(Pextrm2);
|
||||||
if(rvalf*rvalf > 3.0*DistPP) {
|
if(rvalf*rvalf > 3.0*DistPP) {
|
||||||
REJET_OK++;
|
|
||||||
nepastester=Standard_True;
|
nepastester=Standard_True;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -172,7 +168,6 @@ void IntStart_SearchInside::Perform (TheFunction& Func,
|
|||||||
|
|
||||||
|
|
||||||
if(nepastester==Standard_False) {
|
if(nepastester==Standard_False) {
|
||||||
REJET_KO++;
|
|
||||||
Rsnld.Perform(Func,UVap,Binf,Bsup);
|
Rsnld.Perform(Func,UVap,Binf,Bsup);
|
||||||
if (Rsnld.IsDone()) {
|
if (Rsnld.IsDone()) {
|
||||||
if (Abs(Func.Root()) <= Tol) {
|
if (Abs(Func.Root()) <= Tol) {
|
||||||
|
@ -523,7 +523,7 @@ void Interface_CheckIterator::Print(Standard_OStream& S,
|
|||||||
Standard_CString mesnum0 = ":";
|
Standard_CString mesnum0 = ":";
|
||||||
Standard_CString mesnum1 = " (original):";
|
Standard_CString mesnum1 = " (original):";
|
||||||
Standard_CString mesnum2 = " (computed):"; */
|
Standard_CString mesnum2 = " (computed):"; */
|
||||||
Standard_Integer i, nbch = 0, nb = thelist->Length();//,j; svv #2
|
Standard_Integer i, nb = thelist->Length();//,j; svv #2
|
||||||
Standard_Boolean yamod = !model.IsNull();
|
Standard_Boolean yamod = !model.IsNull();
|
||||||
for (i = 1; i <= nb; i ++) {
|
for (i = 1; i <= nb; i ++) {
|
||||||
const Handle(Interface_Check) ach = thelist->Value(i);
|
const Handle(Interface_Check) ach = thelist->Value(i);
|
||||||
@ -557,7 +557,6 @@ void Interface_CheckIterator::Print(Standard_OStream& S,
|
|||||||
else S <<" Type:"<<ent->DynamicType()->Name()<<std::endl;
|
else S <<" Type:"<<ent->DynamicType()->Name()<<std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
nbch ++;
|
|
||||||
ach->Print (S, (failsonly ? 1 : 3));
|
ach->Print (S, (failsonly ? 1 : 3));
|
||||||
}
|
}
|
||||||
// if (nbch > 0) S<<" ---- Checks : "<<nbch<<" ----"<<std::endl;
|
// if (nbch > 0) S<<" ---- Checks : "<<nbch<<" ----"<<std::endl;
|
||||||
|
@ -162,8 +162,7 @@ Standard_Integer Poly_MakeLoops::Perform()
|
|||||||
Handle(NCollection_IncAllocator) aTempAlloc1 = new NCollection_IncAllocator(4000);
|
Handle(NCollection_IncAllocator) aTempAlloc1 = new NCollection_IncAllocator(4000);
|
||||||
|
|
||||||
// two pass loop
|
// two pass loop
|
||||||
Standard_Integer aPassNum, nbLoopsOnPass2 = 0;
|
for (Standard_Integer aPassNum=0; aPassNum < 2; aPassNum++)
|
||||||
for (aPassNum=0; aPassNum < 2; aPassNum++)
|
|
||||||
{
|
{
|
||||||
myHangIndices.Clear();
|
myHangIndices.Clear();
|
||||||
// main loop
|
// main loop
|
||||||
@ -192,8 +191,6 @@ Standard_Integer Poly_MakeLoops::Perform()
|
|||||||
if (aStartNumber <= aContour.Extent())
|
if (aStartNumber <= aContour.Extent())
|
||||||
{
|
{
|
||||||
// there is a closed loop in the contour
|
// there is a closed loop in the contour
|
||||||
if (aPassNum == 1)
|
|
||||||
nbLoopsOnPass2++;
|
|
||||||
acceptContour (aContour, aStartNumber);
|
acceptContour (aContour, aStartNumber);
|
||||||
}
|
}
|
||||||
if (aStartNumber > 1)
|
if (aStartNumber > 1)
|
||||||
|
@ -91,22 +91,18 @@ Handle(Graphic3d_ArrayOfSegments) Prs3d_Arrow::DrawSegments (const gp_Pnt& theLo
|
|||||||
|
|
||||||
Standard_Integer aNbVertices = theNbSegments + 1;
|
Standard_Integer aNbVertices = theNbSegments + 1;
|
||||||
Standard_Integer aFirstContourVertex = 2;
|
Standard_Integer aFirstContourVertex = 2;
|
||||||
Standard_Integer anEdgeCount = 0;
|
|
||||||
for (Standard_Integer aVertIter = aFirstContourVertex; aVertIter <= aNbVertices; ++aVertIter)
|
for (Standard_Integer aVertIter = aFirstContourVertex; aVertIter <= aNbVertices; ++aVertIter)
|
||||||
{
|
{
|
||||||
aSegments->AddEdge (1);
|
aSegments->AddEdge (1);
|
||||||
aSegments->AddEdge (aVertIter);
|
aSegments->AddEdge (aVertIter);
|
||||||
++anEdgeCount;
|
|
||||||
}
|
}
|
||||||
aSegments->AddEdge (aNbVertices);
|
aSegments->AddEdge (aNbVertices);
|
||||||
aSegments->AddEdge (aFirstContourVertex);
|
aSegments->AddEdge (aFirstContourVertex);
|
||||||
++anEdgeCount;
|
|
||||||
|
|
||||||
for (Standard_Integer aVertIter = aFirstContourVertex; aVertIter <= aNbVertices - 1; ++aVertIter)
|
for (Standard_Integer aVertIter = aFirstContourVertex; aVertIter <= aNbVertices - 1; ++aVertIter)
|
||||||
{
|
{
|
||||||
aSegments->AddEdge (aVertIter);
|
aSegments->AddEdge (aVertIter);
|
||||||
aSegments->AddEdge (aVertIter + 1);
|
aSegments->AddEdge (aVertIter + 1);
|
||||||
++anEdgeCount;
|
|
||||||
}
|
}
|
||||||
return aSegments;
|
return aSegments;
|
||||||
}
|
}
|
||||||
|
@ -212,14 +212,12 @@ static int BUC60610(Draw_Interpretor& di, Standard_Integer argc, const char ** a
|
|||||||
IR.TransferRoots();
|
IR.TransferRoots();
|
||||||
TopoDS_Shape aTopShape = IR.OneShape();
|
TopoDS_Shape aTopShape = IR.OneShape();
|
||||||
TopExp_Explorer ex(aTopShape, TopAbs_EDGE);
|
TopExp_Explorer ex(aTopShape, TopAbs_EDGE);
|
||||||
Standard_Integer i=0;
|
|
||||||
for( ; ex.More(); ex.Next()){
|
for( ; ex.More(); ex.Next()){
|
||||||
const TopoDS_Edge &E = TopoDS::Edge(ex.Current());
|
const TopoDS_Edge &E = TopoDS::Edge(ex.Current());
|
||||||
BRepAdaptor_Curve aCurve(E);
|
BRepAdaptor_Curve aCurve(E);
|
||||||
GCPnts_UniformDeflection plin(aCurve, 0.1);
|
GCPnts_UniformDeflection plin(aCurve, 0.1);
|
||||||
di << "Num points = " << plin.NbPoints() << "\n";
|
di << "Num points = " << plin.NbPoints() << "\n";
|
||||||
if(argc > 2) {
|
if(argc > 2) {
|
||||||
i++;
|
|
||||||
Sprintf(Ch,"%s_%i",argv[2],1);
|
Sprintf(Ch,"%s_%i",argv[2],1);
|
||||||
DBRep::Set(Ch,E);
|
DBRep::Set(Ch,E);
|
||||||
}
|
}
|
||||||
|
@ -735,7 +735,9 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
|
|||||||
aBuffView->ByteOffset = aBinFile->tellp();
|
aBuffView->ByteOffset = aBinFile->tellp();
|
||||||
aWrittenFaces.Clear (false);
|
aWrittenFaces.Clear (false);
|
||||||
aWrittenPrimData.Clear (false);
|
aWrittenPrimData.Clear (false);
|
||||||
|
#ifdef HAVE_DRACO
|
||||||
size_t aMeshIndex = 0;
|
size_t aMeshIndex = 0;
|
||||||
|
#endif
|
||||||
for (ShapeToGltfFaceMap::Iterator aBinDataIter (myBinDataMap); aBinDataIter.More() && aPSentryBin.More(); aBinDataIter.Next())
|
for (ShapeToGltfFaceMap::Iterator aBinDataIter (myBinDataMap); aBinDataIter.More() && aPSentryBin.More(); aBinDataIter.Next())
|
||||||
{
|
{
|
||||||
const Handle(RWGltf_GltfFaceList)& aGltfFaceList = aBinDataIter.Value();
|
const Handle(RWGltf_GltfFaceList)& aGltfFaceList = aBinDataIter.Value();
|
||||||
@ -745,8 +747,8 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<RWGltf_CafWriter::Mesh> aMeshPtr;
|
std::shared_ptr<RWGltf_CafWriter::Mesh> aMeshPtr;
|
||||||
|
#ifdef HAVE_DRACO
|
||||||
++aMeshIndex;
|
++aMeshIndex;
|
||||||
#ifdef HAVE_DRACO
|
|
||||||
if (myDracoParameters.DracoCompression)
|
if (myDracoParameters.DracoCompression)
|
||||||
{
|
{
|
||||||
if (aMeshIndex <= aMeshes.size())
|
if (aMeshIndex <= aMeshes.size())
|
||||||
@ -759,7 +761,7 @@ bool RWGltf_CafWriter::writeBinData (const Handle(TDocStd_Document)& theDocument
|
|||||||
aMeshPtr = aMeshes.back();
|
aMeshPtr = aMeshes.back();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (RWGltf_GltfFaceList::Iterator aGltfFaceIter (*aGltfFaceList); aGltfFaceIter.More() && aPSentryBin.More(); aGltfFaceIter.Next())
|
for (RWGltf_GltfFaceList::Iterator aGltfFaceIter (*aGltfFaceList); aGltfFaceIter.More() && aPSentryBin.More(); aGltfFaceIter.Next())
|
||||||
{
|
{
|
||||||
|
@ -125,7 +125,7 @@ Standard_Boolean RWMesh_CafReader::perform (const TCollection_AsciiString& theFi
|
|||||||
}
|
}
|
||||||
|
|
||||||
TopLoc_Location aDummyLoc;
|
TopLoc_Location aDummyLoc;
|
||||||
Standard_Integer aNbNodes = 0, aNbElems = 0, aNbFaces = 0;
|
Standard_Integer aNbNodes = 0, aNbElems = 0;
|
||||||
for (TopTools_SequenceOfShape::Iterator aRootIter (myRootShapes); aRootIter.More(); aRootIter.Next())
|
for (TopTools_SequenceOfShape::Iterator aRootIter (myRootShapes); aRootIter.More(); aRootIter.Next())
|
||||||
{
|
{
|
||||||
for (TopExp_Explorer aFaceIter (aRootIter.Value(), TopAbs_FACE); aFaceIter.More(); aFaceIter.Next())
|
for (TopExp_Explorer aFaceIter (aRootIter.Value(), TopAbs_FACE); aFaceIter.More(); aFaceIter.Next())
|
||||||
@ -133,7 +133,6 @@ Standard_Boolean RWMesh_CafReader::perform (const TCollection_AsciiString& theFi
|
|||||||
const TopoDS_Face& aFace = TopoDS::Face (aFaceIter.Current());
|
const TopoDS_Face& aFace = TopoDS::Face (aFaceIter.Current());
|
||||||
if (const Handle(Poly_Triangulation)& aPolyTri = BRep_Tool::Triangulation (aFace, aDummyLoc))
|
if (const Handle(Poly_Triangulation)& aPolyTri = BRep_Tool::Triangulation (aFace, aDummyLoc))
|
||||||
{
|
{
|
||||||
++aNbFaces;
|
|
||||||
aNbNodes += aPolyTri->NbNodes();
|
aNbNodes += aPolyTri->NbNodes();
|
||||||
aNbElems += aPolyTri->NbTriangles();
|
aNbElems += aPolyTri->NbTriangles();
|
||||||
}
|
}
|
||||||
|
@ -362,10 +362,9 @@ static Standard_Integer reface (Draw_Interpretor& di, Standard_Integer argc, con
|
|||||||
TopoDS_Face face;
|
TopoDS_Face face;
|
||||||
ShapeBuild_ReShape resh;
|
ShapeBuild_ReShape resh;
|
||||||
|
|
||||||
Standard_Integer nbf = 0, nbfc = 0;
|
Standard_Integer nbfc = 0;
|
||||||
for (TopExp_Explorer EF (Shape,TopAbs_FACE); EF.More(); EF.Next()) {
|
for (TopExp_Explorer EF (Shape,TopAbs_FACE); EF.More(); EF.Next()) {
|
||||||
TopoDS_Face F = TopoDS::Face (EF.Current()); face = F;
|
TopoDS_Face F = TopoDS::Face (EF.Current()); face = F;
|
||||||
nbf ++;
|
|
||||||
Standard_Boolean newface = Standard_False;
|
Standard_Boolean newface = Standard_False;
|
||||||
// on va voir si ShapeTool_Face trouve qqchose a redire
|
// on va voir si ShapeTool_Face trouve qqchose a redire
|
||||||
//:sw ShapeTool_Wire STW;
|
//:sw ShapeTool_Wire STW;
|
||||||
@ -803,7 +802,7 @@ static Standard_Integer connectedges(Draw_Interpretor& di, Standard_Integer n, c
|
|||||||
Standard_Integer ind = aMapEdges.FindIndex(aExp1.Current());
|
Standard_Integer ind = aMapEdges.FindIndex(aExp1.Current());
|
||||||
di<<ind<<" ";
|
di<<ind<<" ";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
TopoDS_Vertex aV1, aV2;
|
TopoDS_Vertex aV1, aV2;
|
||||||
TopExp::Vertices(TopoDS::Edge(aExp1.Current()), aV1,aV2);
|
TopExp::Vertices(TopoDS::Edge(aExp1.Current()), aV1,aV2);
|
||||||
|
@ -89,8 +89,9 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
|
|||||||
TopExp::MapShapesAndAncestors(shape, TopAbs_EDGE, TopAbs_FACE, aMapEF);
|
TopExp::MapShapesAndAncestors(shape, TopAbs_EDGE, TopAbs_FACE, aMapEF);
|
||||||
|
|
||||||
BRep_Builder B;
|
BRep_Builder B;
|
||||||
//Standard_Integer nbexcp = 0;
|
#ifdef OCCT_DEBUG
|
||||||
Standard_Integer nbfail = 0, numedge = 0;
|
Standard_Integer nbfail = 0, numedge = 0;
|
||||||
|
#endif
|
||||||
Standard_Boolean status = Standard_True;
|
Standard_Boolean status = Standard_True;
|
||||||
Standard_Real tol = preci;
|
Standard_Real tol = preci;
|
||||||
Standard_Boolean iatol = (tol > 0);
|
Standard_Boolean iatol = (tol > 0);
|
||||||
@ -110,7 +111,9 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
|
|||||||
TopoDS_Edge E;
|
TopoDS_Edge E;
|
||||||
while ( ex.More() && aPS.More() )
|
while ( ex.More() && aPS.More() )
|
||||||
{
|
{
|
||||||
|
#ifdef OCCT_DEBUG
|
||||||
numedge ++;
|
numedge ++;
|
||||||
|
#endif
|
||||||
int ierr = 0;
|
int ierr = 0;
|
||||||
TopLoc_Location loc;
|
TopLoc_Location loc;
|
||||||
E = TopoDS::Edge (ex.Current());
|
E = TopoDS::Edge (ex.Current());
|
||||||
@ -140,7 +143,13 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
|
|||||||
sfe->FixSameParameter (E); // K2-SEP97
|
sfe->FixSameParameter (E); // K2-SEP97
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!BRep_Tool::SameParameter (E)) { ierr = 1; nbfail ++; }
|
if (!BRep_Tool::SameParameter (E))
|
||||||
|
{
|
||||||
|
ierr = 1;
|
||||||
|
#ifdef OCCT_DEBUG
|
||||||
|
nbfail ++;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
if (ierr)
|
if (ierr)
|
||||||
{
|
{
|
||||||
@ -575,7 +584,7 @@ Standard_Boolean ShapeFix::FixVertexPosition(TopoDS_Shape& theshape,
|
|||||||
|
|
||||||
//Standard_Real dd1 = (acenter - p1.XYZ()).Modulus();
|
//Standard_Real dd1 = (acenter - p1.XYZ()).Modulus();
|
||||||
//Standard_Real dd2 = (acenter - p2.XYZ()).Modulus();
|
//Standard_Real dd2 = (acenter - p2.XYZ()).Modulus();
|
||||||
if(isFirst) {
|
if(isFirst) {
|
||||||
if( k>2) {
|
if( k>2) {
|
||||||
acenter += p1.XYZ();
|
acenter += p1.XYZ();
|
||||||
acenter /= 2.0;
|
acenter /= 2.0;
|
||||||
|
@ -1168,7 +1168,6 @@ Standard_Boolean ShapeFix_Face::FixOrientation(TopTools_DataMapOfShapeListOfShap
|
|||||||
MW.Clear();
|
MW.Clear();
|
||||||
SI.Clear();
|
SI.Clear();
|
||||||
MapIntWires.Clear();
|
MapIntWires.Clear();
|
||||||
Standard_Integer NbOuts=0;
|
|
||||||
Standard_Integer i;
|
Standard_Integer i;
|
||||||
|
|
||||||
NCollection_Array1<Bnd_Box2d> aWireBoxes(1, nb);
|
NCollection_Array1<Bnd_Box2d> aWireBoxes(1, nb);
|
||||||
@ -1195,8 +1194,8 @@ Standard_Boolean ShapeFix_Face::FixOrientation(TopTools_DataMapOfShapeListOfShap
|
|||||||
//avoiding problems with segment in Bnd_Box
|
//avoiding problems with segment in Bnd_Box
|
||||||
gac.Load(cw);
|
gac.Load(cw);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gac.Load(cw,cf,cl);
|
gac.Load(cw,cf,cl);
|
||||||
BndLib_Add2dCurve::Add(gac,::Precision::Confusion(),aBox);
|
BndLib_Add2dCurve::Add(gac,::Precision::Confusion(),aBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1345,7 +1344,6 @@ Standard_Boolean ShapeFix_Face::FixOrientation(TopTools_DataMapOfShapeListOfShap
|
|||||||
else {
|
else {
|
||||||
MW.Bind(aw,IntWires);
|
MW.Bind(aw,IntWires);
|
||||||
if(sta==TopAbs_OUT) {
|
if(sta==TopAbs_OUT) {
|
||||||
NbOuts++;
|
|
||||||
if(staout==TopAbs_IN ) {
|
if(staout==TopAbs_IN ) {
|
||||||
// wire is OUT but InfinitePoint is IN => need to reverse
|
// wire is OUT but InfinitePoint is IN => need to reverse
|
||||||
ShapeExtend_WireData sewd (aw);
|
ShapeExtend_WireData sewd (aw);
|
||||||
@ -1375,7 +1373,6 @@ Standard_Boolean ShapeFix_Face::FixOrientation(TopTools_DataMapOfShapeListOfShap
|
|||||||
Standard_Integer tmpi = SI.Find(aw);
|
Standard_Integer tmpi = SI.Find(aw);
|
||||||
if(tmpi>1) {
|
if(tmpi>1) {
|
||||||
if(!MapIntWires.Contains(aw)) {
|
if(!MapIntWires.Contains(aw)) {
|
||||||
NbOuts++;
|
|
||||||
const TopTools_ListOfShape& IW = MW.Find(aw);
|
const TopTools_ListOfShape& IW = MW.Find(aw);
|
||||||
if(tmpi==3) {
|
if(tmpi==3) {
|
||||||
// wire is OUT but InfinitePoint is IN => need to reverse
|
// wire is OUT but InfinitePoint is IN => need to reverse
|
||||||
|
@ -571,7 +571,6 @@ static void GlueClosedCandidate(TopTools_SequenceOfShape& OpenShells,
|
|||||||
for(Standard_Integer j = i+1 ; j <= OpenShells.Length();j++ ) {
|
for(Standard_Integer j = i+1 ; j <= OpenShells.Length();j++ ) {
|
||||||
Standard_Boolean isAddShell = Standard_True;
|
Standard_Boolean isAddShell = Standard_True;
|
||||||
Standard_Boolean isReversed = Standard_False;
|
Standard_Boolean isReversed = Standard_False;
|
||||||
Standard_Integer nbedge =0;
|
|
||||||
TopTools_MapOfShape mapEdges2;
|
TopTools_MapOfShape mapEdges2;
|
||||||
const TopoDS_Shape& aShell2 = OpenShells.Value(j);
|
const TopoDS_Shape& aShell2 = OpenShells.Value(j);
|
||||||
if(!GetFreeEdges(aShell2,mapEdges2)) continue;
|
if(!GetFreeEdges(aShell2,mapEdges2)) continue;
|
||||||
@ -586,7 +585,6 @@ static void GlueClosedCandidate(TopTools_SequenceOfShape& OpenShells,
|
|||||||
if((edge2.Orientation() == TopAbs_FORWARD && dire.Contains(edge2))
|
if((edge2.Orientation() == TopAbs_FORWARD && dire.Contains(edge2))
|
||||||
|| (edge2.Orientation() == TopAbs_REVERSED && reve.Contains(edge2)))
|
|| (edge2.Orientation() == TopAbs_REVERSED && reve.Contains(edge2)))
|
||||||
isReversed = Standard_True;
|
isReversed = Standard_True;
|
||||||
nbedge++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isAddShell) continue;
|
if(!isAddShell) continue;
|
||||||
|
@ -240,17 +240,17 @@ void TopOpeBRepBuild_FaceBuilder::DetectUnclosedWire(TopTools_IndexedDataMapOfSh
|
|||||||
TopTools_IndexedDataMapOfShapeShape mapVon1EdgeDRAW,mapVVsameGDRAW;
|
TopTools_IndexedDataMapOfShapeShape mapVon1EdgeDRAW,mapVVsameGDRAW;
|
||||||
Standard_Boolean trc = TopOpeBRepBuild_GettracePURGE();
|
Standard_Boolean trc = TopOpeBRepBuild_GettracePURGE();
|
||||||
if (trc) std::cout<<std::endl<<"* DetectUnclosedWire :"<<std::endl<<std::endl;
|
if (trc) std::cout<<std::endl<<"* DetectUnclosedWire :"<<std::endl<<std::endl;
|
||||||
|
Standard_Integer iiwi = 0; // DEB
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Standard_Integer iiwi = 0; // DEB
|
|
||||||
|
|
||||||
InitFace();
|
InitFace();
|
||||||
for (;MoreFace();NextFace()) {
|
for (;MoreFace();NextFace()) {
|
||||||
InitWire();
|
InitWire();
|
||||||
for (;MoreWire();NextWire()) {
|
for (;MoreWire();NextWire()) {
|
||||||
iiwi++;
|
|
||||||
Standard_Boolean isold = IsOldWire();
|
Standard_Boolean isold = IsOldWire();
|
||||||
#ifdef DRAW
|
#ifdef DRAW
|
||||||
|
iiwi++;
|
||||||
if ( trc && isold ) std::cout<<"wire "<<iiwi<<" is old wire => closed"<<std::endl;
|
if ( trc && isold ) std::cout<<"wire "<<iiwi<<" is old wire => closed"<<std::endl;
|
||||||
#endif
|
#endif
|
||||||
if (isold) continue;
|
if (isold) continue;
|
||||||
|
@ -356,12 +356,10 @@ Standard_Boolean TopOpeBRepBuild_Builder::GContains(const TopoDS_Shape& S,const
|
|||||||
void TopOpeBRepBuild_Builder::GCopyList(const TopTools_ListOfShape& Lin,const Standard_Integer I1,const Standard_Integer I2,TopTools_ListOfShape& Lou)
|
void TopOpeBRepBuild_Builder::GCopyList(const TopTools_ListOfShape& Lin,const Standard_Integer I1,const Standard_Integer I2,TopTools_ListOfShape& Lou)
|
||||||
{
|
{
|
||||||
TopTools_ListIteratorOfListOfShape it(Lin);
|
TopTools_ListIteratorOfListOfShape it(Lin);
|
||||||
Standard_Integer nadd = 0;
|
|
||||||
for ( Standard_Integer i = 1; it.More(); it.Next(),i++ ) {
|
for ( Standard_Integer i = 1; it.More(); it.Next(),i++ ) {
|
||||||
const TopoDS_Shape& EL = it.Value();
|
const TopoDS_Shape& EL = it.Value();
|
||||||
if ( i >= I1 && i <= I2 ) {
|
if ( i >= I1 && i <= I2 ) {
|
||||||
Lou.Append(EL);
|
Lou.Append(EL);
|
||||||
nadd++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -503,9 +503,8 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
|
|||||||
if (kp3) l2dFEcur.First()->Transition().Orientation(TopAbs_IN);
|
if (kp3) l2dFEcur.First()->Transition().Orientation(TopAbs_IN);
|
||||||
|
|
||||||
|
|
||||||
TopOpeBRepDS_PointIterator itCur(LICur); Standard_Integer iICur=0;
|
TopOpeBRepDS_PointIterator itCur(LICur);
|
||||||
while ( itCur.More() ) {
|
while ( itCur.More() ) {
|
||||||
iICur++;
|
|
||||||
const Handle(TopOpeBRepDS_Interference)& I1=itCur.Value();
|
const Handle(TopOpeBRepDS_Interference)& I1=itCur.Value();
|
||||||
const TopOpeBRepDS_Transition& T1=I1->Transition();
|
const TopOpeBRepDS_Transition& T1=I1->Transition();
|
||||||
T1.Orientation(TopAbs_IN);
|
T1.Orientation(TopAbs_IN);
|
||||||
@ -548,7 +547,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
|
|||||||
}
|
}
|
||||||
} // split 2d
|
} // split 2d
|
||||||
else { // split 3d
|
else { // split 3d
|
||||||
keepinterf1 = (ST1 == TopOpeBRepDS_FACE); // (iICur == 1);
|
keepinterf1 = (ST1 == TopOpeBRepDS_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( keepinterf1 ) {
|
if ( keepinterf1 ) {
|
||||||
|
@ -124,12 +124,9 @@ static void CorrectUnclosedWire(TopoDS_Shape& aWire)
|
|||||||
// std::cout << "-------CorrectUnclosedWire" << std::endl;
|
// std::cout << "-------CorrectUnclosedWire" << std::endl;
|
||||||
BRep_Builder BB;
|
BRep_Builder BB;
|
||||||
TopoDS_Iterator tdi(aWire, Standard_False, Standard_False);
|
TopoDS_Iterator tdi(aWire, Standard_False, Standard_False);
|
||||||
Standard_Integer nbe = 0;
|
|
||||||
for(; tdi.More(); tdi.Next()) {
|
for(; tdi.More(); tdi.Next()) {
|
||||||
nbe++;
|
|
||||||
const TopoDS_Shape& ed = tdi.Value();
|
const TopoDS_Shape& ed = tdi.Value();
|
||||||
Standard_Integer nbv = ed.NbChildren();
|
Standard_Integer nbv = ed.NbChildren();
|
||||||
// std::cout << "Edge " << nbe << " : " << nbv << std::endl;
|
|
||||||
if(nbv <= 1) {
|
if(nbv <= 1) {
|
||||||
// std::cout << "Remove bad edge" << std::endl;
|
// std::cout << "Remove bad edge" << std::endl;
|
||||||
BB.Remove(aWire, ed);
|
BB.Remove(aWire, ed);
|
||||||
@ -455,10 +452,7 @@ void TopOpeBRepBuild_Builder::MakeEdges(const TopoDS_Shape& anEdge,TopOpeBRepBui
|
|||||||
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(anEdge,iE);
|
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(anEdge,iE);
|
||||||
Standard_Integer ne = 0;
|
Standard_Integer ne = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Standard_Integer nvertex = 0;
|
|
||||||
for (TopOpeBRepTool_ShapeExplorer ex(anEdge,TopAbs_VERTEX); ex.More(); ex.Next()) nvertex++;
|
|
||||||
|
|
||||||
TopoDS_Shape newEdge;
|
TopoDS_Shape newEdge;
|
||||||
for (EDBU.InitEdge(); EDBU.MoreEdge(); EDBU.NextEdge()) {
|
for (EDBU.InitEdge(); EDBU.MoreEdge(); EDBU.NextEdge()) {
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ TopAbs_State TopOpeBRepBuild_WireEdgeClassifier::CompareShapes
|
|||||||
TopTools_IndexedMapOfShape mapv1; mapv1.Add(vf1); mapv1.Add(vl1);
|
TopTools_IndexedMapOfShape mapv1; mapv1.Add(vf1); mapv1.Add(vl1);
|
||||||
|
|
||||||
ResetShape(e1);
|
ResetShape(e1);
|
||||||
Standard_Integer iE = 0; Standard_Boolean indy = Standard_False;
|
Standard_Boolean indy = Standard_False;
|
||||||
TopExp_Explorer Ex;
|
TopExp_Explorer Ex;
|
||||||
for(Ex.Init(B2,TopAbs_EDGE); Ex.More(); Ex.Next()) {
|
for(Ex.Init(B2,TopAbs_EDGE); Ex.More(); Ex.Next()) {
|
||||||
// for(TopExp_Explorer Ex(B2,TopAbs_EDGE); Ex.More(); Ex.Next()) {
|
// for(TopExp_Explorer Ex(B2,TopAbs_EDGE); Ex.More(); Ex.Next()) {
|
||||||
@ -248,7 +248,6 @@ TopAbs_State TopOpeBRepBuild_WireEdgeClassifier::CompareShapes
|
|||||||
if (indy) {state = TopAbs_UNKNOWN; break;}
|
if (indy) {state = TopAbs_UNKNOWN; break;}
|
||||||
CompareElement(E);
|
CompareElement(E);
|
||||||
state = State();
|
state = State();
|
||||||
iE++;
|
|
||||||
} // ex(B2,EDGE)
|
} // ex(B2,EDGE)
|
||||||
if (state != TopAbs_UNKNOWN) {
|
if (state != TopAbs_UNKNOWN) {
|
||||||
break;
|
break;
|
||||||
|
@ -221,10 +221,13 @@ const TopTools_ListOfShape & TopOpeBRepBuild_WireEdgeSet::MakeNeighboursList(con
|
|||||||
// edge list made of connected shapes to Earg through Varg
|
// edge list made of connected shapes to Earg through Varg
|
||||||
|
|
||||||
myCurrentShapeNeighbours.Clear();
|
myCurrentShapeNeighbours.Clear();
|
||||||
|
#ifdef DRAW
|
||||||
Standard_Integer iapp = 0;
|
Standard_Integer iapp = 0;
|
||||||
|
#endif
|
||||||
for (TopTools_ListIteratorOfListOfShape it(l); it.More(); it.Next()) {
|
for (TopTools_ListIteratorOfListOfShape it(l); it.More(); it.Next()) {
|
||||||
|
#ifdef DRAW
|
||||||
iapp++;
|
iapp++;
|
||||||
|
#endif
|
||||||
const TopoDS_Shape& curn = it.Value(); // current neighbour
|
const TopoDS_Shape& curn = it.Value(); // current neighbour
|
||||||
Standard_Boolean k = VertexConnectsEdgesClosing(V,E,curn);
|
Standard_Boolean k = VertexConnectsEdgesClosing(V,E,curn);
|
||||||
if (k) {
|
if (k) {
|
||||||
@ -272,10 +275,13 @@ const TopTools_ListOfShape & TopOpeBRepBuild_WireEdgeSet::MakeNeighboursList(con
|
|||||||
if (Eori == TopAbs_REVERSED) d1E.Reverse();
|
if (Eori == TopAbs_REVERSED) d1E.Reverse();
|
||||||
|
|
||||||
TopTools_ListIteratorOfListOfShape lclo(myCurrentShapeNeighbours);
|
TopTools_ListIteratorOfListOfShape lclo(myCurrentShapeNeighbours);
|
||||||
|
#ifdef DRAW
|
||||||
Standard_Integer rang = 0;
|
Standard_Integer rang = 0;
|
||||||
|
#endif
|
||||||
while (lclo.More()) {
|
while (lclo.More()) {
|
||||||
|
#ifdef DRAW
|
||||||
rang++;
|
rang++;
|
||||||
|
#endif
|
||||||
if ( ! IsClosed(lclo.Value()) ) {
|
if ( ! IsClosed(lclo.Value()) ) {
|
||||||
lclo.Next();
|
lclo.Next();
|
||||||
continue;
|
continue;
|
||||||
|
@ -137,9 +137,9 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces
|
|||||||
Standard_Integer rankVsameG = BDS.AncestorRank(VsameG);
|
Standard_Integer rankVsameG = BDS.AncestorRank(VsameG);
|
||||||
Standard_Boolean otherRef = (rankVsameG != 0 && rankV != 1);
|
Standard_Boolean otherRef = (rankVsameG != 0 && rankV != 1);
|
||||||
|
|
||||||
if (otherRef)
|
if (otherRef)
|
||||||
BDS.FillShapesSameDomain(VsameG,V);
|
BDS.FillShapesSameDomain(VsameG,V);
|
||||||
else
|
else
|
||||||
BDS.FillShapesSameDomain(V,VsameG);
|
BDS.FillShapesSameDomain(V,VsameG);
|
||||||
|
|
||||||
hsdm = myDataStructure->HasSameDomain(V);
|
hsdm = myDataStructure->HasSameDomain(V);
|
||||||
@ -355,8 +355,6 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
|
|||||||
for (; FABU.MoreWire(); FABU.NextWire())
|
for (; FABU.MoreWire(); FABU.NextWire())
|
||||||
{
|
{
|
||||||
Standard_Integer ne = 0;
|
Standard_Integer ne = 0;
|
||||||
Standard_Integer neFORWARD = 0;
|
|
||||||
Standard_Integer neREVERSED = 0;
|
|
||||||
Standard_Integer neINTERNAL = 0;
|
Standard_Integer neINTERNAL = 0;
|
||||||
Standard_Integer neEXTERNAL = 0;
|
Standard_Integer neEXTERNAL = 0;
|
||||||
|
|
||||||
@ -387,8 +385,6 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
|
|||||||
TopAbs_Orientation oE = newEdge.Orientation();
|
TopAbs_Orientation oE = newEdge.Orientation();
|
||||||
if (oE == TopAbs_INTERNAL) neINTERNAL++;
|
if (oE == TopAbs_INTERNAL) neINTERNAL++;
|
||||||
else if (oE == TopAbs_EXTERNAL) neEXTERNAL++;
|
else if (oE == TopAbs_EXTERNAL) neEXTERNAL++;
|
||||||
else if (oE == TopAbs_FORWARD) neFORWARD++;
|
|
||||||
else if (oE == TopAbs_REVERSED) neREVERSED++;
|
|
||||||
|
|
||||||
Standard_Boolean hasPC = FC2D_HasCurveOnSurface(newEdge,newFace); // jyl980402+
|
Standard_Boolean hasPC = FC2D_HasCurveOnSurface(newEdge,newFace); // jyl980402+
|
||||||
if (!hasPC) // jyl980402+
|
if (!hasPC) // jyl980402+
|
||||||
@ -480,8 +476,8 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
|
|||||||
if(chkORI == 1)
|
if(chkORI == 1)
|
||||||
{
|
{
|
||||||
TopAbs_Orientation ori = FUN_ReOrientIntExtEdge(E2,O2,E1);
|
TopAbs_Orientation ori = FUN_ReOrientIntExtEdge(E2,O2,E1);
|
||||||
if(ori == TopAbs_FORWARD) { E1.Orientation(TopAbs_FORWARD); neFORWARD++; }
|
if(ori == TopAbs_FORWARD) { E1.Orientation(TopAbs_FORWARD); }
|
||||||
if(ori == TopAbs_REVERSED){ E1.Orientation(TopAbs_REVERSED); neREVERSED++; }
|
if(ori == TopAbs_REVERSED){ E1.Orientation(TopAbs_REVERSED); }
|
||||||
if(ori == TopAbs_REVERSED || ori == TopAbs_FORWARD)
|
if(ori == TopAbs_REVERSED || ori == TopAbs_FORWARD)
|
||||||
{
|
{
|
||||||
if(O1 == TopAbs_INTERNAL) neINTERNAL--;
|
if(O1 == TopAbs_INTERNAL) neINTERNAL--;
|
||||||
@ -491,8 +487,8 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
|
|||||||
if(chkORI == 2)
|
if(chkORI == 2)
|
||||||
{
|
{
|
||||||
TopAbs_Orientation ori = FUN_ReOrientIntExtEdge(E1,O1,E2);
|
TopAbs_Orientation ori = FUN_ReOrientIntExtEdge(E1,O1,E2);
|
||||||
if(ori == TopAbs_FORWARD) { E2.Orientation(TopAbs_FORWARD); neFORWARD++; }
|
if(ori == TopAbs_FORWARD) { E2.Orientation(TopAbs_FORWARD); }
|
||||||
if(ori == TopAbs_REVERSED){ E2.Orientation(TopAbs_REVERSED); neREVERSED++; }
|
if(ori == TopAbs_REVERSED){ E2.Orientation(TopAbs_REVERSED); }
|
||||||
if(ori == TopAbs_REVERSED || ori == TopAbs_FORWARD)
|
if(ori == TopAbs_REVERSED || ori == TopAbs_FORWARD)
|
||||||
{
|
{
|
||||||
if(O2 == TopAbs_INTERNAL) neINTERNAL--;
|
if(O2 == TopAbs_INTERNAL) neINTERNAL--;
|
||||||
|
@ -214,12 +214,10 @@ Standard_EXPORT void FDSSDM_copylist(const TopTools_ListOfShape& Lin,const Stand
|
|||||||
// copie des elements [i1..i2] de Lin dans Lou. 1er element de Lin = index 1
|
// copie des elements [i1..i2] de Lin dans Lou. 1er element de Lin = index 1
|
||||||
{
|
{
|
||||||
TopTools_ListIteratorOfListOfShape it(Lin);
|
TopTools_ListIteratorOfListOfShape it(Lin);
|
||||||
Standard_Integer nadd = 0;
|
|
||||||
for ( Standard_Integer i = 1; it.More(); it.Next(),i++ ) {
|
for ( Standard_Integer i = 1; it.More(); it.Next(),i++ ) {
|
||||||
const TopoDS_Shape& EL = it.Value();
|
const TopoDS_Shape& EL = it.Value();
|
||||||
if ( i >= I1 && i <= I2 ) {
|
if ( i >= I1 && i <= I2 ) {
|
||||||
Lou.Append(EL);
|
Lou.Append(EL);
|
||||||
nadd++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // copylist
|
} // copylist
|
||||||
|
@ -1176,7 +1176,7 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
|||||||
if (what >= 1 && what <= 3) {
|
if (what >= 1 && what <= 3) {
|
||||||
|
|
||||||
Standard_Integer stat;
|
Standard_Integer stat;
|
||||||
Standard_Integer nbv = 0, nbw = 0, nbf = 0, nbr = 0, nbrw = 0, nbrf = 0, nbnr = 0, nbi = 0;
|
Standard_Integer nbw = 0, nbf = 0, nbr = 0, nbrw = 0, nbrf = 0, nbnr = 0, nbi = 0;
|
||||||
Transfer_IteratorOfProcessForTransient itrp(Standard_True);
|
Transfer_IteratorOfProcessForTransient itrp(Standard_True);
|
||||||
if (what == 1) itrp = TP->RootResult(Standard_True);
|
if (what == 1) itrp = TP->RootResult(Standard_True);
|
||||||
if (what == 2) itrp = TP->CompleteResult(Standard_True);
|
if (what == 2) itrp = TP->CompleteResult(Standard_True);
|
||||||
@ -1214,7 +1214,6 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
|||||||
stat = BinderStatus(binder,mess);
|
stat = BinderStatus(binder,mess);
|
||||||
// 0 Binder Null. 1 void 2 Warning seul 3 Fail seul
|
// 0 Binder Null. 1 void 2 Warning seul 3 Fail seul
|
||||||
// 11 Resultat OK. 12 Resultat+Warning. 13 Resultat+Fail
|
// 11 Resultat OK. 12 Resultat+Warning. 13 Resultat+Fail
|
||||||
if (stat == 0 || stat == 1) nbv ++;
|
|
||||||
if (stat == 2) nbw ++;
|
if (stat == 2) nbw ++;
|
||||||
if (stat == 3) nbf ++;
|
if (stat == 3) nbf ++;
|
||||||
if (stat == 11) nbr ++;
|
if (stat == 11) nbr ++;
|
||||||
|
@ -85,7 +85,6 @@ Standard_Boolean XmlMDataStd_ExpressionDriver::Paste
|
|||||||
myMessageDriver->Send (aMsgString, Message_Fail);
|
myMessageDriver->Send (aMsgString, Message_Fail);
|
||||||
return Standard_False;
|
return Standard_False;
|
||||||
}
|
}
|
||||||
Standard_Integer i = 1;
|
|
||||||
while (aNb > 0)
|
while (aNb > 0)
|
||||||
{
|
{
|
||||||
Handle(TDF_Attribute) aV;
|
Handle(TDF_Attribute) aV;
|
||||||
@ -100,7 +99,6 @@ Standard_Boolean XmlMDataStd_ExpressionDriver::Paste
|
|||||||
|
|
||||||
// next variable
|
// next variable
|
||||||
if (!XmlObjMgt::GetInteger(aVs, aNb)) aNb = 0;
|
if (!XmlObjMgt::GetInteger(aVs, aNb)) aNb = 0;
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -132,10 +130,8 @@ void XmlMDataStd_ExpressionDriver::Paste
|
|||||||
{
|
{
|
||||||
TCollection_AsciiString aGsStr;
|
TCollection_AsciiString aGsStr;
|
||||||
TDF_ListIteratorOfAttributeList it;
|
TDF_ListIteratorOfAttributeList it;
|
||||||
Standard_Integer index = 0;
|
|
||||||
for (it.Initialize(aC->GetVariables()); it.More(); it.Next())
|
for (it.Initialize(aC->GetVariables()); it.More(); it.Next())
|
||||||
{
|
{
|
||||||
index++;
|
|
||||||
TV = it.Value();
|
TV = it.Value();
|
||||||
if (!TV.IsNull())
|
if (!TV.IsNull())
|
||||||
{
|
{
|
||||||
|
@ -67,11 +67,10 @@ Xw_Window::Xw_Window (const Handle(Aspect_DisplayConnection)& theXDisplay,
|
|||||||
int aScreen = DefaultScreen(aDisp);
|
int aScreen = DefaultScreen(aDisp);
|
||||||
Window aParent = RootWindow (aDisp, aScreen);
|
Window aParent = RootWindow (aDisp, aScreen);
|
||||||
|
|
||||||
unsigned long aMask = 0;
|
|
||||||
XSetWindowAttributes aWinAttr;
|
XSetWindowAttributes aWinAttr;
|
||||||
memset (&aWinAttr, 0, sizeof(aWinAttr));
|
memset (&aWinAttr, 0, sizeof(aWinAttr));
|
||||||
aWinAttr.event_mask = ExposureMask | StructureNotifyMask;
|
aWinAttr.event_mask = ExposureMask | StructureNotifyMask;
|
||||||
aMask |= CWEventMask;
|
|
||||||
if (aVisInfo != NULL)
|
if (aVisInfo != NULL)
|
||||||
{
|
{
|
||||||
aWinAttr.colormap = XCreateColormap(aDisp, aParent, aVisInfo->visual, AllocNone);
|
aWinAttr.colormap = XCreateColormap(aDisp, aParent, aVisInfo->visual, AllocNone);
|
||||||
|
@ -334,7 +334,6 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
|
|||||||
ko(4) = 4.0*B+2.0*D;
|
ko(4) = 4.0*B+2.0*D;
|
||||||
ko(5) = A+C+E;
|
ko(5) = A+C+E;
|
||||||
Standard_Boolean bko;
|
Standard_Boolean bko;
|
||||||
Standard_Integer nbko=0;
|
|
||||||
do {
|
do {
|
||||||
bko=Standard_False;
|
bko=Standard_False;
|
||||||
math_DirectPolynomialRoots Resol4(ko(1), ko(2), ko(3), ko(4), ko(5));
|
math_DirectPolynomialRoots Resol4(ko(1), ko(2), ko(3), ko(4), ko(5));
|
||||||
@ -374,7 +373,6 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
|
|||||||
//-- std::cout<<" Val Double ("<<qw<<")=("<<va<<")"<<std::endl;
|
//-- std::cout<<" Val Double ("<<qw<<")=("<<va<<")"<<std::endl;
|
||||||
if(Abs(va)>Eps) {
|
if(Abs(va)>Eps) {
|
||||||
bko=Standard_True;
|
bko=Standard_True;
|
||||||
nbko++;
|
|
||||||
#ifdef OCCT_DEBUG
|
#ifdef OCCT_DEBUG
|
||||||
//if(nbko==1) {
|
//if(nbko==1) {
|
||||||
// std::cout<<"Pb ds math_TrigonometricFunctionRoots CC="
|
// std::cout<<"Pb ds math_TrigonometricFunctionRoots CC="
|
||||||
|
Loading…
x
Reference in New Issue
Block a user