1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

Compare commits

...

29 Commits

Author SHA1 Message Date
dpasukhi
675bce58db 0033672: Coding - New line performance update
Auto-fix for std::endl to \n in the file-based stream
2024-04-14 10:17:17 +00:00
ika
b78ccf1f9b 0033661: Data Exchange, Step Import - Tessellated GDTs are not imported
Add processing of tessellated_annotation_occurrence.
Add test cases.
2024-04-07 10:46:17 +01:00
oan
2956d432e2 0033560: PARASOLID Import - XT importer raises exception SIGFPE Arithmetic Exception
Prevent division by zero in exceptional cases when vector of parameters contains only a single value.
2024-03-28 13:58:36 +00:00
anv
d3e00bfaa6 0033616: Application Framework - Using filter while reading XBF may result in unresolved links
- Added tracking of unresolved links for TreeNodes;
- Test case added.
2024-03-28 13:55:46 +00:00
ichesnok
983e35ed71 0033410: Data Exchange, Step Import - TRIANGULATED_FACE from STEP where there are no pnval entries
Problem fixed by using array of nodes in case when aPnindices is empty.
2024-03-24 22:26:23 +00:00
astromko
74095a8b46 0033367: Modeling Algorithms - Normal projection or BOP problem [Regression]
Fixed passing of an incorrect curve into GeomAdaptor::MakeCurve() function.
2024-03-24 22:25:59 +00:00
astromko
576f376108 0031601: Modeling Algorithms - BRepOffset_Tool Segmentation Fault
Added protection against null pointer dereferencing.
Modified BRepOffset_MakeOffset::MakeThickSolid method.
Fixed the problem with negative volume values.
Fixed several unit tests and added a new one.
2024-03-24 22:25:42 +00:00
ichesnok
447396c9b9 0029241: Data Exchange - Empty shape after reading STEP file.
Entity mechanical_design_and_draughting_relationship and function for its transfer added.
2024-03-18 22:17:56 +00:00
ichesnok
9d93d9b9b8 0033638: Data Exchange, Step Import - Style for tessellated object missed
TransferBRep_ShapeBinder used for tessellated face.
2024-03-16 19:36:33 +00:00
ichesnok
d5bcd33386 0033631: Data Exchange, Step import - Crash by reading STEP file
Creating Poly_Triangulation from ComplexTriangulatedSurfaceSet was fixed.
2024-03-16 19:36:18 +00:00
ichesnok
3888b58c27 0033603: Data Exchange, Step Import - Crash reading corrupted STEP file
Crash fixed by checking IsNull().
2024-03-16 19:35:48 +00:00
ichesnok
d1eae5b0d0 0033602: Data Exchange, Step - Carriage return removing
Carriage removing integrated
2024-03-16 19:35:29 +00:00
ichesnok
32f7b4e5bf 0033641: Data Exchange, Step Import - Changing default value for metadata flag
Value for myMetaMode flag changed from 'false' to 'true'.
2024-03-13 17:18:41 +00:00
ichesnok
993da38d54 0033611: Data Exchange - Incorrect header guard for STEP property
Incorrect header guard fixed.
2024-03-13 17:18:27 +00:00
ichesnok
a9becad233 0033596: Documentation - Incorrect default value read.step.tessellated
Default value of read.step.tessellated corrected.
2024-03-13 17:18:13 +00:00
abv
5939991070 0025415: Data Exchange - Invalid result of loading a STEP file
Handling of special case found on some STEP files produced by FPX Expert 2013 (PCB design system):
edge curve is line displaced from its true position but with correct direction;
we shift the line in this case so that it passes through vertices correcty.

Protection against possible exception in writing XDE.
2024-03-13 17:17:45 +00:00
astromko
e8a36f3a02 0033383: Modeling Algorithms - Wire/Face creation problem
ProjCurve3d and BRepAlgo_FaceRestrictor::Perform functions should not continue to work and should terminate if the BRep_Tool::Curve function returns null pointer.
2024-02-28 18:30:11 +00:00
ichesnok
f286953d85 0033530: Data Exchange, Step Import - Implement GENERAL_PROPERTY support
The necessary classes for GeneralProperty support were added.
The ReadMetadata method was created for reading and saving attributes.
2024-02-15 14:00:40 +00:00
ichesnok
20955d88da 0033261: Data Exchange, Step Import - Empty shape after reading process
Added a transfer for ShapeRepresentationRelationship in Transfer of MappedItem method,
in order to support link of components according to ISO 10303-203-2003.
2024-02-08 19:15:58 +00:00
ichesnok
80705eaf31 0033569: Data Exchange, STEP - Crash when reading multi-body file
Datum reading changed in ReadDatums() method:
using DatumSystemAP242 (DatumSystem or DatumReference) array
instead of DatumSystem array (DatumReference)
2024-02-02 12:11:45 +00:00
ichesnok
7b9bda716e 0025188: Data Exchange, Step Export - Losing shapes after import
Check on null for description added to WriteStep methods
(for product, product_definition and product_definition_formation)
2024-02-02 12:10:51 +00:00
ichesnok
dec56592dd 0032980: Data Exchange - STEP import produce a crash
Check on null for loop added
2024-01-30 11:02:05 +00:00
rodrlyra
f035e0718b 0033551: Visualization - Add new transform persistence mode to force orthographic projection on object.
The new transform persistence mode, with flag `Graphic3d_TMF_OrthoPers`, can be combined (bitwise OR operation) with the other persistence modes (2D, Trihedron or Zoom/Rotate Persistence) to make objects be rendered with orthographic projection when it is on a view with perspective projection.

If the view already uses orthographic projection, there will be no difference.

This feature was implemented to fix ViewCube being distorted when view with perspective projection changes size.
2024-01-17 12:53:49 +00:00
vglukhik
cb290cc932 Revert "0033551: Visualization - Add new transform persistence mode to force orthographic projection on object."
This reverts commit 0141024df5.
2024-01-15 15:15:41 +00:00
dpasukhi
cdc6566c3c 0033564: Data Exchange, STEP - Making default unit parameter
Updated signature for step makers with units
  to have default unit as a mm (no scaling)
2024-01-12 17:24:16 +00:00
oan
631a34a05f 0033567: Modeling Data - GeomLib_IsPlanarSurface raises exception SIGFPE Arithmetic Exception in Release mode
Add protection against zero-division
2024-01-12 17:23:55 +00:00
rodrlyra
0141024df5 0033551: Visualization - Add new transform persistence mode to force orthographic projection on object.
The new transform persistence mode, with flag `Graphic3d_TMF_OrthoPers`, can be combined (bitwise OR operation) with the other persistence modes (2D, Trihedron or Zoom/Rotate Persistence) to make objects be rendered with orthographic projection when it is on a view with perspective projection.

If the view already uses orthographic projection, there will be no difference.

This feature was implemented to fix ViewCube being distorted when view with perspective projection changes size.
2024-01-05 18:36:54 +00:00
drochalo
5c94806385 0032487: Visualization - synchronize myHasEntityWithPersistence with such entities number
Changed myHasEntityWithPersistence to a counter.
Renamed variable to myNbEntityWithPersistence.
Modified HasEntityWithPersistence() method.
Modified logical test in SelectMgr_ViewerSelector::traverseObject.
2023-12-26 08:38:03 +00:00
dpasukhi
f0caf64f54 Update version to 7.8.1 dev 2023-12-26 08:38:01 +00:00
592 changed files with 6678 additions and 2792 deletions

View File

@@ -475,7 +475,7 @@ Modify this parameter with:
if(!Interface_Static::SetIVal("read.step.tessellated",1))
.. error ..
~~~~
Default value is 0 (On).
Default value is 1 (On).
@subsubsection occt_step_2_3_4 Performing the STEP file translation
@@ -1653,6 +1653,13 @@ For each Saved View OCCT STEP Reader will retrieve the following attributes:
- clipping planes (single plane of combination of planes);
- front and back plane clipping.
### User defined attributes
Attributes are implemented in accordance with <a href="https://www.mbx-if.org/documents/rec_prac_user_def_attributes_v18.pdf">Recommended practices for User Defined Attributes</a> section 4, 5, 6.1-6.3 and 7.
Attributes can be read for shapes at levels:
- Part/Product Level;
- Component Instances in an Assembly;
- Geometry Level.
@subsection occt_step_7_3 Writing to STEP
The translation from XDE to STEP can be initialized as follows:
@@ -1730,5 +1737,8 @@ Interface_Static::SetIVal("write.step.schema", 5));
### Saved views
Saved Views are not exported by OCCT.
### User defined attributes
Attributes can be imported from STEP.

View File

@@ -1065,44 +1065,44 @@ Standard_Real
void AdvApp2Var_ApproxAFunc2Var::Dump(Standard_OStream& o) const
{
Standard_Integer iesp=1,NbKU,NbKV,ik;
o<<std::endl;
if (!myHasResult) { o<<"No result"<<std::endl; }
o<<'\n';
if (!myHasResult) { o<<"No result"<<'\n'; }
else {
o<<"There is a result";
if (myDone) {
o<<" within the requested tolerance "<<my3DTolerances->Value(iesp)<<std::endl;
o<<" within the requested tolerance "<<my3DTolerances->Value(iesp)<<'\n';
}
else if (my3DMaxError->Value(iesp)>my3DTolerances->Value(iesp)) {
o<<" WITHOUT the requested tolerance "<<my3DTolerances->Value(iesp)<<std::endl;
o<<" WITHOUT the requested tolerance "<<my3DTolerances->Value(iesp)<<'\n';
}
else {
o<<" WITHOUT the requested continuities "<<std::endl;
o<<" WITHOUT the requested continuities "<<'\n';
}
o<<std::endl;
o<<"Result max error :"<<my3DMaxError->Value(iesp)<<std::endl;
o<<"Result average error :"<<my3DAverageError->Value(iesp)<<std::endl;
o<<"Result max error on U frontiers :"<<my3DUFrontError->Value(iesp)<<std::endl;
o<<"Result max error on V frontiers :"<<my3DVFrontError->Value(iesp)<<std::endl;
o<<std::endl;
o<<'\n';
o<<"Result max error :"<<my3DMaxError->Value(iesp)<<'\n';
o<<"Result average error :"<<my3DAverageError->Value(iesp)<<'\n';
o<<"Result max error on U frontiers :"<<my3DUFrontError->Value(iesp)<<'\n';
o<<"Result max error on V frontiers :"<<my3DVFrontError->Value(iesp)<<'\n';
o<<'\n';
o<<"Degree of Bezier patches in U : "<<myDegreeInU
<<" in V : "<<myDegreeInV<<std::endl;
o<<std::endl;
<<" in V : "<<myDegreeInV<<'\n';
o<<'\n';
Handle(Geom_BSplineSurface) S
= Handle(Geom_BSplineSurface)::DownCast(mySurfaces->Value(iesp));
o<<"Number of poles in U : "<<S->NbUPoles()
<<" in V : "<<S->NbVPoles()<<std::endl;
o<<std::endl;
<<" in V : "<<S->NbVPoles()<<'\n';
o<<'\n';
NbKU = S->NbUKnots();
NbKV = S->NbVKnots();
o<<"Number of knots in U : "<<NbKU<<std::endl;
o<<"Number of knots in U : "<<NbKU<<'\n';
for (ik=1;ik<=NbKU;ik++) {
o<<" "<<ik<<" : "<<S->UKnot(ik)<<" mult : "<<S->UMultiplicity(ik)<<std::endl;
o<<" "<<ik<<" : "<<S->UKnot(ik)<<" mult : "<<S->UMultiplicity(ik)<<'\n';
}
o<<std::endl;
o<<"Number of knots in V : "<<NbKV<<std::endl;
o<<'\n';
o<<"Number of knots in V : "<<NbKV<<'\n';
for (ik=1;ik<=NbKV;ik++) {
o<<" "<<ik<<" : "<<S->VKnot(ik)<<" mult : "<<S->VMultiplicity(ik)<<std::endl;
o<<" "<<ik<<" : "<<S->VKnot(ik)<<" mult : "<<S->VMultiplicity(ik)<<'\n';
}
o<<std::endl;
o<<'\n';
}
}

View File

