ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to OCCT dev version: update version 0x07010000 -> 0x07010001

Browse Source
This commit is contained in:
rnv 2017-07-11 12:35:05 +03:00
parent bfef80c4ed
commit eb8f9b5bb9
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
View File

@ -225,7 +225,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid()
aSB.SetContext(myContext); aSB.SetContext(myContext);
aSB.SetShapes(aSFS); aSB.SetShapes(aSFS);
aSB.Perform(); aSB.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
iErr=aSB.HasErrors(); iErr=aSB.HasErrors();
#else #else
iErr=aSB.ErrorStatus(); iErr=aSB.ErrorStatus();

24
src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
View File

@ -111,7 +111,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
// //
// 1. CheckData // 1. CheckData
CheckData(); CheckData();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -121,7 +121,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
// //
// 2. Prepare // 2. Prepare
Prepare(); Prepare();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -132,7 +132,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
// 3. Fill Images // 3. Fill Images
// 3.1 Vertice // 3.1 Vertice
FillImagesVertices(); FillImagesVertices();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -141,7 +141,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
} }
// //
BuildResult(TopAbs_VERTEX); BuildResult(TopAbs_VERTEX);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -150,7 +150,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
} }
// 3.2 Edges // 3.2 Edges
FillImagesEdges(); FillImagesEdges();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -159,7 +159,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
} }
// //
BuildResult(TopAbs_EDGE); BuildResult(TopAbs_EDGE);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -169,7 +169,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
// //
// 3.3 Wires // 3.3 Wires
FillImagesContainers(TopAbs_WIRE); FillImagesContainers(TopAbs_WIRE);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -178,7 +178,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
} }
// //
BuildResult(TopAbs_WIRE); BuildResult(TopAbs_WIRE);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -188,7 +188,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
// 3.4 Faces // 3.4 Faces
FillImagesFaces(); FillImagesFaces();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -197,7 +197,7 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi
} }
// //
BuildResult(TopAbs_FACE); BuildResult(TopAbs_FACE);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) { if (HasErrors()) {
#else #else
if (myErrorStatus) { if (myErrorStatus) {
@ -251,7 +251,7 @@ void GEOMAlgo_ShellSolid::Perform()
myErrorStatus=10; myErrorStatus=10;
return; return;
} }
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) { if(myDSFiller->HasErrors()) {
#else #else
if(myDSFiller->ErrorStatus()) { if(myDSFiller->ErrorStatus()) {
@ -299,7 +299,7 @@ void GEOMAlgo_ShellSolid::Perform()
GEOMAlgo_ShellSolidBuilder aSSB; GEOMAlgo_ShellSolidBuilder aSSB;
// //
aSSB.PerformWithFiller(*myDSFiller); aSSB.PerformWithFiller(*myDSFiller);
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
iErr=aSSB.HasErrors(); iErr=aSSB.HasErrors();
#else #else
iErr=aSSB.ErrorStatus(); iErr=aSSB.ErrorStatus();

2
src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
View File

@ -85,7 +85,7 @@ void GEOMAlgo_SolidSolid::Perform()
myErrorStatus=10; myErrorStatus=10;
return; return;
} }
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) { if(myDSFiller->HasErrors()) {
#else #else
if(myDSFiller->ErrorStatus()) { if(myDSFiller->ErrorStatus()) {

2
src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
View File

@ -90,7 +90,7 @@ void GEOMAlgo_VertexSolid::Perform()
myErrorStatus=10; myErrorStatus=10;
return; return;
} }
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) { if(myDSFiller->HasErrors()) {
#else #else
if(myDSFiller->ErrorStatus()) { if(myDSFiller->ErrorStatus()) {

2
src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
View File

@ -80,7 +80,7 @@ void GEOMAlgo_WireSolid::Perform()
myErrorStatus=10; myErrorStatus=10;
return; return;
} }
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) { if(myDSFiller->HasErrors()) {
#else #else
if(myDSFiller->ErrorStatus()) { if(myDSFiller->ErrorStatus()) {

12
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
View File

@ -150,7 +150,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
aList2.Append(aShape2); aList2.Append(aShape2);
aCSI.SetArguments(aList1); aCSI.SetArguments(aList1);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
@ -158,7 +158,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
aCSI.SetArguments(aList2); aCSI.SetArguments(aList2);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
@ -213,7 +213,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
aList1.Append(aShape); aList1.Append(aShape);
aCSI.SetArguments(aList1); aCSI.SetArguments(aList1);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@ -241,7 +241,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
aList2.Append(aShape2); aList2.Append(aShape2);
aCSI.SetArguments(aList2); aCSI.SetArguments(aList2);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@ -286,7 +286,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
aList1.Append(aShape); aList1.Append(aShape);
aCSI.SetArguments(aList1); aCSI.SetArguments(aList1);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@ -320,7 +320,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
aList2.Append(aTool); aList2.Append(aTool);
aCSI.SetArguments(aList2); aCSI.SetArguments(aList2);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {

2
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -1576,7 +1576,7 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections
// 1. Launch the checker // 1. Launch the checker
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
Standard_Boolean iErr = aCSI.HasErrors(); Standard_Boolean iErr = aCSI.HasErrors();
#else #else
Standard_Integer iErr = aCSI.ErrorStatus(); Standard_Integer iErr = aCSI.ErrorStatus();

6
src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
View File

@ -44,7 +44,7 @@
#include <Standard_NullObject.hxx> #include <Standard_NullObject.hxx>
#include <StdFail_NotDone.hxx> #include <StdFail_NotDone.hxx>
#include <BOPAlgo_CheckerSI.hxx> #include <BOPAlgo_CheckerSI.hxx>
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
#include <BOPAlgo_Alerts.hxx> #include <BOPAlgo_Alerts.hxx>
#endif #endif
#include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx> #include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx>
@ -109,7 +109,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape)
aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
aCSI.SetArguments(aList); aCSI.SetArguments(aList);
aCSI.Perform(); aCSI.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
#else #else
if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
@ -417,7 +417,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const
aShape = PS.Shape(); aShape = PS.Shape();
if (aShape.IsNull()) { if (aShape.IsNull()) {
// Mantis issue 22009 // Mantis issue 22009
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)
#else #else
if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)

2
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
View File

@ -770,7 +770,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
aMV.SetArguments(aLS); aMV.SetArguments(aLS);
aMV.SetIntersect(aCI.GetIsIntersect()); aMV.SetIntersect(aCI.GetIsIntersect());
aMV.Perform(); aMV.Perform();
#if OCC_VERSION_LARGE > 0x07010000 #if OCC_VERSION_LARGE > 0x07010001
if (aMV.HasErrors()) return 0; if (aMV.HasErrors()) return 0;
#else #else
if (aMV.ErrorStatus()) return 0; if (aMV.ErrorStatus()) return 0;