mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 10:08:35 +05:00
Remove warnings
This commit is contained in:
parent
46574ac4f4
commit
c86487eae5
@ -945,13 +945,13 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// PAL16008 (Sketcher Validation should be equal to Apply&Close)
|
// PAL16008 (Sketcher Validation should be equal to Apply&Close)
|
||||||
if ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ||
|
if ( ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ) ||
|
||||||
Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ||
|
( Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ) ||
|
||||||
Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ||
|
( Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ) ||
|
||||||
Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ||
|
( Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ) ||
|
||||||
Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() ||
|
( Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() ) ||
|
||||||
Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() ||
|
( Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() ) ||
|
||||||
Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) {
|
( Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) ) {
|
||||||
ClickOnApply();
|
ClickOnApply();
|
||||||
}
|
}
|
||||||
myIsAllAdded = true;
|
myIsAllAdded = true;
|
||||||
@ -2165,16 +2165,16 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject,
|
|||||||
{
|
{
|
||||||
TopoDS_Shape aShape;
|
TopoDS_Shape aShape;
|
||||||
if ( !GEOMBase::GetShape( theObject, aShape ) ||
|
if ( !GEOMBase::GetShape( theObject, aShape ) ||
|
||||||
aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX )
|
( aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX ) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() ||
|
if ( ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() )||
|
||||||
Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() ||
|
( Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() ) ||
|
||||||
Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() ||
|
( Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() ) ||
|
||||||
Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ||
|
( Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ) ||
|
||||||
Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ||
|
( Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ) ||
|
||||||
Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ||
|
( Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ) ||
|
||||||
Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) {
|
( Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) ) {
|
||||||
theApplyedWire = aShape;
|
theApplyedWire = aShape;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -378,8 +378,8 @@
|
|||||||
PostTreat();
|
PostTreat();
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
static
|
// static
|
||||||
void CorrectWires(const TopoDS_Shape& aS);
|
// void CorrectWires(const TopoDS_Shape& aS);
|
||||||
//
|
//
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
//function : PostTreat
|
//function : PostTreat
|
||||||
|
@ -190,9 +190,9 @@ static
|
|||||||
if (!myShapesToAvoid.Contains(aE)) {
|
if (!myShapesToAvoid.Contains(aE)) {
|
||||||
TopExp::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aMVE);
|
TopExp::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aMVE);
|
||||||
}
|
}
|
||||||
else {
|
// else {
|
||||||
int a=0;
|
// int a=0;
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
aNbV=aMVE.Extent();
|
aNbV=aMVE.Extent();
|
||||||
//
|
//
|
||||||
|
@ -112,7 +112,7 @@ static
|
|||||||
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
|
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
|
||||||
NMTTools_PaveFiller* pPF=myPaveFiller;
|
NMTTools_PaveFiller* pPF=myPaveFiller;
|
||||||
const BOPTools_SplitShapesPool& aSSP=pPF->SplitShapesPool();
|
const BOPTools_SplitShapesPool& aSSP=pPF->SplitShapesPool();
|
||||||
NMTTools_CommonBlockPool& aCBP=pPF->ChangeCommonBlockPool();
|
/* NMTTools_CommonBlockPool& aCBP=*/pPF->ChangeCommonBlockPool();
|
||||||
IntTools_Context& aCtx=pPF->ChangeContext();
|
IntTools_Context& aCtx=pPF->ChangeContext();
|
||||||
//
|
//
|
||||||
Standard_Boolean bToReverse;
|
Standard_Boolean bToReverse;
|
||||||
|
@ -642,7 +642,7 @@ static
|
|||||||
NMTDS_InterfPool* pIP=pPF->IP();
|
NMTDS_InterfPool* pIP=pPF->IP();
|
||||||
IntTools_Context& aCtx= pPF->ChangeContext();
|
IntTools_Context& aCtx= pPF->ChangeContext();
|
||||||
//
|
//
|
||||||
BOPTools_CArray1OfSSInterference& aFFs=pIP->SSInterferences();
|
/*BOPTools_CArray1OfSSInterference& aFFs=*/pIP->SSInterferences();
|
||||||
BOPTools_CArray1OfVSInterference& aVFs=pIP->VSInterferences();
|
BOPTools_CArray1OfVSInterference& aVFs=pIP->VSInterferences();
|
||||||
BOPTools_CArray1OfESInterference& aEFs=pIP->ESInterferences();
|
BOPTools_CArray1OfESInterference& aEFs=pIP->ESInterferences();
|
||||||
const NMTTools_IndexedDataMapOfIndexedMapOfInteger& aMAV=pPF->AloneVertices();
|
const NMTTools_IndexedDataMapOfIndexedMapOfInteger& aMAV=pPF->AloneVertices();
|
||||||
|
@ -94,7 +94,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
|
|||||||
{
|
{
|
||||||
myErrorStatus=0;
|
myErrorStatus=0;
|
||||||
//
|
//
|
||||||
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
|
/*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS();
|
||||||
NMTTools_PaveFiller* pPF=myPaveFiller;
|
NMTTools_PaveFiller* pPF=myPaveFiller;
|
||||||
IntTools_Context& aCtx= pPF->ChangeContext();
|
IntTools_Context& aCtx= pPF->ChangeContext();
|
||||||
//
|
//
|
||||||
|
@ -51,7 +51,7 @@ static
|
|||||||
//=======================================================================
|
//=======================================================================
|
||||||
const TopTools_ListOfShape& GEOMAlgo_Builder::Generated(const TopoDS_Shape& theS)
|
const TopTools_ListOfShape& GEOMAlgo_Builder::Generated(const TopoDS_Shape& theS)
|
||||||
{
|
{
|
||||||
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
|
/*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS();
|
||||||
NMTTools_PaveFiller* pPF=myPaveFiller;
|
NMTTools_PaveFiller* pPF=myPaveFiller;
|
||||||
IntTools_Context& aCtx=pPF->ChangeContext();
|
IntTools_Context& aCtx=pPF->ChangeContext();
|
||||||
//
|
//
|
||||||
@ -106,7 +106,7 @@ static
|
|||||||
//=======================================================================
|
//=======================================================================
|
||||||
const TopTools_ListOfShape& GEOMAlgo_Builder::Modified(const TopoDS_Shape& theS)
|
const TopTools_ListOfShape& GEOMAlgo_Builder::Modified(const TopoDS_Shape& theS)
|
||||||
{
|
{
|
||||||
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
|
/*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS();
|
||||||
NMTTools_PaveFiller* pPF=myPaveFiller;
|
NMTTools_PaveFiller* pPF=myPaveFiller;
|
||||||
IntTools_Context& aCtx=pPF->ChangeContext();
|
IntTools_Context& aCtx=pPF->ChangeContext();
|
||||||
//
|
//
|
||||||
|
@ -216,7 +216,7 @@ static
|
|||||||
TopoDS_Shape aSold[2];
|
TopoDS_Shape aSold[2];
|
||||||
aItLS.Initialize(aLS);
|
aItLS.Initialize(aLS);
|
||||||
for (i=0; aItLS.More(); aItLS.Next(), ++i) {
|
for (i=0; aItLS.More(); aItLS.Next(), ++i) {
|
||||||
const TopoDS_Shape& aSi=aItLS.Value();
|
// const TopoDS_Shape& aSi=aItLS.Value();
|
||||||
aSold[i]=aItLS.Value();
|
aSold[i]=aItLS.Value();
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
@ -154,7 +154,6 @@
|
|||||||
{
|
{
|
||||||
Standard_Boolean bRet;
|
Standard_Boolean bRet;
|
||||||
Standard_Integer aNb1, aNb2;
|
Standard_Integer aNb1, aNb2;
|
||||||
TopAbs_Orientation aOr;
|
|
||||||
TopTools_ListIteratorOfListOfShape aIt;
|
TopTools_ListIteratorOfListOfShape aIt;
|
||||||
//
|
//
|
||||||
bRet=Standard_True;
|
bRet=Standard_True;
|
||||||
|
@ -243,7 +243,7 @@ void GEOMAlgo_ShellSolid::BuildResult()
|
|||||||
const BOPTools_PaveBlock& aPB=aLPB.First();
|
const BOPTools_PaveBlock& aPB=aLPB.First();
|
||||||
nSp=aPB.Edge();
|
nSp=aPB.Edge();
|
||||||
}
|
}
|
||||||
const TopoDS_Shape& aSp=aDS.Shape(nSp);
|
/*const TopoDS_Shape& aSp=*/aDS.Shape(nSp);
|
||||||
//
|
//
|
||||||
aState=aDS.GetState(nSp);
|
aState=aDS.GetState(nSp);
|
||||||
if (aState==BooleanOperations_IN) {
|
if (aState==BooleanOperations_IN) {
|
||||||
|
@ -142,7 +142,6 @@ void GEOMAlgo_VertexSolid::Prepare()
|
|||||||
const TopoDS_Shape& aTool=aDS.Tool();
|
const TopoDS_Shape& aTool=aDS.Tool();
|
||||||
//
|
//
|
||||||
const TopoDS_Solid& aSolid=(myRank==1) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj);
|
const TopoDS_Solid& aSolid=(myRank==1) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj);
|
||||||
const TopoDS_Shape& aSV =(myRank==1)? aObj : aTool;
|
|
||||||
//
|
//
|
||||||
BRepClass3d_SolidClassifier& aSC=aCtx.SolidClassifier(aSolid);
|
BRepClass3d_SolidClassifier& aSC=aCtx.SolidClassifier(aSolid);
|
||||||
//
|
//
|
||||||
|
@ -155,7 +155,7 @@ void GEOMAlgo_WireSolid::BuildResult()
|
|||||||
else if (aNbPB==1) {
|
else if (aNbPB==1) {
|
||||||
const BOPTools_PaveBlock& aPB=aLPB.First();
|
const BOPTools_PaveBlock& aPB=aLPB.First();
|
||||||
nSp=aPB.Edge();
|
nSp=aPB.Edge();
|
||||||
const TopoDS_Shape& aSp=aDS.Shape(nSp);
|
/*const TopoDS_Shape& aSp=*/aDS.Shape(nSp);
|
||||||
aState=aDS.GetState(nSp);
|
aState=aDS.GetState(nSp);
|
||||||
//
|
//
|
||||||
if (aState==BooleanOperations_IN) {
|
if (aState==BooleanOperations_IN) {
|
||||||
|
@ -141,10 +141,10 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
|||||||
GC_MakeEllipse ellipse (aP2, aP3, aP1);
|
GC_MakeEllipse ellipse (aP2, aP3, aP1);
|
||||||
Handle(Geom_Ellipse) aGeomEllipse = ellipse.Value();
|
Handle(Geom_Ellipse) aGeomEllipse = ellipse.Value();
|
||||||
|
|
||||||
gp_Vec aV1 (aP1, aP2);
|
// gp_Vec aV1 (aP1, aP2);
|
||||||
gp_Vec aV2 (aP1, aP3);
|
// gp_Vec aV2 (aP1, aP3);
|
||||||
|
//
|
||||||
double alpha = fabs(aV1.Angle(aV2));
|
// double alpha = fabs(aV1.Angle(aV2));
|
||||||
|
|
||||||
GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
|
GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
|
||||||
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
|
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
|
||||||
|
@ -1441,7 +1441,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
|||||||
|
|
||||||
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
||||||
SetErrorCode("External edges not found");
|
SetErrorCode("External edges not found");
|
||||||
return false;
|
return NULL;
|
||||||
}
|
}
|
||||||
int nbEdgesInChamfer = 0;
|
int nbEdgesInChamfer = 0;
|
||||||
std::list<int> theEdges;
|
std::list<int> theEdges;
|
||||||
@ -1657,7 +1657,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
|||||||
|
|
||||||
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
||||||
SetErrorCode("External edges not found");
|
SetErrorCode("External edges not found");
|
||||||
return false;
|
return NULL;
|
||||||
}
|
}
|
||||||
int nbEdgesInChamfer = 0;
|
int nbEdgesInChamfer = 0;
|
||||||
std::list<int> theEdges;
|
std::list<int> theEdges;
|
||||||
@ -1845,7 +1845,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
|||||||
|
|
||||||
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
||||||
SetErrorCode("External edges not found");
|
SetErrorCode("External edges not found");
|
||||||
return false;
|
return NULL;
|
||||||
}
|
}
|
||||||
int nbEdgesInFillet = 0;
|
int nbEdgesInFillet = 0;
|
||||||
std::list<int> theEdges;
|
std::list<int> theEdges;
|
||||||
@ -2046,7 +2046,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
|||||||
|
|
||||||
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
if (edges_e.IsNull() || edges_e->Length() == 0) {
|
||||||
SetErrorCode("External edges not found");
|
SetErrorCode("External edges not found");
|
||||||
return false;
|
return NULL;
|
||||||
}
|
}
|
||||||
int nbEdgesInFillet = 0;
|
int nbEdgesInFillet = 0;
|
||||||
std::list<int> theEdges;
|
std::list<int> theEdges;
|
||||||
|
@ -1542,7 +1542,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint
|
|||||||
(Handle(GEOM_Object) theShape,
|
(Handle(GEOM_Object) theShape,
|
||||||
Handle(GEOM_Object) thePoint,
|
Handle(GEOM_Object) thePoint,
|
||||||
const Standard_Integer theShapeType,
|
const Standard_Integer theShapeType,
|
||||||
const Standard_Real theTolerance)
|
const Standard_Real theConstTolerance)
|
||||||
{
|
{
|
||||||
SetErrorCode(KO);
|
SetErrorCode(KO);
|
||||||
|
|
||||||
@ -1573,8 +1573,9 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Standard_Real theTolerance = theConstTolerance;
|
||||||
if (theTolerance < Precision::Confusion()) {
|
if (theTolerance < Precision::Confusion()) {
|
||||||
theTolerance == Precision::Confusion();
|
theTolerance = Precision::Confusion();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compute the result
|
// Compute the result
|
||||||
|
@ -141,8 +141,8 @@ Standard_Integer GEOMImpl_MeasureDriver::Execute(TFunction_Logbook& log) const
|
|||||||
if (index < 0 || index > 1)
|
if (index < 0 || index > 1)
|
||||||
Standard_NullObject::Raise("Vertex index is out of range");
|
Standard_NullObject::Raise("Vertex index is out of range");
|
||||||
|
|
||||||
if ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 ||
|
if ( ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 ) ||
|
||||||
anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 )
|
( anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 ) )
|
||||||
aVertex = aP1;
|
aVertex = aP1;
|
||||||
else
|
else
|
||||||
aVertex = aP2;
|
aVertex = aP2;
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
//
|
//
|
||||||
Standard_Integer n1, n2, aIR1, aIR2;//, aN1, aN2, aNS;
|
Standard_Integer n1, n2, aIR1, aIR2;//, aN1, aN2, aNS;
|
||||||
//
|
//
|
||||||
const NMTDS_CArray1OfIndexRange& aRanges=myPNMTPS->Ranges();
|
/*const NMTDS_CArray1OfIndexRange& aRanges=*/myPNMTPS->Ranges();
|
||||||
//
|
//
|
||||||
//aNS=myPNMTPS->NumberOfShapesOfTheObject();
|
//aNS=myPNMTPS->NumberOfShapesOfTheObject();
|
||||||
myIndex1=0;
|
myIndex1=0;
|
||||||
|
@ -127,8 +127,8 @@ static
|
|||||||
const IntTools_Range& aRange,
|
const IntTools_Range& aRange,
|
||||||
const Standard_Real& aTolerance);
|
const Standard_Real& aTolerance);
|
||||||
|
|
||||||
static
|
// static
|
||||||
void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB);
|
// void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB);
|
||||||
|
|
||||||
static
|
static
|
||||||
void ProcessBlock(const BOPTools_PaveBlock& aPB,
|
void ProcessBlock(const BOPTools_PaveBlock& aPB,
|
||||||
|
@ -84,9 +84,9 @@
|
|||||||
#include <NMTTools_ListIteratorOfListOfCommonBlock.hxx>
|
#include <NMTTools_ListIteratorOfListOfCommonBlock.hxx>
|
||||||
// Modified Thu Sep 14 14:35:18 2006
|
// Modified Thu Sep 14 14:35:18 2006
|
||||||
// Contribution of Samtech www.samcef.com BEGIN
|
// Contribution of Samtech www.samcef.com BEGIN
|
||||||
static
|
// static
|
||||||
void FuseVertices(const TopoDS_Shape& aCompound,
|
// void FuseVertices(const TopoDS_Shape& aCompound,
|
||||||
TopTools_DataMapOfShapeShape& aDMVV);
|
// TopTools_DataMapOfShapeShape& aDMVV);
|
||||||
// Contribution of Samtech www.samcef.com END
|
// Contribution of Samtech www.samcef.com END
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
@ -200,7 +200,7 @@ static
|
|||||||
}
|
}
|
||||||
//
|
//
|
||||||
NMTTools_ListOfCommonBlock& aLCB=myCommonBlockPool(myDS->RefEdge(nE));
|
NMTTools_ListOfCommonBlock& aLCB=myCommonBlockPool(myDS->RefEdge(nE));
|
||||||
BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool (myDS->RefEdge(nE));
|
/*BOPTools_ListOfPaveBlock& aLPB=*/mySplitShapesPool (myDS->RefEdge(nE));
|
||||||
//
|
//
|
||||||
aCBIt.Initialize(aLCB);
|
aCBIt.Initialize(aLCB);
|
||||||
for (; aCBIt.More(); aCBIt.Next()) {
|
for (; aCBIt.More(); aCBIt.Next()) {
|
||||||
|
@ -329,7 +329,7 @@
|
|||||||
{
|
{
|
||||||
Standard_Integer nE1;
|
Standard_Integer nE1;
|
||||||
//
|
//
|
||||||
BooleanOperations_ShapesDataStructure *pDS=myDS;
|
// BooleanOperations_ShapesDataStructure *pDS=myDS;
|
||||||
BooleanOperations_OnceExplorer aExp(*myDS);
|
BooleanOperations_OnceExplorer aExp(*myDS);
|
||||||
aExp.Init(nF1, TopAbs_EDGE);
|
aExp.Init(nF1, TopAbs_EDGE);
|
||||||
for (; aExp.More(); aExp.Next()) {
|
for (; aExp.More(); aExp.Next()) {
|
||||||
@ -525,7 +525,7 @@
|
|||||||
if (aT1!=TopAbs_FACE || aT2!=TopAbs_FACE) {
|
if (aT1!=TopAbs_FACE || aT2!=TopAbs_FACE) {
|
||||||
return 1; // Type mismatch
|
return 1; // Type mismatch
|
||||||
}
|
}
|
||||||
BooleanOperations_ShapesDataStructure *pDS=myDS;
|
// BooleanOperations_ShapesDataStructure *pDS=myDS;
|
||||||
BooleanOperations_OnceExplorer aExp(*myDS);
|
BooleanOperations_OnceExplorer aExp(*myDS);
|
||||||
aExp.Init(nF1, TopAbs_EDGE);
|
aExp.Init(nF1, TopAbs_EDGE);
|
||||||
for (; aExp.More(); aExp.Next()) {
|
for (; aExp.More(); aExp.Next()) {
|
||||||
|
@ -686,9 +686,9 @@ GEOM_Actor
|
|||||||
switch(aSelectionMode){
|
switch(aSelectionMode){
|
||||||
case ActorSelection :
|
case ActorSelection :
|
||||||
{
|
{
|
||||||
// cout << "=============== " << myIO->getEntry() << endl;
|
// cout << "=============== " << myIO->getEntry() << endl;
|
||||||
int nbio = mySelector->IObjectCount();
|
// int nbio = mySelector->IObjectCount();
|
||||||
// cout << " nbio = " << nbio << endl;
|
// cout << " nbio = " << nbio << endl;
|
||||||
|
|
||||||
if( !mySelector->IsSelected( myIO ) ) {
|
if( !mySelector->IsSelected( myIO ) ) {
|
||||||
// printf ("!!!!!!!!!!!!!!!!\n");
|
// printf ("!!!!!!!!!!!!!!!!\n");
|
||||||
|
@ -113,7 +113,7 @@ void GEOM_VTKTrihedronAxis::SetSize( vtkFloatingPointType theSize )
|
|||||||
aTrsf.SetDisplacement( gp_Ax3( gp_Pnt( 0, 0, 0 ), gp_Dir( 1, 0, 0 ) ),
|
aTrsf.SetDisplacement( gp_Ax3( gp_Pnt( 0, 0, 0 ), gp_Dir( 1, 0, 0 ) ),
|
||||||
gp_Ax3( GetOri(), gp_Dir( myDir[ 0 ], myDir[ 1 ], myDir[ 2 ] ) ) );
|
gp_Ax3( GetOri(), gp_Dir( myDir[ 0 ], myDir[ 1 ], myDir[ 2 ] ) ) );
|
||||||
|
|
||||||
const gp_XYZ& aTrans = aTrsf.TranslationPart();
|
// const gp_XYZ& aTrans = aTrsf.TranslationPart();
|
||||||
gp_Mat aRot = aTrsf.VectorialPart();
|
gp_Mat aRot = aTrsf.VectorialPart();
|
||||||
|
|
||||||
for ( int i = 1; i <= 3; i++ )
|
for ( int i = 1; i <= 3; i++ )
|
||||||
|
@ -456,14 +456,14 @@ GEOM::GEOM_IOperations_ptr PrimitiveGUI_DiskDlg::createOperation()
|
|||||||
return getGeomEngine()->GetI3DPrimOperations(getStudyId());
|
return getGeomEngine()->GetI3DPrimOperations(getStudyId());
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
// //=================================================================================
|
||||||
// function : isEqual
|
// // function : isEqual
|
||||||
// purpose : it may also be needed to check for min distance between gp_Pnt-s...
|
// // purpose : it may also be needed to check for min distance between gp_Pnt-s...
|
||||||
//=================================================================================
|
// //=================================================================================
|
||||||
static bool isEqual (const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2)
|
// static bool isEqual (const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2)
|
||||||
{
|
// {
|
||||||
return thePnt1->_is_equivalent(thePnt2);
|
// return thePnt1->_is_equivalent(thePnt2);
|
||||||
}
|
// }
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// function : isValid
|
// function : isValid
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent )
|
RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent )
|
||||||
: QDialog( theParent, false ),
|
: QDialog( theParent, 0 ),
|
||||||
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( theParent ) ),
|
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( theParent ) ),
|
||||||
myGeomGUI( theGUI )
|
myGeomGUI( theGUI )
|
||||||
{
|
{
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg( GeometryGUI* GUI, QWidget* parent,
|
RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg( GeometryGUI* GUI, QWidget* parent,
|
||||||
bool modal )
|
bool modal )
|
||||||
: QDialog( parent, false ),
|
: QDialog( parent, 0 ),
|
||||||
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
|
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
|
||||||
myGeomGUI( GUI ),
|
myGeomGUI( GUI ),
|
||||||
myDisplayer( 0 )
|
myDisplayer( 0 )
|
||||||
|
@ -370,7 +370,6 @@ Standard_Boolean ShHealOper_FillHoles::addFace(const Handle(Geom_Surface)& theSu
|
|||||||
}
|
}
|
||||||
aB.SameParameter(anEdge,Standard_False);
|
aB.SameParameter(anEdge,Standard_False);
|
||||||
aB.Add (aWire, anEdge);
|
aB.Add (aWire, anEdge);
|
||||||
Standard_Boolean isAdd = Standard_False;
|
|
||||||
TopoDS_Shape aParent;
|
TopoDS_Shape aParent;
|
||||||
if(!myEdgeFaces.Contains(anEdge))
|
if(!myEdgeFaces.Contains(anEdge))
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user