@@ -1090,25 +1090,25 @@ Standard_Real AdvApprox_ApproxAFunction::AverageError(
void AdvApprox_ApproxAFunction::Dump(Standard_OStream& o) const
{
Standard_Integer ii;
o << "Dump of ApproxAFunction" << std::endl;
o << "Dump of ApproxAFunction" << '\n';
if (myNumSubSpaces[0] > 0) {
o << "Error(s) 1d = " << std::endl;
o << "Error(s) 1d = " << '\n';
for (ii=1; ii <= myNumSubSpaces[0]; ii++) {
o << " " << MaxError(1, ii) << std::endl;
o << " " << MaxError(1, ii) << '\n';
}
}
if (myNumSubSpaces[1] > 0) {
o << "Error(s) 2d = " << std::endl;
o << "Error(s) 2d = " << '\n';
for (ii=1; ii <= myNumSubSpaces[1]; ii++) {
o << " " << MaxError(2, ii) << std::endl;
o << " " << MaxError(2, ii) << '\n';
}
}
if (myNumSubSpaces[2] > 0) {
o << "Error(s) 3d = " << std::endl;
o << "Error(s) 3d = " << '\n';
for (ii=1; ii <= myNumSubSpaces[2]; ii++) {
o << " " << MaxError(3, ii) << std::endl;
o << " " << MaxError(3, ii) << '\n';
}
}
}

View File

@@ -378,9 +378,9 @@ Standard_Real AdvApprox_SimpleApprox::AverageError(const Standard_Integer Index)
void AdvApprox_SimpleApprox::Dump(Standard_OStream& o) const
{
Standard_Integer ii;
o << "Dump of SimpleApprox " << std::endl;
o << "Dump of SimpleApprox " << '\n';
for (ii=1; ii <= myTotalNumSS; ii++) {
o << "Error " << MaxError(ii) << std::endl;
o << "Error " << MaxError(ii) << '\n';
}
}

View File

@@ -96,8 +96,8 @@ AppDef_MultiPointConstraint AppDef_MultiLine::Value (const Standard_Integer Inde
void AppDef_MultiLine::Dump(Standard_OStream& o) const
{
o << "AppDef_MultiLine dump:" << std::endl;
o << "AppDef_MultiLine dump:" << '\n';
// AppDef_MultiPointConstraint MP = tabMult->Value(1);
o << "It contains " << tabMult->Length() << " MultiPointConstraint"<< std::endl;
o << "It contains " << tabMult->Length() << " MultiPointConstraint"<< '\n';
// o << MP->NbPoints() << " 3d and " << MP->NbPoints2d() << std::endl;
}

View File

@@ -316,5 +316,5 @@ Standard_Boolean AppDef_MultiPointConstraint::IsCurvaturePoint() const
void AppDef_MultiPointConstraint::Dump(Standard_OStream& o) const
{
o << "AppDef_MultiPointConstraint dump:" << std::endl;
o << "AppDef_MultiPointConstraint dump:" << '\n';
}

View File

@@ -878,34 +878,34 @@ Standard_Integer AppDef_Variational::NbIterations() const
//
void AppDef_Variational::Dump(Standard_OStream& o) const
{
o << " \nVariational Smoothing " << std::endl;
o << " Number of multipoints " << myNbPoints << std::endl;
o << " Number of 2d par multipoint " << myNbP2d << std::endl;
o << " Nombre of 3d par multipoint " << myNbP3d << std::endl;
o << " Number of PassagePoint " << myNbPassPoints << std::endl;
o << " Number of TangencyPoints " << myNbTangPoints << std::endl;
o << " Number of CurvaturePoints " << myNbCurvPoints << std::endl;
o << " \nVariational Smoothing " << '\n';
o << " Number of multipoints " << myNbPoints << '\n';
o << " Number of 2d par multipoint " << myNbP2d << '\n';
o << " Nombre of 3d par multipoint " << myNbP3d << '\n';
o << " Number of PassagePoint " << myNbPassPoints << '\n';
o << " Number of TangencyPoints " << myNbTangPoints << '\n';
o << " Number of CurvaturePoints " << myNbCurvPoints << '\n';
o << " \nTolerance " << o.setf(std::ios::scientific) << std::setprecision(3) << std::setw(9) << myTolerance;
if ( WithMinMax()) { o << " as Max Error." << std::endl;}
else { o << " as size Error." << std::endl;}
if ( WithMinMax()) { o << " as Max Error." << '\n';}
else { o << " as size Error." << '\n';}
o << "CriteriumWeights : " << myPercent[0] << " , "
<< myPercent[1] << " , " << myPercent[2] << std::endl;
<< myPercent[1] << " , " << myPercent[2] << '\n';
if (myIsDone ) {
o << " MaxError " << std::setprecision(3) << std::setw(9) << myMaxError << std::endl;
o << " Index of MaxError " << myMaxErrorIndex << std::endl;
o << " Average Error " << std::setprecision(3) << std::setw(9) << myAverageError << std::endl;
o << " Quadratic Error " << std::setprecision(3) << std::setw(9) << myCriterium[0] << std::endl;
o << " Tension Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[1] << std::endl;
o << " Flexion Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[2] << std::endl;
o << " Jerk Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[3] << std::endl;
o << " NbSegments " << myKnots->Length()-1 << std::endl;
o << " MaxError " << std::setprecision(3) << std::setw(9) << myMaxError << '\n';
o << " Index of MaxError " << myMaxErrorIndex << '\n';
o << " Average Error " << std::setprecision(3) << std::setw(9) << myAverageError << '\n';
o << " Quadratic Error " << std::setprecision(3) << std::setw(9) << myCriterium[0] << '\n';
o << " Tension Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[1] << '\n';
o << " Flexion Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[2] << '\n';
o << " Jerk Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[3] << '\n';
o << " NbSegments " << myKnots->Length()-1 << '\n';
}
else
{
o << (myIsOverConstr
? " The problem is overconstraint"
: " Error in approximation") << std::endl;
: " Error in approximation") << '\n';
}
}

View File

@@ -288,9 +288,9 @@ void AppParCurves_MultiBSpCurve::D2 (const Standard_Integer CuIndex,
void AppParCurves_MultiBSpCurve::Dump(Standard_OStream& o) const
{
o << "AppParCurves_MultiBSpCurve dump:" << std::endl;
o << " It contains " << NbCurves() << " BSpline curves "<< std::endl;
o << " The poles are: " << std::endl;
o << "AppParCurves_MultiBSpCurve dump:" << '\n';
o << " It contains " << NbCurves() << " BSpline curves "<< '\n';
o << " The poles are: " << '\n';
/* for (Standard_Integer i = 1; i <= NbCurves(); i++) {
o << " Curve No. " << i << std::endl;
if (Dimension(i) == 3) {

View File

@@ -283,9 +283,9 @@ void AppParCurves_MultiCurve::D2 (const Standard_Integer CuIndex,
void AppParCurves_MultiCurve::Dump(Standard_OStream& o) const
{
o << "AppParCurves_MultiCurve dump:" << std::endl;
o << " It contains " << NbCurves() << " Bezier curves of degree " << tabPoint->Length()-1 << std::endl;
o << " The poles are: " << std::endl;
o << "AppParCurves_MultiCurve dump:" << '\n';
o << " It contains " << NbCurves() << " Bezier curves of degree " << tabPoint->Length()-1 << '\n';
o << " The poles are: " << '\n';
/* for (Standard_Integer i = 1; i <= NbCurves(); i++) {
o << " Curve No. " << i << std::endl;
if (Dimension(i) == 3) {

View File

@@ -172,20 +172,20 @@ const gp_Pnt2d& AppParCurves_MultiPoint::Point2d (const Standard_Integer Index)
void AppParCurves_MultiPoint::Dump(Standard_OStream& o) const
{
o << "AppParCurves_MultiPoint dump:" << std::endl;
o << "AppParCurves_MultiPoint dump:" << '\n';
const Standard_Integer aNbPnts3D = NbPoints(),
aNbPnts2D = NbPoints2d();
o << "It contains " << aNbPnts3D << " 3d points and " << aNbPnts2D <<" 2d points." << std::endl;
o << "It contains " << aNbPnts3D << " 3d points and " << aNbPnts2D <<" 2d points." << '\n';
if(aNbPnts3D > 0)
{
for(Standard_Integer i = tabPoint->Lower(); i <= tabPoint->Upper(); i++)
{
o << "3D-Point #" << i << std::endl;
o << "3D-Point #" << i << '\n';
o << " Pole x = " << (tabPoint->Value(i)/*->Point(j)*/).X() << std::endl;
o << " Pole y = " << (tabPoint->Value(i)/*->Point(j)*/).Y() << std::endl;
o << " Pole z = " << (tabPoint->Value(i)/*->Point(j)*/).Z() << std::endl;
o << " Pole x = " << (tabPoint->Value(i)/*->Point(j)*/).X() << '\n';
o << " Pole y = " << (tabPoint->Value(i)/*->Point(j)*/).Y() << '\n';
o << " Pole z = " << (tabPoint->Value(i)/*->Point(j)*/).Z() << '\n';
}
}
@@ -193,10 +193,10 @@ void AppParCurves_MultiPoint::Dump(Standard_OStream& o) const
{
for(Standard_Integer i = tabPoint2d->Lower(); i <= tabPoint2d->Upper(); i++)
{
o << "2D-Point #" << i << std::endl;
o << "2D-Point #" << i << '\n';
o << " Pole x = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).X() << std::endl;
o << " Pole y = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).Y() << std::endl;
o << " Pole x = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).X() << '\n';
o << " Pole y = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).Y() << '\n';
}
}
}

View File

