}
else {
// PAL16008 (Sketcher Validation should be equal to Apply&Close)
- if ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ||
- Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ||
- Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ||
- Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ||
- Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() ||
- Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() ||
- Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) {
+ if ( ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ) ||
+ ( Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ) ||
+ ( Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ) ||
+ ( Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ) ||
+ ( Group1Sel->buttonApply->isEnabled() && Group1Sel->isVisible() ) ||
+ ( Group2Sel->buttonApply->isEnabled() && Group2Sel->isVisible() ) ||
+ ( Group1Sel1Spin->buttonApply->isEnabled() && Group1Sel1Spin->isVisible() ) ) {
ClickOnApply();
}
myIsAllAdded = true;
TopoDS_Shape& theLastSegment )
{
TopoDS_Shape aShape;
- if ( !GEOMBase::GetShape( theObject, aShape ) ||
- aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX )
+ if ( !GEOMBase::GetShape( theObject, aShape ) ||
+ ( aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX ) )
return false;
- if ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() ||
- Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() ||
- Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() ||
- Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ||
- Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ||
- Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ||
- Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) {
+ if ( ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() )||
+ ( Group2Sel->isVisible() && !Group2Sel->buttonApply->isEnabled() ) ||
+ ( Group1Sel1Spin->isVisible() && !Group1Sel1Spin->buttonApply->isEnabled() ) ||
+ ( Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ) ||
+ ( Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ) ||
+ ( Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ) ||
+ ( Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) ) {
theApplyedWire = aShape;
return true;
}
PostTreat();
}
//
-static
- void CorrectWires(const TopoDS_Shape& aS);
+// static
+// void CorrectWires(const TopoDS_Shape& aS);
//
//=======================================================================
//function : PostTreat
if (!myShapesToAvoid.Contains(aE)) {
TopExp::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aMVE);
}
- else {
- int a=0;
- }
+// else {
+// int a=0;
+// }
}
aNbV=aMVE.Extent();
//
const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
NMTTools_PaveFiller* pPF=myPaveFiller;
const BOPTools_SplitShapesPool& aSSP=pPF->SplitShapesPool();
- NMTTools_CommonBlockPool& aCBP=pPF->ChangeCommonBlockPool();
+/* NMTTools_CommonBlockPool& aCBP=*/pPF->ChangeCommonBlockPool();
IntTools_Context& aCtx=pPF->ChangeContext();
//
Standard_Boolean bToReverse;
NMTDS_InterfPool* pIP=pPF->IP();
IntTools_Context& aCtx= pPF->ChangeContext();
//
- BOPTools_CArray1OfSSInterference& aFFs=pIP->SSInterferences();
+ /*BOPTools_CArray1OfSSInterference& aFFs=*/pIP->SSInterferences();
BOPTools_CArray1OfVSInterference& aVFs=pIP->VSInterferences();
BOPTools_CArray1OfESInterference& aEFs=pIP->ESInterferences();
const NMTTools_IndexedDataMapOfIndexedMapOfInteger& aMAV=pPF->AloneVertices();
{
myErrorStatus=0;
//
- const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
+ /*const NMTDS_ShapesDataStructure& aDS=**/myPaveFiller->DS();
NMTTools_PaveFiller* pPF=myPaveFiller;
IntTools_Context& aCtx= pPF->ChangeContext();
//
//=======================================================================
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;
IntTools_Context& aCtx=pPF->ChangeContext();
//
//=======================================================================
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;
IntTools_Context& aCtx=pPF->ChangeContext();
//
TopoDS_Shape aSold[2];
aItLS.Initialize(aLS);
for (i=0; aItLS.More(); aItLS.Next(), ++i) {
- const TopoDS_Shape& aSi=aItLS.Value();
+// const TopoDS_Shape& aSi=aItLS.Value();
aSold[i]=aItLS.Value();
}
//
{
Standard_Boolean bRet;
Standard_Integer aNb1, aNb2;
- TopAbs_Orientation aOr;
TopTools_ListIteratorOfListOfShape aIt;
//
bRet=Standard_True;
const BOPTools_PaveBlock& aPB=aLPB.First();
nSp=aPB.Edge();
}
- const TopoDS_Shape& aSp=aDS.Shape(nSp);
+ /*const TopoDS_Shape& aSp=*/aDS.Shape(nSp);
//
aState=aDS.GetState(nSp);
if (aState==BooleanOperations_IN) {
const TopoDS_Shape& aTool=aDS.Tool();
//
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);
//
else if (aNbPB==1) {
const BOPTools_PaveBlock& aPB=aLPB.First();
nSp=aPB.Edge();
- const TopoDS_Shape& aSp=aDS.Shape(nSp);
+ /*const TopoDS_Shape& aSp=*/aDS.Shape(nSp);
aState=aDS.GetState(nSp);
//
if (aState==BooleanOperations_IN) {
GC_MakeEllipse ellipse (aP2, aP3, aP1);
Handle(Geom_Ellipse) aGeomEllipse = ellipse.Value();
- gp_Vec aV1 (aP1, aP2);
- gp_Vec aV2 (aP1, aP3);
-
- double alpha = fabs(aV1.Angle(aV2));
+// gp_Vec aV1 (aP1, aP2);
+// gp_Vec aV2 (aP1, aP3);
+//
+// double alpha = fabs(aV1.Angle(aV2));
GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInChamfer = 0;
std::list<int> theEdges;
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInChamfer = 0;
std::list<int> theEdges;
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInFillet = 0;
std::list<int> theEdges;
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInFillet = 0;
std::list<int> theEdges;
(Handle(GEOM_Object) theShape,
Handle(GEOM_Object) thePoint,
const Standard_Integer theShapeType,
- const Standard_Real theTolerance)
+ const Standard_Real theConstTolerance)
{
SetErrorCode(KO);
SetErrorCode("Invalid type of result is requested");
return NULL;
}
-
+
+ Standard_Real theTolerance = theConstTolerance;
if (theTolerance < Precision::Confusion()) {
- theTolerance == Precision::Confusion();
+ theTolerance = Precision::Confusion();
}
// Compute the result
if (index < 0 || index > 1)
Standard_NullObject::Raise("Vertex index is out of range");
- if ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 ||
- anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 )
+ if ( ( anEdgeE.Orientation() == TopAbs_FORWARD && index == 0 ) ||
+ ( anEdgeE.Orientation() == TopAbs_REVERSED && index == 1 ) )
aVertex = aP1;
else
aVertex = aP2;
//
Standard_Integer n1, n2, aIR1, aIR2;//, aN1, aN2, aNS;
//
- const NMTDS_CArray1OfIndexRange& aRanges=myPNMTPS->Ranges();
+ /*const NMTDS_CArray1OfIndexRange& aRanges=*/myPNMTPS->Ranges();
//
//aNS=myPNMTPS->NumberOfShapesOfTheObject();
myIndex1=0;
const IntTools_Range& aRange,
const Standard_Real& aTolerance);
-static
- void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB);
+// static
+// void EECommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfPaveBlock& aMapCB);
static
void ProcessBlock(const BOPTools_PaveBlock& aPB,
#include <NMTTools_ListIteratorOfListOfCommonBlock.hxx>
// Modified Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN
-static
- void FuseVertices(const TopoDS_Shape& aCompound,
- TopTools_DataMapOfShapeShape& aDMVV);
+// static
+// void FuseVertices(const TopoDS_Shape& aCompound,
+// TopTools_DataMapOfShapeShape& aDMVV);
// Contribution of Samtech www.samcef.com END
//=======================================================================
}
//
NMTTools_ListOfCommonBlock& aLCB=myCommonBlockPool(myDS->RefEdge(nE));
- BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool (myDS->RefEdge(nE));
+ /*BOPTools_ListOfPaveBlock& aLPB=*/mySplitShapesPool (myDS->RefEdge(nE));
//
aCBIt.Initialize(aLCB);
for (; aCBIt.More(); aCBIt.Next()) {
// function: FuseVertices
// purpose:
//=======================================================================
- void NMTTools_PaveFiller::FuseVertices(const TopoDS_Shape& aCompound,
+ void NMTTools_PaveFiller::FuseVertices(const TopoDS_Shape& aCompound,
TopTools_DataMapOfShapeShape& aDMVV)const
{
Standard_Integer i, aNbVV, n1, n2, nX;
{
Standard_Integer nE1;
//
- BooleanOperations_ShapesDataStructure *pDS=myDS;
+// BooleanOperations_ShapesDataStructure *pDS=myDS;
BooleanOperations_OnceExplorer aExp(*myDS);
aExp.Init(nF1, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
if (aT1!=TopAbs_FACE || aT2!=TopAbs_FACE) {
return 1; // Type mismatch
}
- BooleanOperations_ShapesDataStructure *pDS=myDS;
+// BooleanOperations_ShapesDataStructure *pDS=myDS;
BooleanOperations_OnceExplorer aExp(*myDS);
aExp.Init(nF1, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
switch(aSelectionMode){
case ActorSelection :
{
- // cout << "=============== " << myIO->getEntry() << endl;
- int nbio = mySelector->IObjectCount();
- // cout << " nbio = " << nbio << endl;
+// cout << "=============== " << myIO->getEntry() << endl;
+// int nbio = mySelector->IObjectCount();
+// cout << " nbio = " << nbio << endl;
if( !mySelector->IsSelected( myIO ) ) {
// printf ("!!!!!!!!!!!!!!!!\n");
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 ] ) ) );
- const gp_XYZ& aTrans = aTrsf.TranslationPart();
+// const gp_XYZ& aTrans = aTrsf.TranslationPart();
gp_Mat aRot = aTrsf.VectorialPart();
for ( int i = 1; i <= 3; i++ )
return getGeomEngine()->GetI3DPrimOperations(getStudyId());
}
-//=================================================================================
-// function : isEqual
-// 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)
-{
- return thePnt1->_is_equivalent(thePnt2);
-}
+// //=================================================================================
+// // function : isEqual
+// // 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)
+// {
+// return thePnt1->_is_equivalent(thePnt2);
+// }
//=================================================================================
// function : isValid
// purpose : Constructor
//=================================================================================
RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent )
- : QDialog( theParent, false ),
+ : QDialog( theParent, 0 ),
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( theParent ) ),
myGeomGUI( theGUI )
{
//=================================================================================
RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg( GeometryGUI* GUI, QWidget* parent,
bool modal )
- : QDialog( parent, false ),
+ : QDialog( parent, 0 ),
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
myGeomGUI( GUI ),
myDisplayer( 0 )
}
aB.SameParameter(anEdge,Standard_False);
aB.Add (aWire, anEdge);
- Standard_Boolean isAdd = Standard_False;
TopoDS_Shape aParent;
if(!myEdgeFaces.Contains(anEdge))
continue;