Warnings were fixed.
Fixed wrong re-initialization.
//=======================================================================
void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
{
- Standard_Boolean updMain(Standard_False);
-
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
if(BROwnr.IsNull() || !BROwnr->ComesFromDecomposition()){
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
IO = *((Handle(AIS_InteractiveObject)*)&SO);
- updMain = Standard_True;
}
- else
- updMain = Standard_True;
}
- else
- updMain = Standard_True;
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
Standard_Integer HM = GetHiMod(*((Handle(AIS_InteractiveObject)*)&SO));
if ( Ownr->IsAutoHilight() )
{
myMainPM->ClearImmediateDraw();
- Standard_Boolean updMain(Standard_False);
-
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO);
HM = GetHiMod(IO);
#endif
- updMain = Standard_True;
}
- else
- updMain = Standard_True;
}
Ownr->Unhilight(PM,HM);
}
anIter1.Key()->ClearSelected();
}
- if(updateviewer){
-#ifdef BUC60774
+ if(updateviewer)
myCTX->CurrentViewer()->Update();
-#else
- if(updMain) myCTX->CurrentViewer()->Update();
-#endif
- }
-
}
//=======================================================================
Standard_Integer myindex, Def = SCurv.NbPoles()-1;
Standard_Integer nb3d, nb2d, Npol= Def+1, Npol2 = 2*Npol;
Standard_Real T1 = 0., T2 = 0., T3, Tmax, Daij;
- Standard_Boolean Ok;
gp_Vec V;
gp_Vec2d V2d;
gp_Pnt Poi;
case 1: //T1 ~ T1x
{
if (k <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
T1 = V.X();
IP = 3 * Npol;
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k-nb3d);
T1 = V2d.X();
IP = 2 * Npol;
case 2: //T1 ~ T1y
{
if (k <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
IP = 3 * Npol;
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k-nb3d);
T1 = V2d.Y();
IP = 2 * Npol;
}
case 3: //T1 ~ T1z
{
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
T1 = V.Z();
IP = 3 * Npol;
case 1: //T2 ~ T2x
{
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.X();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1-nb3d);
T2 = V2d.X();
}
case 2: //T2 ~ T2y
{
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.Y();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1-nb3d);
T2 = V2d.Y();
}
}
case 3: //T2 ~ T2z
{
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.Z();
addIndex_2 = 2 * Npol;
Standard_Integer IP;
Standard_Real Daij;
Npol = Deg+1; Npol2 = 2*Npol;
- Standard_Boolean Ok;
TColStd_Array2OfInteger Ibont(1, NbCu, 1, IncTan);
math_Matrix DeCInit(1, IncPass, 1, Npol);
math_Vector DDA(1, Npol);
Npt = ITan(i);
// MultiPoint MPoint = ToolLine::Value(SSP, Npt);
// choix du maximum de tangence pour exprimer la colinearite:
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
V.Coord(T1, T2, T3);
Tmax = Abs(T1);
for (i = 1; i <= IncTan; i++) {
Npt = ITan(i);
AppParCurves::SecondDerivativeBernstein(Parameters(Npt), DDA);
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k);
V2d.Coord(T1, T2);
Tmax = Abs(T1);
Inc3 = Inc3 + 1;
if (Ibont(k, i) == 1) {
if (k <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
T1 = V.X();
IP = 3*Npol;
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k);
T1 = V2d.X();
IP = 2*Npol;
}
if (Ibont(k+1, i) == 1) { // Relations entre T1x et T2x:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.X();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.X();
}
}
else if (Ibont(k+1, i) == 2) { // Relations entre T1x et T2y:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.Y();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.Y();
}
}
else if (Ibont(k,i) == 2) {
if (k <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
T1 = V.Y();
IP = 3*Npol;
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k);
T1 = V2d.Y();
IP = 2*Npol;
}
if (Ibont(k+1, i) == 1) { // Relations entre T1y et T2x:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.X();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.X();
}
}
else if (Ibont(k+1, i) == 2) { // Relations entre T1y et T2y:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.Y();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.Y();
}
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k);
T1 = V.Z();
IP = 3*Npol;
if (Ibont(k+1, i) == 1) { // Relations entre T1z et T2x:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.X();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.X();
}
else if (Ibont(k+1, i) == 2) { // Relations entre T1z et T2y:
if ((k+1) <= nb3d) {
- Ok = ToolLine::Tangency(SSP, Npt, tabV);
+ ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1);
T2 = V.Y();
}
else {
- Ok = ToolLine::Tangency(SSP, Npt, tabV2d);
+ ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1);
T2 = V2d.Y();
}
//=================================================
//
// 2. Post Treatment
- Standard_Integer aNbFA;
BRep_Builder aBB;
BOPCol_MapOfOrientedShape AddedFacesMap;
BOPCol_IndexedDataMapOfShapeListOfShape aEFMap;
aEFMap.Clear();
AddedFacesMap.Clear();
//
- aNbFA=myShapesToAvoid.Extent();
- //
aItM.Initialize(myShapesToAvoid);
for (; aItM.More(); aItM.Next()) {
const TopoDS_Shape& aFF=aItM.Key();
void BOPAlgo_BuilderSolid::PerformAreas()
{
Standard_Boolean bIsGrowth, bIsHole;
- Standard_Integer k,aNbHoles;
+ Standard_Integer k;
BRep_Builder aBB;
BOPCol_ListIteratorOfListOfShape aItLS;
BOPCol_ListOfShape aNewSolids, aHoleShells;
aSelector.Clear();
aSelector.SetBox(aBoxSolid);
//
- aNbHoles=aBBTree.Select(aSelector);
+ aBBTree.Select(aSelector);
//
const BOPCol_ListOfInteger& aLI=aSelector.Indices();
//
}
//
Standard_Boolean bIsInternalFace;
- Standard_Integer k, aNbVFS, aNbSLF, aNbVFP, aNbF, aNbA;
+ Standard_Integer k, aNbVFS, aNbSLF, aNbVFP, aNbA;
BRep_Builder aBB;
TopoDS_Iterator aIt;
TopExp_Explorer aExp;
aSelector.Clear();
aSelector.SetBox(aBox);
//
- aNbF=aBBTree.Select(aSelector);
+ aBBTree.Select(aSelector);
//
const BOPCol_ListOfInteger& aLI=aSelector.Indices();
aItLI.Initialize(aLI);
return;
}
//
- GeomAbs_SurfaceType aType1, aType2;
Handle(Geom_Surface) aS1=BRep_Tool::Surface(aF1);
Handle(Geom_Surface) aS2=BRep_Tool::Surface(aF2);
- GeomAdaptor_Surface aGAS1(aS1);
- GeomAdaptor_Surface aGAS2(aS2);
- //
- aType1=aGAS1.GetType();
- aType2=aGAS2.GetType();
- //
- //if (aType1==GeomAbs_Torus || aType2==GeomAbs_Torus) {
- GeomAbs_CurveType aTypeC;
//
const IntTools_Curve& aIC=aNC.Curve();
- aTypeC=aIC.Type();
//if (aTypeC==GeomAbs_BezierCurve || aTypeC==GeomAbs_BSplineCurve) {
Handle(Geom2d_Curve) aC2D[2];
//
TColGeom_SequenceOfCurve scur;
Curves(scur);
- Standard_Real locmin;
- Standard_Real locmax;
Standard_Real mf, Mf, mu, Mu;
TopAbs_Orientation Orifuntil = TopAbs_INTERNAL;
}
{
-// Find sens, locmin, locmax, FFrom, FUntil
- locmin = RealFirst();
- locmax = RealLast();
+// Find sens, FFrom, FUntil
for (Standard_Integer jj=1; jj<=scur.Length(); jj++) {
if (ASI1.IsDone() && ASI2.IsDone()) {
if (ASI1.NbPoints(jj) <= 0) {
}
mu = ASI2.Point(jj,1).Parameter();
Mu = ASI2.Point(jj,ASI2.NbPoints(jj)).Parameter();
- if (scur(jj)->IsPeriodic()) {
- Standard_Real period = scur(jj)->Period();
- locmin = mf;
- locmax = ElCLib::InPeriod(Mu,locmin,locmin+period);
- }
- else {
+ if (!scur(jj)->IsPeriodic()) {
Standard_Integer ku, kf;
if (! (mu > Mf || mf > Mu)) { //overlapping intervals
sens = 1;
kf = 1;
ku = ASI2.NbPoints(jj);
- locmin = mf;
- locmax = Max(Mf, Mu);
}
else if (mu > Mf) {
if (sens == -1) {
sens = 1;
kf = 1;
ku = ASI2.NbPoints(jj);
- locmin = mf;
- locmax = Mu;
}
else {
if (sens == 1) {
sens = -1;
kf = ASI1.NbPoints(jj);
ku = 1;
- locmin = mu;
- locmax = Mf;
}
if (Oriffrom == TopAbs_INTERNAL) {
TopAbs_Orientation Oript = ASI1.Point(jj,kf).Orientation();
Standard_Integer ku;
if (sens == -1) {
ku = 1;
- locmax = -ASI2.Point(jj,ku).Parameter();
- locmin = 0.;
}
else {
ku = ASI2.NbPoints(jj);
- locmin = 0;
- locmax = ASI2.Point(jj,ku).Parameter();
}
if (Orifuntil == TopAbs_INTERNAL && sens != 0) {
TopAbs_Orientation Oript = ASI2.Point(jj,ku).Orientation();
}
}
else {
- locmin = 0.;
- locmax = RealLast();
sens = 1;
break;
}
#ifdef OCCT_DEBUG
if (trc) cout << " Sliding" << endl;
#endif
- Standard_Boolean Sliding = Standard_False;
+ Sliding = Standard_False;
Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace);
if (s->DynamicType() ==
STANDARD_TYPE(Geom_RectangularTrimmedSurface)) {
mySameVertex(theSameVertex)
{
}
-
+ virtual ~TopoDSVExplorer() {
+ }
const TopoDS_Vertex& Vertex() const
{
return myVertex;
Standard_Real aSameParTol = Precision::Confusion();
TopoDS_Vertex V1,V2;
- Standard_Real U;
+ Standard_Real U = 0.;
Standard_Real UMin = Precision::Infinite();
Standard_Real UMax = -UMin;
Standard_Boolean VminDegen = Standard_False;
Standard_Boolean VmaxDegen = Standard_False;
Standard_Boolean UisoDegen = Standard_False;
- Standard_Boolean VisoDegen = Standard_False;
gp_Pnt MinApex, MaxApex;
Standard_Boolean HasSingularity = Standard_False;
Standard_Real uf1, uf2, vf1, vf2, fpar, lpar;
gp_Pnt2d lp2d = aCurve->Value(lpar);
if (Abs(fp2d.X() - lp2d.X()) <= Precision::PConfusion())
UisoDegen = Standard_True;
- else
- VisoDegen = Standard_True;
-
+
if (DegEdges.Length() == 2)
{
if (UisoDegen)
InterpolationMatrix,
UpperBandWidth,
LowerBandWidth) ;
- Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ;
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode =
BSplCLib::FactorBandedMatrix(InterpolationMatrix,
UpperBandWidth,
LowerBandWidth,
InversionProblem) ;
- Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ;
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode =
BSplCLib::SolveBandedSystem(InterpolationMatrix,
LowerBandWidth,
ArrayDimension,
Poles) ;
-
- Standard_OutOfRange_Raise_if (ErrorCode != 0,"BSplCLib::Interpolate") ;
-}
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
+}
//=======================================================================
//function : Interpolate
InterpolationMatrix,
UpperBandWidth,
LowerBandWidth) ;
- Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ;
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode =
BSplCLib::FactorBandedMatrix(InterpolationMatrix,
UpperBandWidth,
LowerBandWidth,
InversionProblem) ;
- Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ;
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode =
BSplCLib::SolveBandedSystem(InterpolationMatrix,
ArrayDimension,
Poles,
Weights) ;
-
- Standard_OutOfRange_Raise_if (ErrorCode != 0,"BSplCLib::Interpolate") ;
+ if(ErrorCode)
+ Standard_OutOfRange::Raise("BSplCLib::Interpolate");
}
//=======================================================================
//-- Rejection with the table of bits
Standard_Boolean touch = Standard_True;
touch = Standard_False;
- Standard_Real _Xmin,_Ymin,_Zmin,_Xmax,_Ymax,_Zmax;
+ Standard_Real _Xmax,_Ymax,_Zmax;
BSB_T3Bits* Map = (BSB_T3Bits *)TabBits;
Standard_Real xmin, ymin, zmin, xmax, ymax, zmax;
_Xmax=Map->Xmax; _Ymax=Map->Ymax; _Zmax=Map->Zmax;
- _Xmin=Map->Xmin; _Ymin=Map->Ymin; _Zmin=Map->Zmin;
theBox.Get(xmin, ymin, zmin, xmax, ymax, zmax);
Standard_Integer i0,i1,j0,j1,k0,k1;
if(xmin>Xmin) i0=(Standard_Integer )((xmin-Xmin)*deltaX)-1; else i0=1;
void BndLib_Box2dCurve::PerformLineConic()
{
Standard_Integer i, iInf[2];
- Standard_Real aTb[2], aTinf;
+ Standard_Real aTb[2];
gp_Pnt2d aP2D;
//
myErrorStatus=0;
//
Bnd_Box2d& aBox2D=myBox;
//
- aTinf=Precision::Infinite();
iInf[0]=0;
iInf[1]=0;
aTb[0]=myT1;
// Otherwise the opposite face
// and the eventual intersection of 2 pcurves on this face are found.
- ChFiDS_State Stat1,Stat2;
Standard_Boolean isfirst1 = (Sens1 == 1);
Standard_Boolean isfirst2 = (Sens2 == 1);
- Stat1 = Corner1->Spine()->Status(isfirst1);
- Stat2 = Corner2->Spine()->Status(isfirst2);
-/*#ifdef OCCT_DEBUG
- Standard_Boolean evolcoin = ((Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnDiff) ||
- (Stat2 == ChFiDS_OnSame && Stat1 == ChFiDS_OnDiff));
-#endif*/
Standard_Boolean OkinterCC,Okvisavis,SameSide;
Standard_Integer IFaCo1,IFaCo2;
Standard_Real UIntPC1,UIntPC2;
IsOK = Standard_True;
}
- Standard_ConstructionError_Raise_if
- (!IsOK, " GeomFill_BSplineCurves: Courbes non jointives");
+ if(!IsOK)
+ Standard_OutOfRange::Raise("GeomFill_BSplineCurves: Courbes non jointives");
Standard_Integer NbUPoles = CC1->NbPoles();
Standard_Integer NbVPoles = CC2->NbPoles();
CC2->Reverse();
IsOK = Standard_True;
}
-
- Standard_ConstructionError_Raise_if
- (!IsOK, " GeomFill_BezierCurves: Courbes non jointives");
+
+ if(!IsOK)
+ Standard_OutOfRange::Raise("GeomFill_BezierCurves: Courbes non jointives");
CC1->Poles(P1);
CC2->Poles(P2);
//
Standard_Integer i,k;
Standard_Integer linenumber;
- Standard_Real paraint,currentparameter,tolerance;
+ Standard_Real paraint = 0.,currentparameter,tolerance;
Standard_Real U1,V1,U2,V2;
Standard_Boolean goon;
Standard_Real IntTools_FaceFace::ComputeTolerance()
{
Standard_Integer i, j, aNbLin;
- Standard_Real aFirst, aLast, aD, aDMax, aT, aDelta;
+ Standard_Real aFirst, aLast, aD, aDMax, aT;
Handle(Geom_Surface) aS1, aS2;
//
aDMax = 0;
- aDelta = Precision::PConfusion();
aNbLin = mySeqOfCurve.Length();
//
aS1 = myHS1->ChangeSurface().Surface();
//xf
Standard_Integer NbPasOKConseq=0;
- Standard_Real pasMaxSV[4], aTmp;
TColStd_Array1OfReal Param(1,4);
IntImp_ConstIsoparametric ChoixIso;
//xt
//
for (Standard_Integer i=1; i<=4; ++i)
{
- aTmp=ParDep(i);
Param(i)=ParDep(i);
}
//-- reproduce steps uv connected to surfaces Caro1 and Caro2
//-- pasuv[] and pasSav[] are modified during the marching
for(Standard_Integer i = 0; i < 4; ++i)
{
- pasMaxSV[i] = pasSav[i] = pasuv[i] = pasInit[i];
+ pasSav[i] = pasuv[i] = pasInit[i];
}
//-- calculate the first solution point
// modifs JAG 97.05.28
- TopAbs_Orientation orfila=TopAbs_FORWARD;
-
- for (exp.Init(FaceRef.Oriented(TopAbs_FORWARD),TopAbs_WIRE);
- exp.More(); exp.Next()) {
- const TopoDS_Wire& wir = TopoDS::Wire(exp.Current());
- if (wir.IsSame(wfirst)) {
- orfila = exp.Current().Orientation();
- break;
- }
- }
-
- //newW1.Oriented(orfila);
- //newW2.Oriented(orfila);
-
B.Add(newF1,newW1);
//BRepTools::Write(newF1, "k:/queries/WrongBOP/NewF1.brep");
B.Add(newF2,newW2);
//BRepTools::Write(newF2, "k:/queries/WrongBOP/NewF2.brep");
- for (exp.ReInit(); exp.More(); exp.Next()) {
+ for (exp.Init(FaceRef.Oriented(TopAbs_FORWARD),TopAbs_WIRE); exp.More(); exp.Next()) {
const TopoDS_Wire& wir = TopoDS::Wire(exp.Current());
if (!wir.IsSame(wfirst)) {
if (IsInside(newF1, wir)) {
aEdgeSegments = new Graphic3d_ArrayOfSegments (aNbEdgePrimitives * 2);
}
- Standard_Integer howMany = 1;
- if ( IsOverlapControl )
- howMany = 2;
-
TColStd_PackedMapOfInteger aCustomElements;
Quantity_Color anOldEdgeColor;
// --- inherited field : source ---
Handle(TCollection_HAsciiString) asource;
- Standard_Boolean stat2;
- stat2 = data->ReadString (num,2,"source",ach,asource);
+ data->ReadString (num,2,"source",ach,asource);
// --- own field : items ---
// --- inherited field : source ---
Handle(TCollection_HAsciiString) asource;
- Standard_Boolean stat2;
- stat2 = data->ReadString (num,2,"source",ach,asource);
+ data->ReadString (num,2,"source",ach,asource);
// --- own field : items ---
}
if (Pos == Line.Length())
aToken2.Clear();
- else
- aToken2 = Line.SubString(Pos,Line.Length()-1);
-
+ else {
+ Line.Remove(1,Pos-1);
+ Line.Remove(Line.Length());
+ aToken2 = Line;
+ }
if (Debug)
cout << "'\t Value = '" << aToken2 << "'" << endl << flush;
return RESOURCE;
if ( ! sRC.IsNull() && ! name.IsEqual ( file ) ) sRC.Nullify();
if ( ! sRC.IsNull() ) {
struct stat buf;
- if ( ! stat ( file, &buf ) && buf.st_mtime != mtime ) {
+ if ( ! stat ( file, &buf ) && (Standard_Time)buf.st_mtime != mtime ) {
sRC.Nullify();
mtime = buf.st_mtime;
}
TopoDS_Face OOFace = (*this).Face(OOShapeIndex);
Standard_Integer iOOFace = myDS->Shape(OOFace);
- TopoDS_Edge edge,OOedge; Standard_Integer SIedgeIndex,OOedgeIndex;
- Standard_Real paredge,OOparedge;
+ TopoDS_Edge edge,OOedge; Standard_Integer OOedgeIndex;
+#ifdef OCCT_DEBUG
+ Standard_Integer SIedgeIndex;
+#endif
+ Standard_Real paredge;
Standard_Integer onbound;
- if (SIErest)
- {edge = Erest; SIedgeIndex = iErest; paredge = parRest; onbound = obRest;
- OOedge = OOE; OOedgeIndex = iOO; OOparedge = OOpar;}
- else
- {OOedge = Erest;OOedgeIndex = iErest; OOparedge = parRest; onbound = obOO;
- edge = OOE; SIedgeIndex = iOO; paredge = OOpar;}
-
+ if (SIErest) {
+ edge = Erest;
+#ifdef OCCT_DEBUG
+ SIedgeIndex = iErest;
+#endif
+ paredge = parRest;
+ onbound = obRest;
+ OOedge = OOE;
+ OOedgeIndex = iOO;
+ } else {
+ OOedge = Erest;
+ OOedgeIndex = iErest;
+ onbound = obOO;
+ edge = OOE;
+#ifdef OCCT_DEBUG
+ SIedgeIndex = iOO;
+#endif
+ paredge = OOpar;
+ }
// PVIndex :
// --------
// xpu150399 : BUC60382
const TopOpeBRepDS_Transition& llt2 = FaceFaceTransition(2);
TopOpeBRepDS_Transition Trans = (ShapeIndex == 1)? llt1 : llt2;
Standard_Boolean TransUNK = Trans.IsUnknown();
- TopAbs_Orientation Transori; if (!TransUNK) Transori = Trans.Orientation(TopAbs_IN);
-
+
TopOpeBRepDS_Transition transEdge; Standard_Boolean Tunk = Standard_True;
if (!TransUNK) { //xpu281098 PRO12875(edge9,OOface11)
if ((absindex==ShapeIndex)||(absindex==3)) {
if (rkv != rkdg) {TopoDS_Vertex tmp = v; v = ov; ov = tmp; rkv = rkdg;} // ensure v is vertex of dge
}
- Standard_Boolean setrest = Standard_False;
Standard_Integer mkt = 0; Standard_Real par1 = 0.,par2 = 0.;
if (on3) {
TopoDS_Edge ei = (rki == 1) ? TopoDS::Edge(VP.ArcOnS1()) : TopoDS::Edge(VP.ArcOnS2());
Standard_Real pari = (rki == 1) ? VP.ParameterOnArc1() : VP.ParameterOnArc2();
// if okrest, ei interfers in the compute of transitions for dge
- setrest = mktdg.SetRest(pari,ei);
+ mktdg.SetRest(pari,ei);
ok = mktdg.MkTonE(ei,mkt, par1,par2);
if ((!ok) || (mkt == NOI)) return NOI;
OOEi = ei; paronOOEi = pari; hasOOEi = Standard_True;
Standard_Boolean hasOOEi=Standard_False; TopoDS_Edge OOEi; Standard_Real parOOEi;
TopOpeBRepDS_Transition T1ondg, T2ondg;
Standard_Integer rankdg=0, Iiondg=0;
- Standard_Real par1ondg, par2ondg;
+ Standard_Real par1ondg=0., par2ondg=0.;
Standard_Boolean hasdgdata = !myDataforDegenEd.IsEmpty();
if (!hasdgdata) {
return Standard_False;
TCollection_AsciiString string = FileName();
if(!stat(string.ToCString(),&buf)) {
- if(thetime >= buf.st_ctime)
+ if(thetime >= (Standard_Time)buf.st_ctime)
return Standard_True;
}
struct stat buf;
TCollection_AsciiString string = thefilename->String();
if(!stat(string.ToCString(),&buf)) {
- if(thetime == buf.st_ctime) return Standard_True;
+ if(thetime == (Standard_Time)buf.st_ctime) return Standard_True;
}
return Standard_False;
{
if(!stat(string.ToCString(),&buf))
{
- if(thetime >= buf.st_ctime) return Standard_True;
+ if(thetime >= (Standard_Time)buf.st_ctime) return Standard_True;
}
}