@@ -808,8 +808,11 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
const Standard_Integer aNbp = lastP - firstP + 1;
// The first parameter should always be zero according to all the logic below,
// so division by any value will give zero anyway, so it should never be scaled
// to avoid case when there is only one parameter in the array thus division by zero happens.
TheParameters(firstP) = 0.0;
if (aNbp == 2) {
TheParameters(firstP) = 0.0;
TheParameters(lastP) = 1.0;
}
else if (Par == Approx_ChordLength || Par == Approx_Centripetal)
@@ -820,7 +823,6 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
if (nbP3d == 0) mynbP3d = 1;
if (nbP2d == 0) mynbP2d = 1;
TheParameters(firstP) = 0.0;
dist = 0.0;
TColgp_Array1OfPnt tabP(1, mynbP3d);
TColgp_Array1OfPnt tabPP(1, mynbP3d);
@@ -861,10 +863,10 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
TheParameters(i) = TheParameters(i - 1) + Sqrt(dist);
}
}
for (i = firstP; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
for (i = firstP + 1; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
}
else {
for (i = firstP; i <= lastP; i++) {
for (i = firstP + 1; i <= lastP; i++) {
TheParameters(i) = (Standard_Real(i) - firstP) /
(Standard_Real(lastP - Standard_Real(firstP)));
}

View File

@@ -172,8 +172,8 @@ Approx_Curve3d::Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve,
void Approx_Curve3d::Dump(Standard_OStream& o) const
{
o << "******* Dump of ApproxCurve *******" << std::endl;
o << "*******Degree " << Curve()->Degree() << std::endl;
o << "*******NbSegments " << Curve()->NbKnots() - 1 << std::endl;
o << "*******Error " << MaxError() << std::endl;
o << "******* Dump of ApproxCurve *******" << '\n';
o << "*******Degree " << Curve()->Degree() << '\n';
o << "*******NbSegments " << Curve()->NbKnots() - 1 << '\n';
o << "*******Error " << MaxError() << '\n';
}

View File

@@ -623,12 +623,12 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
void Approx_CurvilinearParameter::Dump(Standard_OStream& o) const
{
o << "Dump of Approx_CurvilinearParameter" << std::endl;
o << "Dump of Approx_CurvilinearParameter" << '\n';
if (myCase==2 || myCase==3)
o << "myMaxError2d1 = " << myMaxError2d1 << std::endl;
o << "myMaxError2d1 = " << myMaxError2d1 << '\n';
if (myCase==3)
o << "myMaxError2d2 = " << myMaxError2d2 << std::endl;
o << "myMaxError3d = " << myMaxError3d << std::endl;
o << "myMaxError2d2 = " << myMaxError2d2 << '\n';
o << "myMaxError3d = " << myMaxError3d << '\n';
}
//=======================================================================

View File

@@ -732,19 +732,19 @@ Standard_Real Approx_SweepApproximation::TolCurveOnSurf(const Standard_Integer I
void Approx_SweepApproximation::Dump(Standard_OStream& o) const
{
o << "Dump of SweepApproximation" << std::endl;
o << "Dump of SweepApproximation" << '\n';
if (done) {
o << "Error 3d = " << MaxErrorOnSurf() << std::endl;
o << "Error 3d = " << MaxErrorOnSurf() << '\n';
if (Num2DSS>0) {
o << "Error 2d = ";
for (Standard_Integer ii=1; ii<=Num2DSS; ii++)
{ o << Max2dError(ii);
if (ii < Num2DSS) o << " , " << std::endl;
if (ii < Num2DSS) o << " , " << '\n';
}
std::cout << std::endl;
std::cout << '\n';
}
o << tabVKnots->Length()-1 <<" Segment(s) of degree " << vdeg << std::endl;
o << tabVKnots->Length()-1 <<" Segment(s) of degree " << vdeg << '\n';
}
else std::cout << " Not Done " << std::endl;
else std::cout << " Not Done " << '\n';
}

View File

@@ -103,7 +103,7 @@ static Standard_Boolean ChangePCurve (TopoDS_Edge& E,
//purpose :
//=======================================================================
static void ProjCurve3d (TopoDS_Edge& E,
static bool ProjCurve3d (TopoDS_Edge& E,
const Handle(Geom_Surface)& S,
TopLoc_Location& L)
{
@@ -111,6 +111,10 @@ static void ProjCurve3d (TopoDS_Edge& E,
TopLoc_Location LE;
Standard_Real f,l;
Handle(Geom_Curve) C = BRep_Tool::Curve(E,LE,f,l);
if (C.IsNull())
{
return false;
}
Handle(Geom_TrimmedCurve) CT = new Geom_TrimmedCurve(C,f,l);
TopLoc_Location LL = L.Inverted().Multiplied(LE);
@@ -118,6 +122,7 @@ static void ProjCurve3d (TopoDS_Edge& E,
Handle(Geom2d_Curve) C2 = GeomProjLib::Curve2d (CT,S);
BB.UpdateEdge(E,C2,S,L,Precision::Confusion());
return true;
}
//=======================================================================
@@ -165,13 +170,19 @@ void BRepAlgo_FaceRestrictor::Perform()
// no pcurve on the reference surface.
if (modeProj) {
// Projection of the 3D curve on surface.
ProjCurve3d ( E, S, L);
if (!ProjCurve3d(E, S, L))
{
return;
}
}
else {
// return the first pcurve glued on <S>
Standard_Boolean YaPCurve = ChangePCurve (E, S, L);
if (!YaPCurve) {
ProjCurve3d (E, S, L);
if (!ProjCurve3d(E, S, L))
{
return;
}
}
}
}

View File

@@ -333,7 +333,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
Only2d = Standard_True;
if(Only2d && Only3d) {
BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(hcur->Curve()),
BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(*hcur),
Udeb, Ufin);
prj = MKed.Edge();
BB.UpdateEdge(TopoDS::Edge(prj),
@@ -369,7 +369,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
if(!Only3d) PCur2d = appr.Curve2d();
if(Only2d) {
BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(hcur->Curve()),
BRepLib_MakeEdge MKed(GeomAdaptor::MakeCurve(*hcur),
Udeb, Ufin);
prj = MKed.Edge();
}

View File

@@ -2184,23 +2184,23 @@ void BRepBuilderAPI_Sewing::Dump() const
mapVertices.Add(V2);
}
}
std::cout << " " << std::endl;
std::cout << " Information " << std::endl;
std::cout << " ===========================================================" << std::endl;
std::cout << " " << std::endl;
std::cout << " Number of input shapes : " << myOldShapes.Extent() << std::endl;
std::cout << " Number of actual shapes : " << myNbShapes << std::endl;
std::cout << " Number of Bounds : " << NbBounds << std::endl;
std::cout << " Number of Sections : " << NbSections << std::endl;
std::cout << " Number of Edges : " << mapEdges.Extent() << std::endl;
std::cout << " Number of Vertices : " << myNbVertices << std::endl;
std::cout << " Number of Nodes : " << mapVertices.Extent() << std::endl;
std::cout << " Number of Free Edges : " << myFreeEdges.Extent() << std::endl;
std::cout << " Number of Contigous Edges : " << myContigousEdges.Extent() << std::endl;
std::cout << " Number of Multiple Edges : " << myMultipleEdges.Extent() << std::endl;
std::cout << " Number of Degenerated Edges : " << myDegenerated.Extent() << std::endl;
std::cout << " ===========================================================" << std::endl;
std::cout << " " << std::endl;
std::cout << " " << '\n';
std::cout << " Information " << '\n';
std::cout << " ===========================================================" << '\n';
std::cout << " " << '\n';
std::cout << " Number of input shapes : " << myOldShapes.Extent() << '\n';
std::cout << " Number of actual shapes : " << myNbShapes << '\n';
std::cout << " Number of Bounds : " << NbBounds << '\n';
std::cout << " Number of Sections : " << NbSections << '\n';
std::cout << " Number of Edges : " << mapEdges.Extent() << '\n';
std::cout << " Number of Vertices : " << myNbVertices << '\n';
std::cout << " Number of Nodes : " << mapVertices.Extent() << '\n';
std::cout << " Number of Free Edges : " << myFreeEdges.Extent() << '\n';
std::cout << " Number of Contigous Edges : " << myContigousEdges.Extent() << '\n';
std::cout << " Number of Multiple Edges : " << myMultipleEdges.Extent() << '\n';
std::cout << " Number of Degenerated Edges : " << myDegenerated.Extent() << '\n';
std::cout << " ===========================================================" << '\n';
std::cout << " " << '\n';
}
//=======================================================================

View File

@@ -86,7 +86,7 @@ void PrintShape(const TopoDS_Shape& theShape) {
if (!theShape.IsNull()) {
size_t code = TopTools_ShapeMapHasher{}(theShape);
std::cout << TopAbs::ShapeTypeToString (theShape.ShapeType()) << " : " << code
<< " " << TopAbs::ShapeOrientationToString(theShape.Orientation()) << std::endl;
<< " " << TopAbs::ShapeOrientationToString(theShape.Orientation()) << '\n';
}
}

View File

@@ -1120,18 +1120,18 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const
Standard_Integer i;
Standard_Real r1,r2;
o<< "the distance value is : " << Value()<<std::endl;
o<< "the number of solutions is :"<<NbSolution()<<std::endl;
o<<std::endl;
o<< "the distance value is : " << Value()<<'\n';
o<< "the number of solutions is :"<<NbSolution()<<'\n';
o<<'\n';
for (i=1;i<=NbSolution();i++)
{
o<<"solution number "<<i<<": "<< std::endl;
o<<"the type of the solution on the first shape is " <<Standard_Integer( SupportTypeShape1(i)) <<std::endl;
o<<"the type of the solution on the second shape is "<<Standard_Integer( SupportTypeShape2(i))<< std::endl;
o<< "the coordinates of the point on the first shape are: "<<std::endl;
o<<"X=" <<PointOnShape1(i).X()<<" Y=" <<PointOnShape1(i).Y()<<" Z="<<PointOnShape1(i).Z()<<std::endl;
o<< "the coordinates of the point on the second shape are: "<<std::endl;
o<<"X="<< PointOnShape2(i).X()<< " Y="<<PointOnShape2(i).Y()<<" Z="<< PointOnShape2(i).Z()<<std::endl;
o<<"solution number "<<i<<": "<< '\n';
o<<"the type of the solution on the first shape is " <<Standard_Integer( SupportTypeShape1(i)) <<'\n';
o<<"the type of the solution on the second shape is "<<Standard_Integer( SupportTypeShape2(i))<< '\n';
o<< "the coordinates of the point on the first shape are: "<<'\n';
o<<"X=" <<PointOnShape1(i).X()<<" Y=" <<PointOnShape1(i).Y()<<" Z="<<PointOnShape1(i).Z()<<'\n';
o<< "the coordinates of the point on the second shape are: "<<'\n';
o<<"X="<< PointOnShape2(i).X()<< " Y="<<PointOnShape2(i).Y()<<" Z="<< PointOnShape2(i).Z()<<'\n';
switch (SupportTypeShape1(i))
{
@@ -1139,11 +1139,11 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const
break;
case BRepExtrema_IsOnEdge:
ParOnEdgeS1(i,r1);
o << "parameter on the first edge : t= " << r1 << std::endl;
o << "parameter on the first edge : t= " << r1 << '\n';
break;
case BRepExtrema_IsInFace:
ParOnFaceS1(i,r1,r2);
o << "parameters on the first face : u= " << r1 << " v=" << r2 << std::endl;
o << "parameters on the first face : u= " << r1 << " v=" << r2 << '\n';
break;
}
switch (SupportTypeShape2(i))
@@ -1152,13 +1152,13 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const
break;
case BRepExtrema_IsOnEdge:
ParOnEdgeS2(i,r1);
o << "parameter on the second edge : t=" << r1 << std::endl;
o << "parameter on the second edge : t=" << r1 << '\n';
break;
case BRepExtrema_IsInFace:
ParOnFaceS2(i,r1,r2);
o << "parameters on the second face : u= " << r1 << " v=" << r2 << std::endl;
o << "parameters on the second face : u= " << r1 << " v=" << r2 << '\n';
break;
}
o<<std::endl;
o<<'\n';
}
}

View File

@@ -473,14 +473,14 @@ void BRepMesh_DataStructureOfDelaun::Statistics(Standard_OStream& theStream) con
{
theStream << " Map of nodes : \n";
myNodes->Statistics(theStream);
theStream << "\n Deleted nodes : " << myNodes->GetListOfDelNodes().Extent() << std::endl;
theStream << "\n Deleted nodes : " << myNodes->GetListOfDelNodes().Extent() << '\n';
theStream << "\n\n Map of Links : \n";
myLinks.Statistics(theStream);
theStream << "\n Deleted links : " << myDelLinks.Extent() << std::endl;
theStream << "\n Deleted links : " << myDelLinks.Extent() << '\n';
theStream << "\n\n Map of elements : \n";
theStream << "\n Elements : " << myElements.Size() << std::endl;
theStream << "\n Elements : " << myElements.Size() << '\n';
}
//=======================================================================

View File

@@ -618,7 +618,7 @@ static void EdgeInter(const TopoDS_Face& F,
// Modified by skv - Thu Jan 22 18:19:05 2004 OCC4455 End
LV1.Remove(it1LV1);
LV2.Remove(it1LV2);
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<std::endl;
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<'\n';
Purge = Standard_True;
break;
}
@@ -900,7 +900,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
if (P1.IsEqual(P2, Tol)) {
LV1.Remove(it1LV1);
LV2.Remove(it1LV2);
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<std::endl;
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<'\n';
Purge = Standard_True;
break;
}

View File

@@ -1292,11 +1292,10 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
for ( ;exp2.More(); exp2.Next()) {
LOE.Append(exp2.Current());
}
BRepOffset_Tool::TryProject(CF,OF1,LOE,LInt1,LInt2,mySide,myTol);
//-------------------------------------------------------
// If no trace try intersection.
//-------------------------------------------------------
if (LInt1.IsEmpty()) {
if (!BRepOffset_Tool::TryProject(CF, OF1, LOE, LInt1, LInt2, mySide, myTol) || LInt1.IsEmpty()) {
BRepOffset_Tool::Inter3D (CF,OF1,LInt1,LInt2,mySide,NullEdge,NullFace,NullFace);
}
Store (CF,OF1,LInt1,LInt2);

View File

@@ -1175,12 +1175,16 @@ void BRepOffset_MakeOffset::MakeThickSolid(const Message_ProgressRange& theRange
{
NbOF++;
}
if (NbOF <= NbF)
if (NbOF < NbF)
{
myDone = Standard_False;
myError = BRepOffset_UnknownError;
return;
}
if (NbOF == NbF)
{
myOffset = 0;
}
}
if (myOffset > 0 ) myOffsetShape.Reverse();

View File

@@ -1881,6 +1881,10 @@ Standard_Boolean BRepOffset_Tool::TryProject
if (C.IsNull()) {
BRepLib::BuildCurve3d(CurE,BRep_Tool::Tolerance(CurE));
C = BRep_Tool::Curve(CurE,L,f,l);
if (C.IsNull())
{
return Standard_False;
}
}
C = new Geom_TrimmedCurve(C,f,l);
if ( !L.IsIdentity()) C->Transform(L);
@@ -3519,9 +3523,8 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
if (ToBuild.IsBound(E)) {
TopTools_ListOfShape LOE;
LOE.Append(E);
BRepOffset_Tool::TryProject (TopoDS::Face(ToBuild(E)),
EF,LOE,LInt2,LInt1,Side,TolConf);
if (!LInt1.IsEmpty())
if (BRepOffset_Tool::TryProject(TopoDS::Face(ToBuild(E)), EF, LOE, LInt2, LInt1, Side, TolConf)
&& !LInt1.IsEmpty())
ToBuild.UnBind(E);
}
}

View File

@@ -986,7 +986,7 @@ void BRepOffsetAPI_MiddlePath::Build(const Message_ProgressRange& /*theRange*/)
Interpol.Perform();
if (!Interpol.IsDone())
{
std::cout<<std::endl<<"Interpolation failed"<<std::endl;
std::cout<<'\n'<<"Interpolation failed"<<'\n';
}
Handle(Geom_Curve) InterCurve (Interpol.Curve());
MidEdges(i) = BRepLib_MakeEdge(InterCurve);

View File

@@ -1800,15 +1800,15 @@ static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Inte
{
// Check the command arguments
if (n < 3) {
std::cout<<"Error: "<<a[0]<<" - invalid number of arguments"<<std::endl;
std::cout<<"Usage: type help "<<a[0]<<std::endl;
std::cout<<"Error: "<<a[0]<<" - invalid number of arguments"<<'\n';
std::cout<<"Usage: type help "<<a[0]<<'\n';
return 1; //TCL_ERROR
}
//read shape
const TopoDS_Shape aShape = DBRep::Get(a[2]);
if (aShape.IsNull()) {
std::cout<<"Error: "<<a[2]<<" is null"<<std::endl;
std::cout<<"Error: "<<a[2]<<" is null"<<'\n';
return 1; //TCL_ERROR
}
@@ -1816,7 +1816,7 @@ static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Inte
if (aType != TopAbs_WIRE &&
aType != TopAbs_FACE)
{
std::cout<<"Error: "<<a[2]<<" is neither wire no face"<<std::endl;
std::cout<<"Error: "<<a[2]<<" is neither wire no face"<<'\n';
return 1; //TCL_ERROR
}
@@ -1824,7 +1824,7 @@ static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Inte
Standard_Real aTol = 0.01;
if (n > 3)
aTol = Draw::Atof(a[3]);
std::cout<<"Info: tolerance is set to "<<aTol<<std::endl;
std::cout<<"Info: tolerance is set to "<<aTol<<'\n';
TopoDS_Shape aResult;
@@ -1834,7 +1834,7 @@ static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Inte
BRepBuilderAPI_MakeFace aFaceMaker (TopoDS::Wire(aShape), OnlyPlane);
if (aFaceMaker.Error() != BRepBuilderAPI_FaceDone)
{
std::cout<<"Error: failed to find a face for the wire "<<a[2]<<std::endl;
std::cout<<"Error: failed to find a face for the wire "<<a[2]<<'\n';
return 1; //TCL_ERROR
}
const TopoDS_Face& aFace = aFaceMaker.Face();
@@ -1849,7 +1849,7 @@ static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Inte
}
if (aResult.IsNull()) {
std::cout<<"Error: could not convert "<<a[2]<<std::endl;
std::cout<<"Error: could not convert "<<a[2]<<'\n';
return 1; //TCL_ERROR
}

View File

@@ -245,7 +245,7 @@ static Standard_Integer pcurve(Draw_Interpretor& , Standard_Integer n, const cha
const Handle(Geom2d_Curve) c = BRep_Tool::CurveOnSurface
(TopoDS::Edge(ex.Current()),TopoDS::Face(S),f,l);
if ( c.IsNull() ) {
std::cout << "Error: Edge " << i << " does not have pcurve" << std::endl;
std::cout << "Error: Edge " << i << " does not have pcurve" << '\n';
continue;
}
col = DBRep_ColorOrientation(ex.Current().Orientation());

View File

@@ -247,7 +247,7 @@ static Standard_Integer geompipe(Draw_Interpretor&,
}
Standard_Real Accuracy = aPipe.ErrorOnSurf();
std::cout << "Accuracy of approximation = " << Accuracy << std::endl;
std::cout << "Accuracy of approximation = " << Accuracy << '\n';
Handle(Geom_Surface) Sur = aPipe.Surface();
TopoDS_Face F;

View File

@@ -54,7 +54,7 @@ const char* BRepTools_Dump (void* theShapePtr)
std::cout <<"\n\n";
BRepTools::Dump (*(TopoDS_Shape*)theShapePtr, std::cout);
std::cout << std::endl;
std::cout << '\n';
return "Shape dumped to std::cout";
}
@@ -78,7 +78,7 @@ const char* BRepTools_DumpLoc (void* theLocationPtr)
TopTools_LocationSet LS;
LS.Add(*(TopLoc_Location*)theLocationPtr);
LS.Dump(std::cout);
std::cout <<std::endl;
std::cout <<'\n';
return "Location dumped to std::cout";
}

View File

@@ -515,8 +515,13 @@ BSplCLib::EvalBsplineBasis
//
// this should be always invertible if ii is correctly computed
//
Factor = (Parameter - FlatKnots(ii - qq + pp + 1))
/ (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1)) ;
const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
if (Abs (aScale) < gp::Resolution())
{
return 2;
}
Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) / aScale;
Saved = Factor * BsplineBasis(1,pp) ;
BsplineBasis(1,pp) *= (1.0e0 - Factor) ;
BsplineBasis(1,pp) += BsplineBasis(1,qq) ;
@@ -536,7 +541,13 @@ BSplCLib::EvalBsplineBasis
}
for (pp = 1 ; pp <= qq - 1 ; pp++) {
Inverse = 1.0e0 / (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1)) ;
const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
if (Abs (aScale) < gp::Resolution())
{
return 2;
}
Inverse = 1.0e0 / aScale;
Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) * Inverse ;
Saved = Factor * BsplineBasis(1,pp) ;
BsplineBasis(1,pp) *= (1.0e0 - Factor) ;

View File

@@ -2064,7 +2064,7 @@ void BiTgte_Blend::ComputeSurfaces()
if (MKE.IsDone())
E1 = MKE.Edge();
else {
std::cout << "Edge Not Done" << std::endl;
std::cout << "Edge Not Done" << '\n';
E1 = MKE.Edge();
}
@@ -2103,7 +2103,7 @@ void BiTgte_Blend::ComputeSurfaces()
if (MKE.IsDone())
E2 = MKE.Edge();
else {
std::cout << "edge not Done" << std::endl;
std::cout << "edge not Done" << '\n';
E2 = MKE.Edge();
}
KPartCurve3d(E2,PC2,GS2);

View File

@@ -33,6 +33,7 @@
#include <Storage_Schema.hxx>
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <TDataStd_TreeNode.hxx>
#include <TDF_Attribute.hxx>
#include <TDF_Data.hxx>
#include <TDF_Label.hxx>
@@ -324,7 +325,16 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
// read sub-tree of the root label
if (!theFilter.IsNull())
theFilter->StartIteration();
Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, aPS.Next());
const auto aStreamStartPosition = theIStream.tellg();
Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next());
if (!myUnresolvedLinks.IsEmpty())
{
// In case we have skipped some linked TreeNodes before getting to
// their children.
theFilter->StartIteration();
theIStream.seekg(aStreamStartPosition, std::ios_base::beg);
nbRead += ReadSubTree(theIStream, aData->Root(), theFilter, aQuickPart, Standard_True, aPS.Next());
}
if (!aPS.More())
{
myReaderStatus = PCDM_RS_UserBreak;
@@ -373,6 +383,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
const TDF_Label& theLabel,
const Handle(PCDM_ReaderFilter)& theFilter,
const Standard_Boolean& theQuickPart,
const Standard_Boolean theReadMissing,
const Message_ProgressRange& theRange)
{
Standard_Integer nbRead = 0;
@@ -393,7 +404,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
aLabelSize = InverseUint64(aLabelSize);
#endif
// no one sub-label is needed, so, skip everything
if (aSkipAttrs && !theFilter->IsSubPassed())
if (aSkipAttrs && !theFilter->IsSubPassed() && myUnresolvedLinks.IsEmpty())
{
aLabelSize -= sizeof (uint64_t);
theIS.seekg (aLabelSize, std::ios_base::cur);
@@ -403,6 +414,11 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
}
}
if (theReadMissing)
{
aSkipAttrs = Standard_True;
}
const auto anAttStartPosition = theIS.tellg();
// Read attributes:
for (theIS >> myPAtt;
theIS && myPAtt.TypeId() > 0 && // not an end marker ?
@@ -415,6 +431,12 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
myReaderStatus = PCDM_RS_UserBreak;
return -1;
}
if (myUnresolvedLinks.Remove(myPAtt.Id()) && aSkipAttrs)
{
aSkipAttrs = Standard_False;
theIS.seekg(anAttStartPosition, std::ios_base::beg);
continue;
}
if (aSkipAttrs)
{
if (myPAtt.IsDirect()) // skip direct written stream
@@ -487,7 +509,17 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
aDriver->TypeName(), Message_Warning);
}
else if (!isBound)
{
myRelocTable.Bind(anID, tAtt);
Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt);
if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
{
Standard_Integer anUnresolvedLink;
myPAtt.SetPosition(BP_HEADSIZE);
myPAtt >> anUnresolvedLink;
myUnresolvedLinks.Add(anUnresolvedLink);
}
}
}
else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
myMsgDriver->Send(aMethStr + "warning: type ID not registered in header: "
@@ -522,7 +554,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
// read sub-tree
if (!theFilter.IsNull())
theFilter->Down (aTag);
Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, aPS.Next());
Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, theReadMissing, aPS.Next());
// check for error
if (nbSubRead == -1)
return -1;

View File

@@ -80,6 +80,7 @@ protected:
const TDF_Label& theData,
const Handle(PCDM_ReaderFilter)& theFilter,
const Standard_Boolean& theQuickPart,
const Standard_Boolean theReadMissing,
const Message_ProgressRange& theRanges = Message_ProgressRange());
@@ -125,6 +126,7 @@ private:
BinObjMgt_Persistent myPAtt;
TColStd_MapOfInteger myMapUnsupported;
BinLDrivers_VectorOfDocumentSection mySections;
NCollection_Map<Standard_Integer> myUnresolvedLinks;
};

View File

@@ -311,8 +311,8 @@ void BinTools_Curve2dSet::WriteCurve2d(
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_Curve2dSet::WriteCurve2d(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_Curve2dSet::WriteCurve2d(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -660,8 +660,8 @@ Standard_IStream& BinTools_Curve2dSet::ReadCurve2d(Standard_IStream& IS,
catch(Standard_Failure const& anException) {
C = NULL;
Standard_SStream aMsg;
aMsg <<"EXCEPTION in BinTools_Curve2dSet::ReadCurve2d(...)" << std::endl;
aMsg << anException << std::endl;
aMsg <<"EXCEPTION in BinTools_Curve2dSet::ReadCurve2d(...)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
return IS;
@@ -680,7 +680,7 @@ void BinTools_Curve2dSet::Read (Standard_IStream& IS,
IS >> buffer;
if (IS.fail() || strcmp(buffer,"Curve2ds")) {
Standard_SStream aMsg;
aMsg << "BinTools_Curve2dSet::Read: Not a Curve2d table"<<std::endl;
aMsg << "BinTools_Curve2dSet::Read: Not a Curve2d table"<<'\n';
#ifdef OCCT_DEBUG
std::cout <<"Curve2dSet buffer: " << buffer << std::endl;
#endif

View File

@@ -320,8 +320,8 @@ void BinTools_CurveSet::WriteCurve(const Handle(Geom_Curve)& C,
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_CurveSet::WriteCurve(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_CurveSet::WriteCurve(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -675,8 +675,8 @@ Standard_IStream& BinTools_CurveSet::ReadCurve(Standard_IStream& IS,
catch(Standard_Failure const& anException) {
C = NULL;
Standard_SStream aMsg;
aMsg <<"EXCEPTION in BinTools_CurveSet::ReadCurve(..)" << std::endl;
aMsg << anException << std::endl;
aMsg <<"EXCEPTION in BinTools_CurveSet::ReadCurve(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
return IS;
@@ -694,7 +694,7 @@ void BinTools_CurveSet::Read (Standard_IStream& IS,
IS >> buffer;
if (IS.fail() || strcmp(buffer,"Curves")) {
Standard_SStream aMsg;
aMsg << "BinTools_CurveSet::Read: Not a Curve table"<<std::endl;
aMsg << "BinTools_CurveSet::Read: Not a Curve table"<<'\n';
#ifdef OCCT_DEBUG
std::cout <<"CurveSet buffer: " << buffer << std::endl;
#endif

View File

@@ -96,7 +96,7 @@ uint64_t BinTools_IStream::ReadReference()
if (aDelta == 0)
{
Standard_SStream aMsg;
aMsg << "BinTools_IStream::ReadReference: invalid reference " << (char)myLastType << std::endl;
aMsg << "BinTools_IStream::ReadReference: invalid reference " << (char)myLastType << '\n';
throw Standard_Failure (aMsg.str().c_str());
}
return aCurrentPos - aDelta - 1; // add a type-byte

View File

@@ -195,8 +195,8 @@ void BinTools_LocationSet::Write(Standard_OStream& OS) const
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_LocatioSet::Write(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_LocatioSet::Write(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -215,7 +215,7 @@ void BinTools_LocationSet::Read(Standard_IStream& IS)
IS >> buffer;
if (IS.fail() || (strcmp(buffer,"Locations"))) {
Standard_SStream aMsg;
aMsg << "BinTools_LocationSet::Read: Not a location table"<<std::endl;
aMsg << "BinTools_LocationSet::Read: Not a location table"<<'\n';
throw Standard_Failure(aMsg.str().c_str());
return;
}
@@ -247,7 +247,7 @@ void BinTools_LocationSet::Read(Standard_IStream& IS)
}
} else {
Standard_SStream aMsg;
aMsg << "Unexpected location's type = " << aTypLoc << std::endl;
aMsg << "Unexpected location's type = " << aTypLoc << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
if (!L.IsIdentity()) myMap.Add(L);
@@ -255,8 +255,8 @@ void BinTools_LocationSet::Read(Standard_IStream& IS)
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_LocationSet::Read(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_LocationSet::Read(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}

View File

@@ -146,7 +146,7 @@ TopoDS_Shape BinTools_ShapeReader::ReadShape (BinTools_IStream& theStream)
default:
{
Standard_SStream aMsg;
aMsg << "BinTools_ShapeReader::Read: UnExpected BRep_PointRepresentation = " << aPrsType << std::endl;
aMsg << "BinTools_ShapeReader::Read: UnExpected BRep_PointRepresentation = " << aPrsType << '\n';
throw Standard_Failure (aMsg.str().c_str());
}
}
@@ -255,7 +255,7 @@ TopoDS_Shape BinTools_ShapeReader::ReadShape (BinTools_IStream& theStream)
default:
{
Standard_SStream aMsg;
aMsg << "Unexpected Curve Representation =" << aPrsType << std::endl;
aMsg << "Unexpected Curve Representation =" << aPrsType << '\n';
throw Standard_Failure (aMsg.str().c_str());
}
@@ -295,7 +295,7 @@ TopoDS_Shape BinTools_ShapeReader::ReadShape (BinTools_IStream& theStream)
default:
{
Standard_SStream aMsg;
aMsg << "Unexpected topology type = " << aShapeType << std::endl;
aMsg << "Unexpected topology type = " << aShapeType << '\n';
throw Standard_Failure (aMsg.str().c_str());
break;
}
@@ -304,8 +304,8 @@ TopoDS_Shape BinTools_ShapeReader::ReadShape (BinTools_IStream& theStream)
catch (Standard_Failure const& anException)
{
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_ShapeReader::Read" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_ShapeReader::Read" << '\n';
aMsg << anException << '\n';
throw Standard_Failure (aMsg.str().c_str());
}
// read flags and subs

View File

@@ -391,7 +391,7 @@ void BinTools_ShapeSet::Read (Standard_IStream& IS,
}
while ( ! IS.fail());
if (IS.fail()) {
std::cout << "BinTools_ShapeSet::Read: File was not written with this version of the topology" << std::endl;
std::cout << "BinTools_ShapeSet::Read: File was not written with this version of the topology" << '\n';
return;
}
@@ -414,7 +414,7 @@ void BinTools_ShapeSet::Read (Standard_IStream& IS,
IS >> buffer;
if (IS.fail() || strcmp(buffer,"TShapes")) {
Standard_SStream aMsg;
aMsg << "BinTools_ShapeSet::Read: Not a TShape table"<<std::endl;
aMsg << "BinTools_ShapeSet::Read: Not a TShape table"<<'\n';
throw Standard_Failure(aMsg.str().c_str());
return;
}
@@ -760,8 +760,8 @@ void BinTools_ShapeSet::WriteShape (const TopoDS_Shape& S,
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_ShapeSet::WriteGeometry(S,OS)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_ShapeSet::WriteGeometry(S,OS)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -880,7 +880,7 @@ void BinTools_ShapeSet::ReadShape (const TopAbs_ShapeEnum T,
default:
{
Standard_SStream aMsg;
aMsg << "BinTools_SurfaceSet::ReadGeometry: UnExpected BRep_PointRepresentation = " << val << std::endl;
aMsg << "BinTools_SurfaceSet::ReadGeometry: UnExpected BRep_PointRepresentation = " << val << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -1081,7 +1081,7 @@ void BinTools_ShapeSet::ReadShape (const TopAbs_ShapeEnum T,
default:
{
Standard_SStream aMsg;
aMsg << "Unexpected Curve Representation =" << val << std::endl;
aMsg << "Unexpected Curve Representation =" << val << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
@@ -1167,7 +1167,7 @@ void BinTools_ShapeSet::ReadShape (const TopAbs_ShapeEnum T,
default:
{
Standard_SStream aMsg;
aMsg << "Unexpected topology type = " << T << std::endl;
aMsg << "Unexpected topology type = " << T << '\n';
throw Standard_Failure(aMsg.str().c_str());
break;
}
@@ -1175,8 +1175,8 @@ void BinTools_ShapeSet::ReadShape (const TopAbs_ShapeEnum T,
}
catch (Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_ShapeSet::ReadGeometry(S,OS)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_ShapeSet::ReadGeometry(S,OS)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}

View File

@@ -247,8 +247,8 @@ void BinTools_ShapeWriter::WriteShape (BinTools_OStream& theStream, const TopoDS
catch (Standard_Failure const& anException)
{
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_ShapeWriter::WriteShape" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_ShapeWriter::WriteShape" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
theStream.PutBools (aShape.Free(), aShape.Modified(), aShape.Checked(),
@@ -308,8 +308,8 @@ void BinTools_ShapeWriter::WriteLocation (BinTools_OStream& theStream, const Top
}
catch (Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_ShapeWriter::WriteLocation" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_ShapeWriter::WriteLocation" << '\n';
aMsg << anException << '\n';
throw Standard_Failure (aMsg.str().c_str());
}
}

View File

@@ -391,8 +391,8 @@ void BinTools_SurfaceSet::WriteSurface (const Handle(Geom_Surface)& S,
}
catch(Standard_Failure const& anException) {
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_SurfaceSet::WriteSurface(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_SurfaceSet::WriteSurface(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -830,8 +830,8 @@ Standard_IStream& BinTools_SurfaceSet::ReadSurface(Standard_IStream& IS,
catch(Standard_Failure const& anException) {
S = NULL;
Standard_SStream aMsg;
aMsg << "EXCEPTION in BinTools_SurfaceSet::ReadSurface(..)" << std::endl;
aMsg << anException << std::endl;
aMsg << "EXCEPTION in BinTools_SurfaceSet::ReadSurface(..)" << '\n';
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
return IS;
@@ -849,7 +849,7 @@ void BinTools_SurfaceSet::Read (Standard_IStream& IS,
IS >> buffer;
if (IS.fail() || strcmp(buffer,"Surfaces")) {
Standard_SStream aMsg;
aMsg << "BinTools_SurfaceSet::Read: Not a surface table"<<std::endl;
aMsg << "BinTools_SurfaceSet::Read: Not a surface table"<<'\n';
#ifdef OCCT_DEBUG
std::cout <<"SurfaceSet buffer: " << buffer << std::endl;
#endif

View File

@@ -283,7 +283,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
line2 = L2->Lin2d();
}
else {
std::cout << "Not yet implemented" << std::endl;
std::cout << "Not yet implemented" << '\n';
}
}
else if (type1 == STANDARD_TYPE(Geom2d_Line)) {
@@ -302,11 +302,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
line2 = L2->Lin2d();
}
else {
std::cout << "Not yet implemented" << std::endl;
std::cout << "Not yet implemented" << '\n';
}
}
else {
std::cout << "Not yet implemented" << std::endl;
std::cout << "Not yet implemented" << '\n';
}
switch(cas) {
@@ -842,7 +842,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
line = L1->Lin2d();
}
else {
std::cout << "Not yet implemented" << std::endl;
std::cout << "Not yet implemented" << '\n';
}
switch(cas) {
@@ -997,7 +997,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve ,
default:
{
std::cout << "Not yet implemented" << std::endl;
std::cout << "Not yet implemented" << '\n';
break;
}
}
@@ -1633,7 +1633,7 @@ void Bisector_BisecAna::Dump(const Standard_Integer ,
const Standard_Integer Offset) const
{
Indent (Offset);
std::cout<<"Bisector_BisecAna"<<std::endl;
std::cout<<"Bisector_BisecAna"<<'\n';
Indent (Offset);
// thebisector->Dump();
}

View File

@@ -1464,19 +1464,19 @@ void Bisector_BisecCC::Dump(const Standard_Integer ,
const Standard_Integer Offset) const
{
Indent (Offset);
std::cout <<"Bisector_BisecCC :"<<std::endl;
std::cout <<"Bisector_BisecCC :"<<'\n';
Indent (Offset);
// std::cout <<"Curve1 :"<<curve1<<std::endl;
// std::cout <<"Curve2 :"<<curve2<<std::endl;
std::cout <<"Sign1 :"<<sign1<<std::endl;
std::cout <<"Sign2 :"<<sign2<<std::endl;
std::cout <<"Sign1 :"<<sign1<<'\n';
std::cout <<"Sign2 :"<<sign2<<'\n';
std::cout <<"Number Of Intervals :"<<startIntervals.Length()<<std::endl;
std::cout <<"Number Of Intervals :"<<startIntervals.Length()<<'\n';
for (Standard_Integer i = 1; i <= startIntervals.Length(); i++) {
std::cout <<"Interval number :"<<i<<"Start :"<<startIntervals.Value(i)
<<" end :"<< endIntervals.Value(i)<<std::endl ;
<<" end :"<< endIntervals.Value(i)<<'\n' ;
}
std::cout <<"Index Current Interval :"<<currentInterval<<std::endl;
std::cout <<"Index Current Interval :"<<currentInterval<<'\n';
}
//=============================================================================

View File

@@ -847,18 +847,18 @@ void Bisector_BisecPC::Dump(const Standard_Integer ,
const Standard_Integer Offset) const
{
Indent (Offset);
std::cout <<"Bisector_BisecPC :"<<std::endl;
std::cout <<"Bisector_BisecPC :"<<'\n';
Indent (Offset);
std::cout <<"Point :"<<std::endl;
std::cout <<" X = "<<point.X()<<std::endl;
std::cout <<" Y = "<<point.Y()<<std::endl;
std::cout <<"Sign :"<<sign<<std::endl;
std::cout <<"Number Of Intervals :"<<startIntervals.Length()<<std::endl;
std::cout <<"Point :"<<'\n';
std::cout <<" X = "<<point.X()<<'\n';
std::cout <<" Y = "<<point.Y()<<'\n';
std::cout <<"Sign :"<<sign<<'\n';
std::cout <<"Number Of Intervals :"<<startIntervals.Length()<<'\n';
for (Standard_Integer i = 1; i <= startIntervals.Length(); i++) {
std::cout <<"Interval number :"<<i<<"Start :"<<startIntervals.Value(i)
<<" end :"<< endIntervals.Value(i)<<std::endl ;
<<" end :"<< endIntervals.Value(i)<<'\n' ;
}
std::cout <<"Index Current Interval :"<<currentInterval<<std::endl;
std::cout <<"Index Current Interval :"<<currentInterval<<'\n';
}

View File

@@ -163,8 +163,8 @@ Standard_Boolean Bisector_PointOnBis::IsInfinite() const
//=============================================================================
void Bisector_PointOnBis::Dump() const
{
std::cout <<"Param1 :"<<param1<<std::endl;
std::cout <<"Param2 :"<<param2<<std::endl;
std::cout <<"Param Bis :"<<paramBis<<std::endl;
std::cout <<"Distance :"<<distance<<std::endl;
std::cout <<"Param1 :"<<param1<<'\n';
std::cout <<"Param2 :"<<param2<<'\n';
std::cout <<"Param Bis :"<<paramBis<<'\n';
std::cout <<"Distance :"<<distance<<'\n';
}

View File

@@ -264,13 +264,13 @@ Handle(CDM_Document) CDF_Application::Retrieve (const Handle(CDM_MetaData)& aMet
myRetrievableStatus = CanRetrieve(aMetaData, isAppendMode);
switch (myRetrievableStatus) {
case PCDM_RS_UnknownDocument:
aMsg << "could not find the referenced document: " << aMetaData->Path() << "; not found." <<(char)0 << std::endl;
aMsg << "could not find the referenced document: " << aMetaData->Path() << "; not found." <<(char)0 << '\n';
break;
case PCDM_RS_PermissionDenied:
aMsg << "Could not find the referenced document: " << aMetaData->Path() << "; permission denied. " <<(char)0 << std::endl;
aMsg << "Could not find the referenced document: " << aMetaData->Path() << "; permission denied. " <<(char)0 << '\n';
break;
case PCDM_RS_NoDocument:
aMsg << "Document for appending is not defined." << (char)0 << std::endl;
aMsg << "Document for appending is not defined." << (char)0 << '\n';
break;
default:
myRetrievableStatus = PCDM_RS_OK;
@@ -319,7 +319,7 @@ Handle(CDM_Document) CDF_Application::Retrieve (const Handle(CDM_MetaData)& aMet
myRetrievableStatus = theReader->GetStatus();
if (myRetrievableStatus > PCDM_RS_AlreadyRetrieved) {
Standard_SStream aMsg;
aMsg << anException << std::endl;
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}
@@ -392,7 +392,7 @@ void CDF_Application::Read (Standard_IStream& theIStream,
myRetrievableStatus = PCDM_RS_FormatFailure;
Standard_SStream aMsg;
aMsg << anException << std::endl;
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
@@ -437,7 +437,7 @@ void CDF_Application::Read (Standard_IStream& theIStream,
if (myRetrievableStatus > PCDM_RS_AlreadyRetrieved)
{
Standard_SStream aMsg;
aMsg << anException << std::endl;
aMsg << anException << '\n';
throw Standard_Failure(aMsg.str().c_str());
}
}

View File

@@ -1005,7 +1005,7 @@ Handle(Resource_Manager) CDM_Document::StorageResource()
if(myApplication.IsNull()) {
Standard_SStream aMsg;
aMsg << "this document of format "<< StorageFormat()
<< " has not yet been opened by any application. "<< std::endl;
<< " has not yet been opened by any application. "<< '\n';
throw Standard_Failure(aMsg.str().c_str());
}
return myApplication->Resources();

View File

@@ -140,7 +140,7 @@ Standard_OStream& CDM_MetaData::Print(Standard_OStream& anOStream) const {
if(HasVersion()) anOStream << "," << myVersion ;
anOStream << "; Physical situation: ";
anOStream << myFileName;
anOStream << std::endl;
anOStream << '\n';
return anOStream;
}
Standard_OStream& CDM_MetaData::operator << (Standard_OStream& anOStream) {

View File

@@ -894,7 +894,7 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
if (OffsetHGuide.IsNull())
{
std::cout<<std::endl<<"Construction of offset guide failed!"<<std::endl;
std::cout<<'\n'<<"Construction of offset guide failed!"<<'\n';
//exception
}
pFunc.reset(new BRepBlend_ConstThroatWithPenetration(S1,S2,OffsetHGuide));
@@ -1271,7 +1271,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
if (OffsetHGuide.IsNull())
{
std::cout<<std::endl<<"Construction of offset guide failed!"<<std::endl;
std::cout<<'\n'<<"Construction of offset guide failed!"<<'\n';
//exception
}
pFunc.reset(new BRepBlend_ConstThroatWithPenetration(S1,S2,OffsetHGuide));
@@ -1518,7 +1518,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
if (OffsetHGuide.IsNull())
{
std::cout<<std::endl<<"Construction of offset guide failed!"<<std::endl;
std::cout<<'\n'<<"Construction of offset guide failed!"<<'\n';
//exception
}
pFunc.reset(new BRepBlend_ConstThroatWithPenetration(S1,S2,OffsetHGuide));

View File

@@ -1244,7 +1244,7 @@ void ComputeInternalPoints
rsnld.Perform(SFunc,X,infb,supb);
if (!rsnld.IsDone()) {
std::cout << "Echec recherche internal points" << std::endl;
std::cout << "Echec recherche internal points" << '\n';
solution = Standard_True;
ok = Standard_False;
}
@@ -1282,7 +1282,7 @@ void ComputeInternalPoints
}
}
else { // on n est pas sur une solution
std::cout << "Echec recherche internal points" << std::endl;
std::cout << "Echec recherche internal points" << '\n';
solution = Standard_True;
ok = Standard_False;
}

View File

@@ -61,7 +61,7 @@ Standard_EXPORT void DBRep_WriteColorOrientation ()
std::cout << "\nrouge FORWARD";
std::cout << "\nbleu REVERSED";
std::cout << "\nrose EXTERNAL";
std::cout << "\norange INTERNAL"<<std::endl;
std::cout << "\norange INTERNAL"<<'\n';
}
Standard_EXPORT Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation Or)
@@ -1376,7 +1376,7 @@ TopoDS_Shape DBRep::getShape (Standard_CString& theName,
TopAbs::Print (theType, std::cout);
std::cout << " but a ";
TopAbs::Print (aShape.ShapeType(), std::cout);
std::cout << std::endl;
std::cout << '\n';
}
return TopoDS_Shape();
}

View File

@@ -630,7 +630,7 @@ void DBRep_DrawableShape::DrawOn(Draw_Display& dis) const
BRep_Tool::Range(E->Edge(), aCheckU1, aCheckU2);
if (aCheckU2 < aCheckU1) {
// bad orientation
std::cout << "DBRep_DrawableShape : Bad parameters on edge."<<std::endl;
std::cout << "DBRep_DrawableShape : Bad parameters on edge."<<'\n';
BRepTools::Dump(E->Edge(),std::cout);
ite.Next();
continue;

View File

@@ -294,11 +294,11 @@ void DBRep_IsoBuilder::LoadIsos (const Handle(DBRep_Face)& Face) const
if (!IsDone (UInd)) {
std::cout << "DBRep_IsoBuilder:: U iso of parameter: " << UPrm ;
switch (Status (UInd)) {
case HatchGen_NoProblem : std::cout << " No Problem" << std::endl ; break ;
case HatchGen_TrimFailure : std::cout << " Trim Failure" << std::endl ; break ;
case HatchGen_TransitionFailure : std::cout << " Transition Failure" << std::endl ; break ;
case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << std::endl ; break ;
case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << std::endl ; break ;
case HatchGen_NoProblem : std::cout << " No Problem" << '\n' ; break ;
case HatchGen_TrimFailure : std::cout << " Trim Failure" << '\n' ; break ;
case HatchGen_TransitionFailure : std::cout << " Transition Failure" << '\n' ; break ;
case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << '\n' ; break ;
case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << '\n' ; break ;
}
} else {
Standard_Integer NbDom = Geom2dHatch_Hatcher::NbDomains (UInd) ;
@@ -320,11 +320,11 @@ void DBRep_IsoBuilder::LoadIsos (const Handle(DBRep_Face)& Face) const
if (!IsDone (VInd)) {
std::cout << "DBRep_IsoBuilder:: V iso of parameter: " << VPrm ;
switch (Status (VInd)) {
case HatchGen_NoProblem : std::cout << " No Problem" << std::endl ; break ;
case HatchGen_TrimFailure : std::cout << " Trim Failure" << std::endl ; break ;
case HatchGen_TransitionFailure : std::cout << " Transition Failure" << std::endl ; break ;
case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << std::endl ; break ;
case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << std::endl ; break ;
case HatchGen_NoProblem : std::cout << " No Problem" << '\n' ; break ;
case HatchGen_TrimFailure : std::cout << " Trim Failure" << '\n' ; break ;
case HatchGen_TransitionFailure : std::cout << " Transition Failure" << '\n' ; break ;
case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << '\n' ; break ;
case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << '\n' ; break ;
}
} else {
Standard_Integer NbDom = Geom2dHatch_Hatcher::NbDomains (VInd) ;

View File

@@ -56,7 +56,7 @@ Standard_Boolean DDF::FindLabel (const Handle(TDF_Data)& DF,
{
Label.Nullify();
TDF_Tool::Label(DF,Entry,Label,Standard_False);
if (Label.IsNull() && Complain) std::cout << "No label for entry " << Entry <<std::endl;
if (Label.IsNull() && Complain) std::cout << "No label for entry " << Entry <<'\n';
return !Label.IsNull();
}
@@ -77,7 +77,7 @@ Standard_Boolean DDF::GetDF (Standard_CString& Name,
DF = DDF->DataFramework();
return Standard_True;
}
if (Complain) std::cout <<"framework "<<Name<<" not found "<< std::endl;
if (Complain) std::cout <<"framework "<<Name<<" not found "<< '\n';
return Standard_False;
}
@@ -96,7 +96,7 @@ Standard_Boolean DDF::Find (const Handle(TDF_Data)& DF,
TDF_Label L;
if (FindLabel(DF,Entry,L,Complain)) {
if (L.FindAttribute(ID,A)) return Standard_True;
if (Complain) std::cout <<"attribute not found for entry : "<< Entry <<std::endl;
if (Complain) std::cout <<"attribute not found for entry : "<< Entry <<'\n';
}
return Standard_False;
}

View File

@@ -82,7 +82,7 @@ Handle(Draw_Drawable3D) DDF_Browser::Copy() const
void DDF_Browser::Dump(Standard_OStream& S) const
{
S<<"DDF_Browser on a DF:"<<std::endl;
S<<"DDF_Browser on a DF:"<<'\n';
S<<myDF;
}

View File

@@ -45,7 +45,7 @@ DDF_Data::DDF_Data(const Handle(TDF_Data)& aDF) : myDF (aDF) {}
void DDF_Data::DrawOn(Draw_Display& /*dis*/) const
{ std::cout<<"DDF_Data"<<std::endl; }
{ std::cout<<"DDF_Data"<<'\n'; }

View File

@@ -2947,7 +2947,7 @@ static Standard_Integer DDataStd_SetIntPackedMap (Draw_Interpretor& di,
}
const Handle(TColStd_HPackedMapOfInteger)& aHMap = new TColStd_HPackedMapOfInteger(aMap);
anAtt->ChangeMap(aHMap);
std::cout << "Map extent = " << anAtt->Extent()<<std::endl;
std::cout << "Map extent = " << anAtt->Extent()<<'\n';
return 0;
}
di << "DDataStd_SetIntPackedMap : Error\n";
@@ -3145,7 +3145,7 @@ static Standard_Integer DDataStd_SetIntPHugeMap (Draw_Interpretor& di,
}
const Handle(TColStd_HPackedMapOfInteger)& aHMap = new TColStd_HPackedMapOfInteger(aMap);
anAtt->ChangeMap(aHMap);
std::cout << "Map extent = " << anAtt->Extent()<<std::endl;
std::cout << "Map extent = " << anAtt->Extent()<<'\n';
return 0;
}
di << "DDataStd_SetIntPHugeMap : Error\n";
@@ -3261,7 +3261,7 @@ static Standard_Integer DDataStd_SetAsciiString (Draw_Interpretor& di,
return 1;
}
std::cout << "String = " << anAtt->Get().ToCString() << " is kept in DF" << std::endl;
std::cout << "String = " << anAtt->Get().ToCString() << " is kept in DF" << '\n';
return 0;
}
di << "DDataStd_SetAsciiString : Error\n";
@@ -3375,8 +3375,8 @@ static Standard_Integer DDataStd_GetNDIntegers (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
const TColStd_DataMapOfStringInteger& aMap = anAtt->GetIntegersContainer();
TColStd_DataMapIteratorOfDataMapOfStringInteger itr(aMap);
@@ -3414,15 +3414,15 @@ static Standard_Integer DDataStd_GetNDInteger (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if(!anAtt->HasInteger(aKey)) {
std::cout << "There is no data specified by Key = "<< arg[3] << std::endl;
std::cout << "There is no data specified by Key = "<< arg[3] << '\n';
return 1;
} else {
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetInteger(aKey)<<std::endl;
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetInteger(aKey)<<'\n';
if(nb == 5)
Draw::Set(arg[4], anAtt->GetInteger(aKey));
return 0;
@@ -3486,8 +3486,8 @@ static Standard_Integer DDataStd_GetNDReals (Draw_Interpretor& di,
TDF_Label aLabel;
if(!DDF::FindLabel(DF, arg[2], aLabel)) return 1;
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
Handle(TDataStd_NamedData) anAtt;
if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt))
{
@@ -3531,15 +3531,15 @@ static Standard_Integer DDataStd_GetNDReal (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if(!anAtt->HasReal(aKey)) {
Message::SendFail() << "There is no data specified by Key = " << arg[3];
return 1;
} else {
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetReal(aKey)<<std::endl;
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetReal(aKey)<<'\n';
if(nb == 5)
Draw::Set(arg[4], anAtt->GetReal(aKey));
return 0;
@@ -3622,8 +3622,8 @@ static Standard_Integer DDataStd_GetNDStrings (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
const TDataStd_DataMapOfStringString& aMap = anAtt->GetStringsContainer();
@@ -3665,8 +3665,8 @@ static Standard_Integer DDataStd_GetNDString (Draw_Interpretor& di,
di << "NamedData attribute is not found or not set" << "\n";
return 1;}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if (!anAtt->HasString(aKey))
@@ -3677,7 +3677,7 @@ static Standard_Integer DDataStd_GetNDString (Draw_Interpretor& di,
else
{
TCollection_AsciiString aValue (anAtt->GetString(aKey));
std::cout << "Key = " << arg[3] << " Value = " << aValue.ToCString() << std::endl;
std::cout << "Key = " << arg[3] << " Value = " << aValue.ToCString() << '\n';
if(nb == 5)
Draw::Set(arg[4], aValue.ToCString());
return 0;
@@ -3749,8 +3749,8 @@ static Standard_Integer DDataStd_GetNDBytes (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
const TDataStd_DataMapOfStringByte& aMap = anAtt->GetBytesContainer();
TDataStd_DataMapIteratorOfDataMapOfStringByte itr(aMap);
@@ -3758,7 +3758,7 @@ static Standard_Integer DDataStd_GetNDBytes (Draw_Interpretor& di,
{
const TCollection_ExtendedString& aKey(itr.Key());
Standard_Byte aValue = itr.Value();
std::cout << "Key = " << aKey << " Value = " <<aValue<<std::endl;
std::cout << "Key = " << aKey << " Value = " <<aValue<<'\n';
}
return 0;
}
@@ -3788,8 +3788,8 @@ static Standard_Integer DDataStd_GetNDByte (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if (!anAtt->HasByte(aKey))
@@ -3799,7 +3799,7 @@ static Standard_Integer DDataStd_GetNDByte (Draw_Interpretor& di,
}
else
{
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetByte(aKey)<< std::endl;
std::cout << "Key = " << arg[3] << " Value = " <<anAtt->GetByte(aKey)<< '\n';
if(nb == 5)
Draw::Set(arg[4], anAtt->GetByte(aKey));
return 0;
@@ -3875,24 +3875,24 @@ static Standard_Integer DDataStd_GetNDIntArrays (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
const TDataStd_DataMapOfStringHArray1OfInteger& aMap = anAtt->GetArraysOfIntegersContainer();
TDataStd_DataMapIteratorOfDataMapOfStringHArray1OfInteger itr(aMap);
for (; itr.More(); itr.Next()){
const TCollection_ExtendedString& aKey(itr.Key());
std::cout << "Key = " << aKey<< std::endl;
std::cout << "Key = " << aKey<< '\n';
const Handle(TColStd_HArray1OfInteger)& anArrValue = itr.Value();
if(!anArrValue.IsNull()) {
Standard_Integer lower = anArrValue->Lower();
Standard_Integer upper = anArrValue->Upper();
for(Standard_Integer i = lower; i<=upper;i++) {
Standard_Integer aValue = anArrValue->Value(i);
std::cout << "\tValue("<<i<<") = " <<aValue<<std::endl;
std::cout << "\tValue("<<i<<") = " <<aValue<<'\n';
}
} else
std::cout << "\tthe specified array is Null "<<std::endl;
std::cout << "\tthe specified array is Null "<<'\n';
}
return 0;
}
@@ -3922,8 +3922,8 @@ static Standard_Integer DDataStd_GetNDIntArray (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if (!anAtt->HasArrayOfIntegers(aKey))
@@ -3933,7 +3933,7 @@ static Standard_Integer DDataStd_GetNDIntArray (Draw_Interpretor& di,
}
else
{
std::cout << "Key = " << arg[3] <<std::endl;
std::cout << "Key = " << arg[3] <<'\n';
Handle(TColStd_HArray1OfInteger) anArrValue = anAtt->GetArrayOfIntegers(aKey);
if(!anArrValue.IsNull()) {
@@ -3941,10 +3941,10 @@ static Standard_Integer DDataStd_GetNDIntArray (Draw_Interpretor& di,
Standard_Integer upper = anArrValue->Upper();
for(Standard_Integer i = lower; i<=upper;i++) {
Standard_Integer aValue = anArrValue->Value(i);
std::cout << "\tValue("<<i<<") = " <<aValue<<std::endl;
std::cout << "\tValue("<<i<<") = " <<aValue<<'\n';
}
} else
std::cout << "\tthe specified array is Null or not found"<<std::endl;
std::cout << "\tthe specified array is Null or not found"<<'\n';
return 0;
}
}
@@ -4018,24 +4018,24 @@ static Standard_Integer DDataStd_GetNDRealArrays (Draw_Interpretor& di,
return 1;
}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
const TDataStd_DataMapOfStringHArray1OfReal& aMap = anAtt->GetArraysOfRealsContainer();
TDataStd_DataMapIteratorOfDataMapOfStringHArray1OfReal itr(aMap);
for (; itr.More(); itr.Next()){
const TCollection_ExtendedString& aKey(itr.Key());
std::cout << "Key = " << aKey << std::endl;
std::cout << "Key = " << aKey << '\n';
const Handle(TColStd_HArray1OfReal)& anArrValue = itr.Value();
if(!anArrValue.IsNull()) {
Standard_Integer lower = anArrValue->Lower();
Standard_Integer upper = anArrValue->Upper();
for(Standard_Integer i = lower; i<=upper;i++) {
Standard_Real aValue = anArrValue->Value(i);
std::cout << "\tValue("<<i<<") = " <<aValue<<std::endl;
std::cout << "\tValue("<<i<<") = " <<aValue<<'\n';
}
} else
std::cout << "\tthe specified array is Null "<<std::endl;
std::cout << "\tthe specified array is Null "<<'\n';
}
return 0;
}
@@ -4063,15 +4063,15 @@ static Standard_Integer DDataStd_GetNDRealArray (Draw_Interpretor& di,
di << "NamedData attribute is not found or not set" << "\n";
return 1;}
std::cout <<std::endl;
std::cout <<"NamedData attribute at Label = " << arg[2] <<std::endl;
std::cout <<'\n';
std::cout <<"NamedData attribute at Label = " << arg[2] <<'\n';
anAtt->LoadDeferredData();
TCollection_ExtendedString aKey(arg[3], Standard_True);
if(!anAtt->HasArrayOfReals(aKey)) {
std::cout << "There is no data specified by Key = "<< arg[3] << std::endl;
std::cout << "There is no data specified by Key = "<< arg[3] << '\n';
return 1;
} else {
std::cout << "Key = " << arg[3] <<std::endl;
std::cout << "Key = " << arg[3] <<'\n';
Handle(TColStd_HArray1OfReal) anArrValue = anAtt->GetArrayOfReals(aKey);
if(!anArrValue.IsNull()) {
@@ -4079,10 +4079,10 @@ static Standard_Integer DDataStd_GetNDRealArray (Draw_Interpretor& di,
Standard_Integer upper = anArrValue->Upper();
for(Standard_Integer i = lower; i<=upper;i++) {
Standard_Real aValue = anArrValue->Value(i);
std::cout << "\tValue("<<i<<") = " <<aValue<<std::endl;
std::cout << "\tValue("<<i<<") = " <<aValue<<'\n';
}
} else
std::cout << "\tthe specified array is Null or not found"<<std::endl;
std::cout << "\tthe specified array is Null or not found"<<'\n';
return 0;
}
}

View File

@@ -353,7 +353,7 @@ void DDataStd_DrawPresentation::DrawBuild ()
DDataStd_DrawDriver::Set(DD);
}
Handle(Draw_Drawable3D) D3D = DD->Drawable(Label());
if (D3D.IsNull()) std::cout<< "DDataStd_DrawPresentation::DrawBuild : null drawable" << std::endl;
if (D3D.IsNull()) std::cout<< "DDataStd_DrawPresentation::DrawBuild : null drawable" << '\n';
myDrawable = D3D;
}
@@ -380,7 +380,7 @@ void DDataStd_DrawPresentation::DrawDisplay (const TDF_Label& L,
return;
}
}
std::cout<< "DDataStd_DrawPresentation::DrawDisplay : null Label" << std::endl;
std::cout<< "DDataStd_DrawPresentation::DrawDisplay : null Label" << '\n';
}
//=======================================================================
@@ -401,7 +401,7 @@ void DDataStd_DrawPresentation::DrawErase (const TDF_Label& L,
return;
}
}
std::cout<< "DDataStd_DrawPresentation::DrawErase : null Label" << std::endl;
std::cout<< "DDataStd_DrawPresentation::DrawErase : null Label" << '\n';
}

View File

@@ -59,7 +59,7 @@ DDataStd_TreeBrowser::DDataStd_TreeBrowser(const TDF_Label& aLabel)
//=======================================================================
void DDataStd_TreeBrowser::DrawOn(Draw_Display& /*dis*/) const
{ std::cout<<"DDataStd_TreeBrowser"<<std::endl; }
{ std::cout<<"DDataStd_TreeBrowser"<<'\n'; }
//=======================================================================
@@ -78,7 +78,7 @@ Handle(Draw_Drawable3D) DDataStd_TreeBrowser::Copy() const
void DDataStd_TreeBrowser::Dump(Standard_OStream& S) const
{
S<<"DDataStd_TreeBrowser on a label: "<<std::endl;
S<<"DDataStd_TreeBrowser on a label: "<<'\n';
S<<myRoot;
}

View File

@@ -68,7 +68,7 @@ Standard_Boolean DDocStd::GetDocument (Standard_CString& Name,
{
Handle(DDocStd_DrawDocument) DD = Handle(DDocStd_DrawDocument)::DownCast (Draw::GetExisting (Name));
if (DD.IsNull()) {
if (Complain) std::cout << Name << " is not a Document" << std::endl;
if (Complain) std::cout << Name << " is not a Document" << '\n';
return Standard_False;
}
Handle(TDocStd_Document) STDDOC = DD->GetDocument();
@@ -76,7 +76,7 @@ Standard_Boolean DDocStd::GetDocument (Standard_CString& Name,
DOC = STDDOC;
return Standard_True;
}
if (Complain) std::cout << Name << " is not a CAF Document" << std::endl;
if (Complain) std::cout << Name << " is not a CAF Document" << '\n';
return Standard_False;
}
@@ -93,7 +93,7 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D,
{
Label.Nullify();
TDF_Tool::Label(D->GetData(),Entry,Label,Standard_False);
if (Label.IsNull() && Complain) std::cout<<"No label for entry "<<Entry<<std::endl;
if (Label.IsNull() && Complain) std::cout<<"No label for entry "<<Entry<<'\n';
return !Label.IsNull();
}
@@ -111,7 +111,7 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D,
TDF_Label L;
if (Find(D,Entry,L,Complain)) {
if (L.FindAttribute(ID,A)) return Standard_True;
if (Complain) std::cout <<"attribute not found for entry : "<< Entry <<std::endl;
if (Complain) std::cout <<"attribute not found for entry : "<< Entry <<'\n';
}
return Standard_False;
}

View File

@@ -88,7 +88,7 @@ void DDocStd_DrawDocument::Dump (Standard_OStream& S) const
DDF_Data::Dump(S);
}
else {
S << myDocument->DynamicType()->Name() << " is not a CAF document" << std::endl;
S << myDocument->DynamicType()->Name() << " is not a CAF document" << '\n';
}
}

View File

@@ -187,7 +187,7 @@ static Handle(TFunction_Driver) GetDriver(const TCollection_AsciiString& name)
else if(name == "Section")
aDrv = new DNaming_BooleanOperationDriver();
else
std::cout << "the specified driver is not supported" <<std::endl;
std::cout << "the specified driver is not supported" <<'\n';
return aDrv;
}
//=======================================================================
@@ -504,7 +504,7 @@ static Standard_Integer DNaming_SolveFlatFrom (Draw_Interpretor& /*theDI*/,
Handle(TFunction_Function) aFun;
funLabel.FindAttribute(TFunction_Function::GetID(), aFun);
if(aFun.IsNull()) {
std::cout << "DNaming_SolveFlatFrom:: Null function is found!" << std::endl;
std::cout << "DNaming_SolveFlatFrom:: Null function is found!" << '\n';
continue;
}
else {
@@ -521,7 +521,7 @@ static Standard_Integer DNaming_SolveFlatFrom (Draw_Interpretor& /*theDI*/,
std::cout <<"DNaming_SolveFlatFrom : function from label " << entry << " is recomputed" << std::endl;
#endif
} catch (EXCEPTION) {
std::cout <<"DNaming_SolveFlatFrom : Exception computing function at label " << entry << std::endl;
std::cout <<"DNaming_SolveFlatFrom : Exception computing function at label " << entry << '\n';
}
}
}
@@ -576,15 +576,15 @@ static Standard_Integer DNaming_CheckLogBook (Draw_Interpretor& /*theDI*/,
if (!DDocStd::GetDocument(aDocS, aDoc)) return 1;
Handle(TFunction_Logbook) logbook = TFunction_Logbook::Set(aDoc->Main());
if(logbook->IsEmpty())
std::cout << "DNaming_CheckLogBook : is empty" <<std::endl;
std::cout << "DNaming_CheckLogBook : is empty" <<'\n';
else {
const TDF_LabelMap& aMap = logbook->GetValid();
TDF_MapIteratorOfLabelMap it(aMap);
TCollection_AsciiString entry;
std::cout << "DNaming_CheckLogBook : LogBook current state:" <<std::endl;
std::cout << "DNaming_CheckLogBook : LogBook current state:" <<'\n';
for (;it.More();it.Next()) {
TDF_Tool::Entry(it.Key(), entry);
std::cout << entry <<std::endl;
std::cout << entry <<'\n';
}
}
return 0;
@@ -688,7 +688,7 @@ static Standard_Integer DNaming_AttachShape (Draw_Interpretor& di,
return 1;
}
catch (Standard_Failure const&) {
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<std::endl;
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<'\n';
}
if(!aCont.IsNull()) {
@@ -756,7 +756,7 @@ static Standard_Integer DNaming_XAttachShape (Draw_Interpretor& di,
Handle(TNaming_NamedShape) aCont = DNaming::GetObjectValue(aContext);
if(aCont.IsNull() || aCont->IsEmpty())
std::cout <<"Wrong Context ..." <<std::endl;
std::cout <<"Wrong Context ..." <<'\n';
else {
TopoDS_Shape aCONTEXT = aCont->Get();
try{
@@ -765,7 +765,7 @@ static Standard_Integer DNaming_XAttachShape (Draw_Interpretor& di,
return 1;
}
catch (Standard_Failure const&) {
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<std::endl;
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<'\n';
}
TDF_Reference::Set(aFun->Label().FindChild(FUNCTION_ARGUMENTS_LABEL).FindChild(ATTACH_ARG),
@@ -1546,7 +1546,7 @@ static Standard_Integer DNaming_PntOffset (Draw_Interpretor& theDI,
if(isDX || isDY || isDZ)
DDF::ReturnLabel(theDI, objLabel);
else
std::cout <<"DNaming_PntOffset : Nothing changed" << std::endl;
std::cout <<"DNaming_PntOffset : Nothing changed" << '\n';
return 0;
}
}
@@ -1691,7 +1691,7 @@ static Standard_Boolean MakeSelection (const Handle(TDataStd_UAttribute)& Obj,
if(!aSelector.Select(Selection, aContext, Geometry, KeepOrientation))
return Standard_False;
}catch (...) {
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<std::endl;
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<'\n';
}
if(!aNS.IsNull()) {
@@ -1749,7 +1749,7 @@ static Standard_Boolean MakeXSelection (const Handle(TDataStd_UAttribute)& Obj,
if(!aSelector.Select(Selection, aContext, Geometry, KeepOrientation))
return Standard_False;
}catch (...) {
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<std::endl;
std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <<'\n';
}
if(!aNS.IsNull()) {
@@ -1923,7 +1923,7 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI,
}
catch (Standard_Failure const& anException) {
std::cout << "%%%INFO:Error: ::TestSingleSelection failed :";
std::cout << anException.GetMessageString() << std::endl;
std::cout << anException.GetMessageString() << '\n';
}
catch(...) {
std::cout << "%%%INFO:Error: ::TestSingleSelection selection failed : unknown exception type";
@@ -1960,9 +1960,9 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI,
}
if(aResult.Length()) {
if(aResult.Search("Warning") == -1)
std::cout << "Failed units: " << aResult << " at " << entry << std::endl;
std::cout << "Failed units: " << aResult << " at " << entry << '\n';
else
std::cout << aResult << " at " << entry << std::endl;
std::cout << aResult << " at " << entry << '\n';
TDataStd_Name::Set(auxObj->Label(), aResult);
}
}
@@ -1976,7 +1976,7 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI,
B.Generated(it1.Value());
TCollection_AsciiString entry;
TDF_Tool::Entry(aLabel, entry);
std::cout << "\t" <<entry <<std::endl;
std::cout << "\t" <<entry <<'\n';
}
}
if(!FirstAuxObj.IsNull())
@@ -2057,7 +2057,7 @@ static Standard_Integer DNaming_Multiple (Draw_Interpretor& theDI,
}
catch (Standard_Failure const& anException) {
std::cout << "%%%INFO:Error: ::TestSingleSelection failed :";
std::cout << anException.GetMessageString() << std::endl;
std::cout << anException.GetMessageString() << '\n';
}
catch(...) {
std::cout << "%%%INFO:Error: ::TestSingleSelection selection failed : unknown exception type";
@@ -2093,7 +2093,7 @@ static Standard_Integer DNaming_Multiple (Draw_Interpretor& theDI,
aFailedList.Append(aCurShape);
}
if(aResult.Length())
std::cout << "Failed units: " << aResult << std::endl;
std::cout << "Failed units: " << aResult << '\n';
}
if(aFailedList.Extent()) {

View File

@@ -184,7 +184,7 @@ static Standard_Integer DNaming_SolveSelection (Draw_Interpretor& di, Standard_I
Handle(TNaming_Naming) naming;
if (!L.FindAttribute(TNaming_Naming::GetID(),naming)) {
std::cout <<"DNaming__SolveSelection : not a selection" << std::endl;
std::cout <<"DNaming__SolveSelection : not a selection" << '\n';
return 1;
}
TDF_LabelMap aValidMap;

View File

@@ -124,15 +124,15 @@ Standard_Integer DNaming_SelectionDriver::Execute(Handle(TFunction_Logbook)& the
theLog->SetValid(aRLabel);
Handle(TNaming_NamedShape) aNS;
if(!aRLabel.FindAttribute(TNaming_NamedShape::GetID(),aNS)) {
std::cout <<"%%%WARNING: DNaming_SelectionDriver::NamedShape is not found"<<std::endl;
std::cout <<"%%%WARNING: DNaming_SelectionDriver::NamedShape is not found"<<'\n';
}
else {
if(aNS.IsNull()) {
std::cout << "%%%WARNING: DNaming_SelectionDriver::NamedShape is NULL" <<std::endl;
std::cout << "%%%WARNING: DNaming_SelectionDriver::NamedShape is NULL" <<'\n';
} else
if(aNS->IsEmpty()) {
std::cout << "%%%WARNING: DNaming_SelectionDriver::NamedShape is EMPTY on Label = ";
aNS->Label().EntryDump(std::cout); std::cout << std::endl;
aNS->Label().EntryDump(std::cout); std::cout << '\n';
} else {
#ifdef OCCT_DEBUG
@@ -159,7 +159,7 @@ Standard_Integer DNaming_SelectionDriver::Execute(Handle(TFunction_Logbook)& the
}
else {
aFunction->SetFailure(NOTDONE);
std::cout << "%%%WARNING: DNaming_SelectionDriver::Execute: Selection is Not solved !!!" << std::endl;
std::cout << "%%%WARNING: DNaming_SelectionDriver::Execute: Selection is Not solved !!!" << '\n';
return 1;
}
return 0;

View File

@@ -385,7 +385,7 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
#endif
else
{
std::cout << "DRAW is running in batch mode" << std::endl;
std::cout << "DRAW is running in batch mode" << '\n';
theCommands.Init();
Tcl_Init(theCommands.Interp());
}
@@ -397,7 +397,7 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
{
if (!dout.DefineColor (i, ColorNames[i]))
{
std::cout <<"Could not allocate default color " << ColorNames[i] << std::endl;
std::cout <<"Could not allocate default color " << ColorNames[i] << '\n';
}
}
}
@@ -479,8 +479,8 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
#ifdef _WIN32
ReadInitFile ("ddefault");
#else
std::cout << " the CASROOT variable is mandatory to Run OpenCascade "<< std::endl;
std::cout << "No default file" << std::endl;
std::cout << " the CASROOT variable is mandatory to Run OpenCascade "<< '\n';
std::cout << "No default file" << '\n';
#endif
}
}
@@ -621,7 +621,7 @@ Standard_Boolean Draw_Interprete(const char* com)
{
Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Red, true);
}
std::cout << theCommands.Result() << std::endl;
std::cout << theCommands.Result() << '\n';
if (c > 0 && theCommands.ToColorize())
{
Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Default, false);
@@ -656,7 +656,7 @@ Standard_Integer Tcl_AppInit (Tcl_Interp *)
Standard_Integer Draw_Call (char *c)
{
Standard_Integer r = theCommands.Eval(c);
std::cout << theCommands.Result() << std::endl;
std::cout << theCommands.Result() << '\n';
return r;
}
@@ -679,7 +679,7 @@ void Draw::Load (Draw_Interpretor& theDI,
if (!aPluginResource->Find (theKey, aPluginLibrary))
{
Message::SendFail() << "could not find the resource:" << theKey;
Standard_SStream aMsg; aMsg << "Could not find the resource:" << theKey << std::endl;
Standard_SStream aMsg; aMsg << "Could not find the resource:" << theKey << '\n';
throw Draw_Failure (aMsg.str().c_str());
}

View File

@@ -574,7 +574,7 @@ static unsigned int __stdcall CpuFunc (void * /*param*/)
#else
static void cpulimitSignalHandler (int)
{
std::cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << std::endl;
std::cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << '\n';
exit(2);
}
static void *CpuFunc(void* /*threadarg*/)
@@ -585,7 +585,7 @@ static void *CpuFunc(void* /*threadarg*/)
sleep (5);
anElapCurrent = clock_t(aTimer.ElapsedTime());
if (CPU_LIMIT >0 && (anElapCurrent) >= CPU_LIMIT) {
std::cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << std::endl;
std::cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << '\n';
exit(2);
}
}
@@ -827,7 +827,7 @@ static int dlocale (Draw_Interpretor& di, Standard_Integer n, const char** argv)
if (result)
di << result;
else
std::cout << "Error: unsupported locale specification: " << locale << std::endl;
std::cout << "Error: unsupported locale specification: " << locale << '\n';
return 0;
}
@@ -1271,7 +1271,7 @@ static int dputs (Draw_Interpretor& theDI,
*aStream << theArgVec[anArgIter];
if (!isNoNewline)
{
*aStream << std::endl;
*aStream << '\n';
}
if (toIntense || aColor != Message_ConsoleColor_Default)

View File

@@ -32,7 +32,7 @@ Standard_EXPORT const char* Draw_Eval (const char *theCommandStr)
OCC_CATCH_SIGNALS
Draw_Interpretor& aCommands = Draw::GetInterpretor();
aCommands.Eval (theCommandStr);
std::cout << aCommands.Result() << std::endl;
std::cout << aCommands.Result() << '\n';
return aCommands.Result();
}
catch (Standard_Failure const& anException)

View File

@@ -64,11 +64,11 @@ static Standard_Integer ViewId(const Standard_CString a)
{
Standard_Integer id = Draw::Atoi(a);
if ((id < 0) || (id >= MAXVIEW)) {
std::cout << "Incorrect view-id, must be in 0.."<<MAXVIEW-1<<std::endl;
std::cout << "Incorrect view-id, must be in 0.."<<MAXVIEW-1<<'\n';
return -1;
}
if (!dout.HasView(id)) {
std::cout <<"View "<<id<<" does not exist."<<std::endl;
std::cout <<"View "<<id<<" does not exist."<<'\n';
return -1;
}
return id;

View File

@@ -57,7 +57,7 @@ namespace {
{
for (int i=0; i < argc; i++)
os << argv[i] << " ";
os << std::endl;
os << '\n';
}
void flush_standard_streams ()
@@ -216,7 +216,7 @@ static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp
const char* aResultStr = Tcl_GetStringResult (interp);
if (aResultStr != 0 && aResultStr[0] != '\0' )
{
std::cout << aResultStr << std::endl;
std::cout << aResultStr << '\n';
}
}

View File

@@ -114,7 +114,7 @@ static Standard_Integer PrintMessenger (Draw_Interpretor& theDI, Standard_Intege
Standard_SStream aSStream;
aMessenger->DumpJson (aSStream);
theDI << aSStream;
std::cout << aSStream.str() << std::endl;
std::cout << aSStream.str() << '\n';
return 0;
}

View File

@@ -230,7 +230,7 @@ static Standard_Integer erase(Draw_Interpretor& di, Standard_Integer n, const ch
Handle(Draw_Drawable3D) D = Draw::Get(a[i]);
if (D.IsNull()) {
if ((a[i][0] == '.') && (a[i][1] == '\0'))
std::cout << "Missed !!!" << std::endl;
std::cout << "Missed !!!" << '\n';
return 0;
}
}
@@ -714,7 +714,7 @@ void Draw::Set(const Standard_CString name,
Handle(Draw_Drawable3D) anOldD(reinterpret_cast<Draw_Drawable3D*>(aCD));
if (!anOldD.IsNull()) {
if (Draw::Drawables().Contains(anOldD) && anOldD->Protected()) {
std::cout << "variable is protected" << std::endl;
std::cout << "variable is protected" << '\n';
return;
}
anOldD.Nullify();
@@ -776,7 +776,7 @@ Handle(Draw_Drawable3D) Draw::getDrawable (Standard_CString& theName,
return Handle(Draw_Drawable3D)();
}
std::cout << "Pick an object" << std::endl;
std::cout << "Pick an object" << '\n';
Handle(Draw_Drawable3D) aDrawable;
dout.Select (p_id, p_X, p_Y, p_b);
dout.Pick (p_id, p_X, p_Y, 5, aDrawable, 0);
@@ -889,7 +889,7 @@ static Standard_Real ParseValue (char*& theName)
x = Parse (theName);
if (*theName != ')')
{
std::cout << "Mismatched parenthesis" << std::endl;
std::cout << "Mismatched parenthesis" << '\n';
}
++theName;
break;
@@ -949,7 +949,7 @@ static Standard_Real ParseValue (char*& theName)
}
if (pc > 0)
{
std::cout << "Unclosed parenthesis"<< std::endl;
std::cout << "Unclosed parenthesis"<< '\n';
x = 0;
}
else
@@ -989,7 +989,7 @@ static Standard_Real ParseValue (char*& theName)
}
if (aCommands.Eval (theName) != 0)
{
std::cout << "Call of function " << theName << " failed" << std::endl;
std::cout << "Call of function " << theName << " failed" << '\n';
x = 0;
}
else

View File

@@ -1325,7 +1325,7 @@ Standard_Boolean Init_Appli()
}
catch (Standard_Failure const& theFail)
{
std::cout << "Cannot open display (" << theFail << "). Interpret commands in batch mode." << std::endl;
std::cout << "Cannot open display (" << theFail << "). Interpret commands in batch mode." << '\n';
return Standard_False;
}
}

View File

@@ -127,9 +127,9 @@ void DrawTrSurf_Point::Dump (Standard_OStream& S) const
std::streamsize prec = S.precision(15);
#endif
if (is3D)
S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<std::endl;
S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<'\n';
else
S << "Point 2d : " << myPoint.X() << ", " << myPoint.Y() <<std::endl;
S << "Point 2d : " << myPoint.X() << ", " << myPoint.Y() <<'\n';
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
S.setf(F);
#else

View File

@@ -2017,7 +2017,7 @@ void yyFlexLexer::yyensure_buffer_stack(void)
void yyFlexLexer::LexerError( const char* msg )
{
std::cerr << msg << std::endl;
std::cerr << msg << '\n';
exit( YY_EXIT_FAILURE );
}

View File

@@ -254,32 +254,32 @@ Standard_Boolean FEmTool_ProfileMatrix::IsInProfile(const Standard_Integer i,
void FEmTool_ProfileMatrix::OutM() const
{
Standard_Integer i, j;
std::cout<<"Matrix A"<<std::endl;
std::cout<<"Matrix A"<<'\n';
for(i = 1; i <= RowNumber(); i++) {
for(j = 1; j < i - profile(1, i); j++)
std::cout<<"0 ";
for(j = profile(2, i) - profile(1, i); j <= profile(2, i); j++)
std::cout<<ProfileMatrix->Value(j)<<" ";
std::cout<<std::endl;
std::cout<<'\n';
}
std::cout<<"NextCoeff"<<std::endl;
std::cout<<"NextCoeff"<<'\n';
for(i = 1; i <= profile(2, RowNumber()); i++)
std::cout<<NextCoeff->Value(i)<<" ";
std::cout<<std::endl;
std::cout<<'\n';
}
void FEmTool_ProfileMatrix::OutS() const
{
Standard_Integer i, j;
std::cout<<"Matrix S"<<std::endl;
std::cout<<"Matrix S"<<'\n';
for(i = 1; i <= RowNumber(); i++) {
for(j = 1; j < i - profile(1, i); j++)
std::cout<<"0 ";
for(j = profile(2, i) - profile(1, i); j <= profile(2, i); j++)
std::cout<<SMatrix->Value(j)<<" ";
std::cout<<std::endl;
std::cout<<'\n';
}
}

View File

@@ -530,31 +530,31 @@ void FairCurve_Batten::Dump(Standard_OStream& o) const
// ==================================================================
{
o << " Batten |"; o.width(7); o<< "Old | New" << std::endl;
o << " P1 X |"; o.width(7); o<< OldP1.X() << " | " << NewP1.X() << std::endl;
o << " Y |"; o.width(7); o<< OldP1.Y() << " | " << NewP1.Y() << std::endl;
o << " P2 X |"; o.width(7); o<< OldP2.X() << " | " << NewP2.X() << std::endl;
o << " Y |"; o.width(7); o<< OldP2.Y() << " | " << NewP2.Y() << std::endl;
o << " Angle1 |"; o.width(7); o<< OldAngle1 << " | " << NewAngle1 << std::endl;
o << " Angle2 |"; o.width(7); o<< OldAngle2 << " | " << NewAngle2 << std::endl;
o << " Height |"; o.width(7); o<< OldHeight << " | " << NewHeight << std::endl;
o << " Slope |"; o.width(7); o<< OldSlope << " | " << NewSlope << std::endl;
o << " SlidingFactor |"; o.width(7); o<< OldSlidingFactor << " | " << NewSlidingFactor << std::endl;
o << " FreeSliding |"; o.width(7); o<< OldFreeSliding << " | " << NewFreeSliding << std::endl;
o << " ConstrOrder1 |"; o.width(7); o<< OldConstraintOrder1 << " | " << NewConstraintOrder1 << std::endl;
o << " ConstrOrder2 |" ; o.width(7); o<< OldConstraintOrder2 << " | " << NewConstraintOrder2 << std::endl;
o << " Batten |"; o.width(7); o<< "Old | New" << '\n';
o << " P1 X |"; o.width(7); o<< OldP1.X() << " | " << NewP1.X() << '\n';
o << " Y |"; o.width(7); o<< OldP1.Y() << " | " << NewP1.Y() << '\n';
o << " P2 X |"; o.width(7); o<< OldP2.X() << " | " << NewP2.X() << '\n';
o << " Y |"; o.width(7); o<< OldP2.Y() << " | " << NewP2.Y() << '\n';
o << " Angle1 |"; o.width(7); o<< OldAngle1 << " | " << NewAngle1 << '\n';
o << " Angle2 |"; o.width(7); o<< OldAngle2 << " | " << NewAngle2 << '\n';
o << " Height |"; o.width(7); o<< OldHeight << " | " << NewHeight << '\n';
o << " Slope |"; o.width(7); o<< OldSlope << " | " << NewSlope << '\n';
o << " SlidingFactor |"; o.width(7); o<< OldSlidingFactor << " | " << NewSlidingFactor << '\n';
o << " FreeSliding |"; o.width(7); o<< OldFreeSliding << " | " << NewFreeSliding << '\n';
o << " ConstrOrder1 |"; o.width(7); o<< OldConstraintOrder1 << " | " << NewConstraintOrder1 << '\n';
o << " ConstrOrder2 |" ; o.width(7); o<< OldConstraintOrder2 << " | " << NewConstraintOrder2 << '\n';
switch (myCode) {
case FairCurve_OK :
o << "AnalysisCode : Ok" << std::endl;
o << "AnalysisCode : Ok" << '\n';
break;
case FairCurve_NotConverged :
o << "AnalysisCode : NotConverged" << std::endl;
o << "AnalysisCode : NotConverged" << '\n';
break;
case FairCurve_InfiniteSliding :
o << "AnalysisCode : InfiniteSliding" << std::endl;
o << "AnalysisCode : InfiniteSliding" << '\n';
break;
case FairCurve_NullHeight :
o << "AnalysisCode : NullHeight" << std::endl;
o << "AnalysisCode : NullHeight" << '\n';
break;
}
}

View File

@@ -430,34 +430,34 @@ void FairCurve_MinimalVariation::Dump(Standard_OStream& o) const
//======================================================================================
{
o << " MVCurve |"; o.width(7); o<< "Old | New" << std::endl;
o << " P1 X |"; o.width(7); o<< OldP1.X() << " | " << NewP1.X() << std::endl;
o << " Y |"; o.width(7); o<< OldP1.Y() << " | " << NewP1.Y() << std::endl;
o << " P2 X |"; o.width(7); o<< OldP2.X() << " | " << NewP2.X() << std::endl;
o << " Y |"; o.width(7); o<< OldP2.Y() << " | " << NewP2.Y() << std::endl;
o << " Angle1 |"; o.width(7); o<< OldAngle1 << " | " << NewAngle1 << std::endl;
o << " Angle2 |"; o.width(7); o<< OldAngle2 << " | " << NewAngle2 << std::endl;
o << " Curvature1 |"; o.width(7); o<< OldCurvature1 << " | " << NewCurvature1 << std::endl;
o << " Curvature2 |"; o.width(7); o<< OldCurvature2 << " | " << NewCurvature2 << std::endl;
o << " Height |"; o.width(7); o<< OldHeight << " | " << NewHeight << std::endl;
o << " Slope |"; o.width(7); o<< OldSlope << " | " << NewSlope << std::endl;
o << " PhysicalRatio |"; o.width(7); o<< OldPhysicalRatio << " | " << NewPhysicalRatio << std::endl;
o << " SlidingFactor |"; o.width(7); o<< OldSlidingFactor << " | " << NewSlidingFactor << std::endl;
o << " FreeSliding |"; o.width(7); o<< OldFreeSliding << " | " << NewFreeSliding << std::endl;
o << " ConstrOrder1 |"; o.width(7); o<< OldConstraintOrder1 << " | " << NewConstraintOrder1 << std::endl;
o << " ConstrOrder2 |"; o.width(7); o<< OldConstraintOrder2 << " | " << NewConstraintOrder2 << std::endl;
o << " MVCurve |"; o.width(7); o<< "Old | New" << '\n';
o << " P1 X |"; o.width(7); o<< OldP1.X() << " | " << NewP1.X() << '\n';
o << " Y |"; o.width(7); o<< OldP1.Y() << " | " << NewP1.Y() << '\n';
o << " P2 X |"; o.width(7); o<< OldP2.X() << " | " << NewP2.X() << '\n';
o << " Y |"; o.width(7); o<< OldP2.Y() << " | " << NewP2.Y() << '\n';
o << " Angle1 |"; o.width(7); o<< OldAngle1 << " | " << NewAngle1 << '\n';
o << " Angle2 |"; o.width(7); o<< OldAngle2 << " | " << NewAngle2 << '\n';
o << " Curvature1 |"; o.width(7); o<< OldCurvature1 << " | " << NewCurvature1 << '\n';
o << " Curvature2 |"; o.width(7); o<< OldCurvature2 << " | " << NewCurvature2 << '\n';
o << " Height |"; o.width(7); o<< OldHeight << " | " << NewHeight << '\n';
o << " Slope |"; o.width(7); o<< OldSlope << " | " << NewSlope << '\n';
o << " PhysicalRatio |"; o.width(7); o<< OldPhysicalRatio << " | " << NewPhysicalRatio << '\n';
o << " SlidingFactor |"; o.width(7); o<< OldSlidingFactor << " | " << NewSlidingFactor << '\n';
o << " FreeSliding |"; o.width(7); o<< OldFreeSliding << " | " << NewFreeSliding << '\n';
o << " ConstrOrder1 |"; o.width(7); o<< OldConstraintOrder1 << " | " << NewConstraintOrder1 << '\n';
o << " ConstrOrder2 |"; o.width(7); o<< OldConstraintOrder2 << " | " << NewConstraintOrder2 << '\n';
switch (myCode) {
case FairCurve_OK :
o << "AnalysisCode : Ok" << std::endl;
o << "AnalysisCode : Ok" << '\n';
break;
case FairCurve_NotConverged :
o << "AnalysisCode : NotConverged" << std::endl;
o << "AnalysisCode : NotConverged" << '\n';
break;
case FairCurve_InfiniteSliding :
o << "AnalysisCode : InfiniteSliding" << std::endl;
o << "AnalysisCode : InfiniteSliding" << '\n';
break;
case FairCurve_NullHeight :
o << "AnalysisCode : NullHeight" << std::endl;
o << "AnalysisCode : NullHeight" << '\n';
break;
}
}

View File

@@ -186,7 +186,7 @@ void Geom2dConvert_ApproxCurve::Approximate(const Handle(Adaptor2d_Curve2d)& the
void Geom2dConvert_ApproxCurve::Dump(Standard_OStream& o) const
{
o << "******* Dump of ApproxCurve *******" << std::endl;
o << "******* Error " << MaxError() << std::endl;
o << "******* Dump of ApproxCurve *******" << '\n';
o << "******* Error " << MaxError() << '\n';
}

View File

@@ -1593,74 +1593,74 @@ const HatchGen_Domain& Geom2dHatch_Hatcher::Domain (const Standard_Integer IndH,
void Geom2dHatch_Hatcher::Dump () const
{
std::cout << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << "=== Dump of the hatcher ================================" << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << std::endl ;
std::cout << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << "=== Dump of the hatcher ================================" << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << '\n' ;
std::cout << "The points are "
<< (myKeepPoints ? " " : "not ")
<< "considered."
<< std::endl ;
<< '\n' ;
std::cout << "The segments are "
<< (myKeepSegments ? " " : "not ")
<< "considered."
<< std::endl ;
std::cout << "2D Confusion tolerance : " << myConfusion2d << std::endl ;
std::cout << "3D Confusion tolerance : " << myConfusion3d << std::endl ;
<< '\n' ;
std::cout << "2D Confusion tolerance : " << myConfusion2d << '\n' ;
std::cout << "3D Confusion tolerance : " << myConfusion3d << '\n' ;
std::cout << myNbHatchings
<< " hatching"
<< ((myNbHatchings == 1) ? "" : "s")
<< std::endl ;
<< '\n' ;
std::cout << myNbElements
<< " element"
<< ((myNbElements == 1) ? "" : "s")
<< std::endl ;
<< '\n' ;
std::cout << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << "=== Hatchings ==========================================" << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << std::endl ;
std::cout << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << "=== Hatchings ==========================================" << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << '\n' ;
for (Standard_Integer IndH = 1 ; IndH <= myNbHatchings ; IndH++) {
std::cout << "Hatching # " << IndH ;
if (!myHatchings.IsBound (IndH)) {
std::cout << " is not bound" << std::endl ;
std::cout << " is not bound" << '\n' ;
} else {
const Geom2dHatch_Hatching& Hatching = myHatchings.Find (IndH) ;
Standard_Integer NbPnt = Hatching.NbPoints() ;
std::cout << " contains " << NbPnt << " restriction points :" << std::endl ;
std::cout << " contains " << NbPnt << " restriction points :" << '\n' ;
for (Standard_Integer IPnt = 1 ; IPnt <= NbPnt ; IPnt++) {
const HatchGen_PointOnHatching& PntH = Hatching.Point (IPnt) ;
PntH.Dump (IPnt) ;
}
std::cout << "----------------------------------------------" << std::endl ;
std::cout << "----------------------------------------------" << '\n' ;
}
}
std::cout << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << "=== Elements ===========================================" << std::endl ;
std::cout << "========================================================" << std::endl ;
std::cout << std::endl ;
std::cout << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << "=== Elements ===========================================" << '\n' ;
std::cout << "========================================================" << '\n' ;
std::cout << '\n' ;
for (Standard_Integer IndE = 1 ; IndE <= myNbElements ; IndE++) {
std::cout << "Element # " << IndE ;
if (!myElements.IsBound (IndE)) {
std::cout << " is not bound" << std::endl ;
std::cout << " is not bound" << '\n' ;
} else {
const Geom2dHatch_Element& Element = myElements.Find (IndE) ;
switch (Element.Orientation()) {
case TopAbs_FORWARD : std::cout << " is FORWARD" << std::endl ; break ;
case TopAbs_REVERSED : std::cout << " is REVERSED" << std::endl ; break ;
case TopAbs_INTERNAL : std::cout << " is INTERNAL" << std::endl ; break ;
case TopAbs_EXTERNAL : std::cout << " is EXTERNAL" << std::endl ; break ;
case TopAbs_FORWARD : std::cout << " is FORWARD" << '\n' ; break ;
case TopAbs_REVERSED : std::cout << " is REVERSED" << '\n' ; break ;
case TopAbs_INTERNAL : std::cout << " is INTERNAL" << '\n' ; break ;
case TopAbs_EXTERNAL : std::cout << " is EXTERNAL" << '\n' ; break ;
}
}
}
std::cout << std::endl ;
std::cout << '\n' ;
}

View File

@@ -184,7 +184,7 @@ void GeomConvert_ApproxCurve::Approximate(
void GeomConvert_ApproxCurve::Dump(Standard_OStream& o) const
{
o << "******* Dump of ApproxCurve *******" << std::endl;
o << "*******Error " << MaxError() << std::endl;
o << "******* Dump of ApproxCurve *******" << '\n';
o << "*******Error " << MaxError() << '\n';
}

View File

@@ -430,12 +430,12 @@ void GeomConvert_ApproxSurface::Approximate(const Handle(Adaptor3d_Surface)& the
void GeomConvert_ApproxSurface::Dump(Standard_OStream& o) const
{
o<<std::endl;
if (!myHasResult) { o<<"No result"<<std::endl; }
o<<'\n';
if (!myHasResult) { o<<"No result"<<'\n'; }
else {
o<<"Result max error :"<< myMaxError <<std::endl;
o<<"Result max error :"<< myMaxError <<'\n';
}
o<<std::endl;
o<<'\n';
}

View File

@@ -1335,8 +1335,8 @@ void GeomFill_ConstrainedFilling::CheckTgteField(const Standard_Integer I)
if(Abs(alpha) > maxang) maxang = Abs(alpha);
}
}
std::cout<<"KAlgo angle max sur bord "<<I<<" : "<<maxang<<std::endl;
if(caplisse) std::cout<<"sur bord "<<I<<" le champ tangent change de cote!"<<std::endl;
std::cout<<"KAlgo angle max sur bord "<<I<<" : "<<maxang<<'\n';
if(caplisse) std::cout<<"sur bord "<<I<<" le champ tangent change de cote!"<<'\n';
}
@@ -1381,11 +1381,11 @@ void GeomFill_ConstrainedFilling::CheckApprox(const Standard_Integer I)
}
if(papp.Distance(pbound) > maxdist) maxdist = papp.Distance(pbound);
}
std::cout<<"Controle approx/contrainte sur bord "<<I<<" : "<<std::endl;
std::cout<<"Distance max : "<<maxdist<<std::endl;
std::cout<<"Controle approx/contrainte sur bord "<<I<<" : "<<'\n';
std::cout<<"Distance max : "<<maxdist<<'\n';
if (donor) {
maxang = maxang*180./M_PI;
std::cout<<"Angle max : "<<maxang<<" deg"<<std::endl;
std::cout<<"Angle max : "<<maxang<<" deg"<<'\n';
}
}
@@ -1461,11 +1461,11 @@ void GeomFill_ConstrainedFilling::CheckResult(const Standard_Integer I)
vv += dvv;
ww += dww;
}
std::cout<<"Controle resultat/contrainte sur bord "<<I<<" : "<<std::endl;
std::cout<<"Distance max : "<<maxdist<<std::endl;
std::cout<<"Controle resultat/contrainte sur bord "<<I<<" : "<<'\n';
std::cout<<"Distance max : "<<maxdist<<'\n';
if (donor) {
Standard_Real angdeg = maxang*180./M_PI;
std::cout<<"Angle max : "<<angdeg<<" deg"<<std::endl;
std::cout<<"Angle max : "<<angdeg<<" deg"<<'\n';
}
#ifdef DRAW
Standard_Boolean scale = maxang>1.e-10;

View File

@@ -255,7 +255,7 @@ GeomFill_FunctionGuide::GeomFill_FunctionGuide
gp_XYZ& Q = Pc.ChangeCoord(), DQ(0, 0, 0); //Q
if (!isconst) {
std::cout << "Not implemented" << std::endl;
std::cout << "Not implemented" << '\n';
}

View File

@@ -50,22 +50,27 @@ static Standard_Boolean Controle(const TColgp_Array1OfPnt& Poles,
Standard_Real umin, umax, vmin, vmax;
S->Bounds(umin, umax, vmin, vmax);
S->D1((umin + umax) / 2, (vmin + vmax) / 2, P, DU, DV);
// On prend DX le plus proche possible de DU
gp_Dir du(DU);
Standard_Real Angle1 = du.Angle(DX);
Standard_Real Angle2 = du.Angle(DY);
if (Angle1 > M_PI / 2) Angle1 = M_PI - Angle1;
if (Angle2 > M_PI / 2) Angle2 = M_PI - Angle2;
if (Angle2 < Angle1) {
du = DY; DY = DX; DX = du;
}
if (DX.Angle(DU) > M_PI / 2) DX.Reverse();
if (DY.Angle(DV) > M_PI / 2) DY.Reverse();
if (DU.SquareMagnitude() > gp::Resolution() &&
DV.SquareMagnitude() > gp::Resolution())
{
// On prend DX le plus proche possible de DU
gp_Dir du(DU);
Standard_Real Angle1 = du.Angle(DX);
Standard_Real Angle2 = du.Angle(DY);
if (Angle1 > M_PI / 2) Angle1 = M_PI - Angle1;
if (Angle2 > M_PI / 2) Angle2 = M_PI - Angle2;
if (Angle2 < Angle1) {
du = DY; DY = DX; DX = du;
}
if (DX.Angle(DU) > M_PI / 2) DX.Reverse();
if (DY.Angle(DV) > M_PI / 2) DY.Reverse();
gp_Ax3 axe(Bary, DX^DY, DX);
Plan.SetPosition(axe);
Plan.SetLocation(Bary);
IsPlan = Standard_True;
gp_Ax3 axe(Bary, DX^DY, DX);
Plan.SetPosition(axe);
Plan.SetLocation(Bary);
IsPlan = Standard_True;
}
}
return IsPlan;
}

View File

@@ -20,10 +20,10 @@
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <StepData_Factors.hxx>
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_Axis1Placement;
class gp_Ax1;
class gp_Ax2d;
@@ -43,16 +43,16 @@ public:
Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax1& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax2d& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom_Axis1Placement)& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom2d_AxisPlacement)& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Axis1Placement)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_Axis2Placement2d;
class gp_Ax2;
class gp_Ax22d;
@@ -41,10 +40,10 @@ public:
Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax2& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax22d& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Axis2Placement2d)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
#include <StepData_StepModel.hxx>
class StepData_Factors;
class StepGeom_Axis2Placement3d;
class gp_Ax2;
class gp_Ax3;
@@ -42,19 +41,19 @@ public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors);
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax2& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax3& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Trsf& T,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const Handle(Geom_Axis2Placement)& A,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Axis2Placement3d)& Value() const;

View File

@@ -24,7 +24,6 @@
#include <GeomToStep_Root.hxx>
class Geom_BSplineCurve;
class Geom2d_BSplineCurve;
class StepData_Factors;
class StepGeom_BSplineCurveWithKnots;
@@ -41,10 +40,10 @@ public:
Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom_BSplineCurve)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom2d_BSplineCurve)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnots)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve;
class Geom_BSplineCurve;
class Geom2d_BSplineCurve;
@@ -42,10 +41,10 @@ public:
Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom_BSplineCurve)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom2d_BSplineCurve)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& Value() const;

View File

@@ -22,7 +22,6 @@
#include <Standard_Handle.hxx>
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_BSplineSurfaceWithKnots;
class Geom_BSplineSurface;
@@ -40,7 +39,7 @@ public:
Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnots(const Handle(Geom_BSplineSurface)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnots)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface;
class Geom_BSplineSurface;
@@ -41,7 +40,7 @@ public:
Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface(const Handle(Geom_BSplineSurface)& Bsplin,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_BoundedCurve;
class Geom_BoundedCurve;
class Geom2d_BoundedCurve;
@@ -42,10 +41,10 @@ public:
Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom_BoundedCurve)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom2d_BoundedCurve)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BoundedCurve)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_BoundedSurface;
class Geom_BoundedSurface;
@@ -41,7 +40,7 @@ public:
Standard_EXPORT GeomToStep_MakeBoundedSurface(const Handle(Geom_BoundedSurface)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_BoundedSurface)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_Circle;
class gp_Circ;
class Geom_Circle;
@@ -42,13 +41,13 @@ public:
Standard_EXPORT GeomToStep_MakeCircle(const gp_Circ& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom_Circle)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom2d_Circle)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Circle)& Value() const;

View File

@@ -25,7 +25,6 @@
class StepGeom_Conic;
class Geom_Conic;
class Geom2d_Conic;
class StepData_Factors;
//! This class implements the mapping between classes
@@ -40,10 +39,10 @@ public:
Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom_Conic)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom2d_Conic)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Conic)& Value() const;

View File

@@ -24,7 +24,6 @@
#include <GeomToStep_Root.hxx>
class StepGeom_ConicalSurface;
class Geom_ConicalSurface;
class StepData_Factors;
//! This class implements the mapping between class
@@ -39,7 +38,7 @@ public:
Standard_EXPORT GeomToStep_MakeConicalSurface(const Handle(Geom_ConicalSurface)& CSurf,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_ConicalSurface)& Value() const;

View File

@@ -22,7 +22,6 @@
#include <Standard_Handle.hxx>
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_Curve;
class Geom_Curve;
class Geom2d_Curve;
@@ -40,10 +39,10 @@ public:
Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom_Curve)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom2d_Curve)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Curve)& Value() const;

View File

@@ -24,7 +24,6 @@
#include <GeomToStep_Root.hxx>
class StepGeom_CylindricalSurface;
class Geom_CylindricalSurface;
class StepData_Factors;
//! This class implements the mapping between class
@@ -39,7 +38,7 @@ public:
Standard_EXPORT GeomToStep_MakeCylindricalSurface(const Handle(Geom_CylindricalSurface)& CSurf,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_CylindricalSurface)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_ElementarySurface;
class Geom_ElementarySurface;
@@ -41,7 +40,7 @@ public:
Standard_EXPORT GeomToStep_MakeElementarySurface(const Handle(Geom_ElementarySurface)& S,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_ElementarySurface)& Value() const;

View File

@@ -23,7 +23,6 @@
#include <GeomToStep_Root.hxx>
class StepData_Factors;
class StepGeom_Ellipse;
class gp_Elips;
class Geom_Ellipse;
@@ -42,13 +41,13 @@ public:
Standard_EXPORT GeomToStep_MakeEllipse(const gp_Elips& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom_Ellipse)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom2d_Ellipse)& C,
const StepData_Factors& theLocalFactors);
const StepData_Factors& theLocalFactors = StepData_Factors());
Standard_EXPORT const Handle(StepGeom_Ellipse)& Value() const;

Some files were not shown because too many files have changed in this diff Show More