From 407cadd372e3b984e4edf56e5898d57c129432ef Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 17 Jun 2013 12:15:50 +0000 Subject: [PATCH] untabify --- src/BasicGUI/BasicGUI_EllipseDlg.cxx | 4 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 6 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 20 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 6 +- src/BlockFix/BlockFix_SphereSpaceModifier.cxx | 2 +- src/DlgRef/DlgRef.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 10 +- src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 2 +- src/GEOM/GEOM_Engine.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_Builder.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx | 38 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_2.cxx | 62 +- src/GEOMAlgo/GEOMAlgo_Builder_3.cxx | 10 +- ...pIteratorOfDataMapOfOrientedShapeShape.hxx | 6 +- ...taMapIteratorOfDataMapOfPassKeyInteger.hxx | 6 +- ...apIteratorOfDataMapOfPassKeyShapeShape.hxx | 6 +- ...aMapIteratorOfDataMapOfRealListOfShape.hxx | 6 +- ...aMapIteratorOfDataMapOfShapeMapOfShape.hxx | 6 +- ...lgo_DataMapIteratorOfDataMapOfShapePnt.hxx | 6 +- ...go_DataMapIteratorOfDataMapOfShapeReal.hxx | 6 +- ...ataMapIteratorOfDataMapOfShapeShapeSet.hxx | 6 +- .../GEOMAlgo_DataMapOfOrientedShapeShape.hxx | 6 +- .../GEOMAlgo_DataMapOfPassKeyInteger.hxx | 6 +- .../GEOMAlgo_DataMapOfPassKeyShapeShape.hxx | 6 +- .../GEOMAlgo_DataMapOfRealListOfShape.hxx | 6 +- .../GEOMAlgo_DataMapOfShapeMapOfShape.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx | 6 +- .../GEOMAlgo_DataMapOfShapeShapeSet.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 38 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx | 8 +- src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx | 8 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx | 50 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx | 8 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx | 10 +- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 176 ++--- src/GEOMAlgo/GEOMAlgo_Gluer.hxx | 24 +- src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx | 10 +- src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx | 6 +- .../GEOMAlgo_IndexedDataMapOfIntegerShape.hxx | 6 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 6 +- .../GEOMAlgo_IndexedDataMapOfShapeBox.hxx | 6 +- ...EOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx | 6 +- .../GEOMAlgo_IndexedDataMapOfShapeState.hxx | 6 +- ...lgo_ListIteratorOfListOfCoupleOfShapes.hxx | 6 +- .../GEOMAlgo_ListIteratorOfListOfPnt.hxx | 6 +- .../GEOMAlgo_ListOfCoupleOfShapes.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_PassKey.hxx | 12 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx | 12 +- .../GEOMAlgo_PassKeyShapeMapHasher.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx | 22 +- src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx | 24 +- src/GEOMAlgo/GEOMAlgo_Tools.hxx | 48 +- src/GEOMAlgo/GEOMAlgo_Tools3D.cxx | 8 +- src/GEOMAlgo/GEOMAlgo_Tools3D.hxx | 94 +-- src/GEOMAlgo/GEOMAlgo_WESScaler.cxx | 4 +- src/GEOMAlgo/GEOMAlgo_WESScaler.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx | 8 +- src/GEOMBase/GEOMBase.cxx | 296 ++++---- src/GEOMBase/GEOMBase.h | 30 +- src/GEOMGUI/GEOMGUI_Selection.cxx | 198 ++--- src/GEOMGUI/GEOM_Displayer.cxx | 394 +++++----- src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 10 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 4 +- .../GEOMToolsGUI_MaterialPropertiesDlg.cxx | 26 +- .../GEOMToolsGUI_MaterialPropertiesDlg.h | 4 +- src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx | 46 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 2 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx | 46 +- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 10 +- .../GenerationGUI_PipePathDlg.cxx | 4 +- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 4 +- src/Material/Material_Model.cxx | 4 + src/Material/Material_ResourceMgr.cxx | 2 +- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 6 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 4 +- src/NMTDS/NMTDS_BndSphere.cxx | 8 +- src/NMTDS/NMTDS_BndSphere.hxx | 8 +- src/NMTDS/NMTDS_BndSphere.lxx | 8 +- src/NMTDS/NMTDS_BndSphereTree.cxx | 8 +- src/NMTDS/NMTDS_BndSphereTree.hxx | 8 +- src/NMTDS/NMTDS_CArray1OfIndexRange.cxx | 8 +- src/NMTDS/NMTDS_CArray1OfIndexRange.hxx | 10 +- ...IteratorOfDataMapOfIntegerMapOfInteger.hxx | 8 +- .../NMTDS_DataMapOfIntegerMapOfInteger.hxx | 8 +- .../NMTDS_IndexedDataMapOfIntegerShape.hxx | 8 +- .../NMTDS_IndexedDataMapOfShapeBndSphere.hxx | 8 +- src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx | 8 +- src/NMTDS/NMTDS_InterfPool.cxx | 12 +- src/NMTDS/NMTDS_InterfPool.hxx | 16 +- src/NMTDS/NMTDS_InterfType.hxx | 8 +- src/NMTDS/NMTDS_Iterator.cxx | 18 +- src/NMTDS/NMTDS_Iterator.hxx | 8 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 8 +- src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx | 8 +- .../NMTDS_ListIteratorOfListOfPairBoolean.hxx | 8 +- .../NMTDS_ListIteratorOfListOfPassKey.hxx | 8 +- ...TDS_ListIteratorOfListOfPassKeyBoolean.hxx | 8 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 8 +- src/NMTDS/NMTDS_ListOfPair.hxx | 8 +- src/NMTDS/NMTDS_ListOfPairBoolean.hxx | 8 +- src/NMTDS/NMTDS_ListOfPassKey.hxx | 8 +- src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx | 8 +- .../NMTDS_MapIteratorOfMapOfPairBoolean.hxx | 8 +- src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx | 8 +- ...NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx | 8 +- src/NMTDS/NMTDS_MapOfPairBoolean.hxx | 8 +- src/NMTDS/NMTDS_MapOfPassKey.hxx | 8 +- src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx | 8 +- src/NMTDS/NMTDS_Pair.cxx | 4 +- src/NMTDS/NMTDS_Pair.hxx | 4 +- src/NMTDS/NMTDS_PairMapHasher.cxx | 4 +- src/NMTDS/NMTDS_PairMapHasher.hxx | 4 +- src/NMTDS/NMTDS_PassKey.hxx | 12 +- src/NMTDS/NMTDS_PassKeyMapHasher.hxx | 4 +- src/NMTDS/NMTDS_PassKeyShape.hxx | 12 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx | 4 +- src/NMTDS/NMTDS_ShapesDataStructure.cxx | 4 +- src/NMTDS/NMTDS_ShapesDataStructure.hxx | 14 +- src/NMTDS/NMTDS_Tools.hxx | 10 +- src/NMTTools/NMTTools_CheckerSI.hxx | 2 +- src/NMTTools/NMTTools_DEProcessor.cxx | 10 +- src/NMTTools/NMTTools_DEProcessor.hxx | 26 +- ...aMapIteratorOfDataMapOfIntegerFaceInfo.hxx | 6 +- ...ratorOfDataMapOfIntegerListOfPaveBlock.hxx | 6 +- .../NMTTools_DataMapOfIntegerFaceInfo.hxx | 6 +- ...TTools_DataMapOfIntegerListOfPaveBlock.hxx | 6 +- ...ls_IndexedDataMapOfIndexedMapOfInteger.hxx | 6 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 12 +- ...MTTools_IndexedDataMapOfShapePaveBlock.hxx | 6 +- ...TTools_ListIteratorOfListOfCommonBlock.hxx | 6 +- ...ools_ListIteratorOfListOfCoupleOfShape.hxx | 6 +- src/NMTTools/NMTTools_ListOfCommonBlock.hxx | 6 +- src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx | 6 +- .../NMTTools_MapIteratorOfMapOfPaveBlock.hxx | 6 +- src/NMTTools/NMTTools_MapOfPaveBlock.hxx | 6 +- src/NMTTools/NMTTools_PaveFiller.hxx | 164 ++--- src/NMTTools/NMTTools_PaveFiller_4.cxx | 22 +- src/NMTTools/NMTTools_PaveFiller_6.cxx | 136 ++-- src/NMTTools/NMTTools_PaveFiller_8.cxx | 28 +- src/NMTTools/NMTTools_Tools.hxx | 26 +- src/OBJECT/GEOM_AISShape.cxx | 36 +- src/OBJECT/GEOM_AISShape.hxx | 10 +- src/OBJECT/GEOM_Actor.cxx | 26 +- src/OBJECT/GEOM_Actor.h | 4 +- src/OBJECT/GEOM_TopWireframeShape.cxx | 18 +- src/OBJECT/GEOM_TopWireframeShape.hxx | 2 +- src/OBJECT/GEOM_VTKPropertyMaterial.hxx | 2 +- src/OCC2VTK/OCC2VTK_Tools.cxx | 6 +- src/OCC2VTK/OCC2VTK_Tools.h | 2 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 2 +- src/OperationGUI/OperationGUI_FilletDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 12 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 6 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 11 +- src/SKETCHER/Sketcher_Profile.cxx | 676 +++++++++--------- src/STEPImport/STEPImport.cxx | 6 +- src/TransformationGUI/TransformationGUI.cxx | 2 +- .../TransformationGUI_MirrorDlg.cxx | 4 +- .../TransformationGUI_MultiRotationDlg.cxx | 6 +- .../TransformationGUI_MultiTranslationDlg.cxx | 26 +- .../TransformationGUI_PositionDlg.cxx | 26 +- .../TransformationGUI_RotationDlg.cxx | 68 +- .../TransformationGUI_ScaleDlg.cxx | 2 +- .../TransformationGUI_TranslationDlg.cxx | 42 +- src/VTKExport/VTKExport.cxx | 14 +- 176 files changed, 1946 insertions(+), 1941 deletions(-) diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index 39ec531fe..99c32c2c8 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -238,7 +238,7 @@ void BasicGUI_EllipseDlg::SelectionIntoArgument() } TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupPoints->LineEdit2 || - myEditCurrentArgument == GroupPoints->LineEdit3 ) ? + myEditCurrentArgument == GroupPoints->LineEdit3 ) ? TopAbs_EDGE : TopAbs_VERTEX; GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); TopoDS_Shape aShape; @@ -300,7 +300,7 @@ void BasicGUI_EllipseDlg::SetEditCurrentArgument() } TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupPoints->LineEdit2 || - myEditCurrentArgument == GroupPoints->LineEdit3 ) ? + myEditCurrentArgument == GroupPoints->LineEdit3 ) ? TopAbs_EDGE : TopAbs_VERTEX; globalSelection(); // close local contexts, if any localSelection( GEOM::GEOM_Object::_nil(), aNeedType ); diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index 6afb9bdd4..1bac86e6e 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -217,7 +217,7 @@ void BasicGUI_LineDlg::ConstructorsClicked( int constructorId ) } TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 || - myEditCurrentArgument == GroupFaces->LineEdit2 ) ? + myEditCurrentArgument == GroupFaces->LineEdit2 ) ? TopAbs_FACE : TopAbs_VERTEX; globalSelection(); // close local selection to clear it localSelection( GEOM::GEOM_Object::_nil(), aNeedType ); @@ -250,7 +250,7 @@ void BasicGUI_LineDlg::SelectionIntoArgument() } TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 || - myEditCurrentArgument == GroupFaces->LineEdit2 ) ? + myEditCurrentArgument == GroupFaces->LineEdit2 ) ? TopAbs_FACE : TopAbs_VERTEX; GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); TopoDS_Shape aShape; @@ -315,7 +315,7 @@ void BasicGUI_LineDlg::SetEditCurrentArgument() } TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 || - myEditCurrentArgument == GroupFaces->LineEdit2 ) ? + myEditCurrentArgument == GroupFaces->LineEdit2 ) ? TopAbs_FACE : TopAbs_VERTEX; globalSelection(); // close local selection to clear it localSelection( GEOM::GEOM_Object::_nil(), aNeedType ); diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index bf010fcf8..57c925b16 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -394,19 +394,19 @@ void BasicGUI_MarkerDlg::onSelectionDone() } else if ( getConstructorId() == 2 ) { // by point and two vectors if ( myEditCurrentArgument == Group2->LineEdit1 ) { - myPoint = aSelectedObject; - if (myPoint && !myVectorX) - Group2->PushButton2->click(); + myPoint = aSelectedObject; + if (myPoint && !myVectorX) + Group2->PushButton2->click(); } else if (myEditCurrentArgument == Group2->LineEdit2) { - myVectorX = aSelectedObject; - if (myVectorX && !myVectorY) - Group2->PushButton3->click(); + myVectorX = aSelectedObject; + if (myVectorX && !myVectorY) + Group2->PushButton3->click(); } else if ( myEditCurrentArgument == Group2->LineEdit3 ) { - myVectorY = aSelectedObject; - if (myVectorY && !myPoint) - Group2->PushButton1->click(); + myVectorY = aSelectedObject; + if (myVectorY && !myPoint) + Group2->PushButton1->click(); } } } @@ -531,7 +531,7 @@ bool BasicGUI_MarkerDlg::isValid( QString& msg ) if ( v1.Magnitude() > gp::Resolution() && v2.Magnitude() > gp::Resolution() ) { ok = !v1.IsParallel( v2, Precision::Angular() ); if ( !ok ) - msg += tr( "VEC_PARALLEL" ); + msg += tr( "VEC_PARALLEL" ); } for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end() && ok; ++anIter ) ok = anIter.value()->isValid( msg, !IsPreview()) && ok; diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index deb308e03..b652fe240 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -695,15 +695,15 @@ bool BasicGUI_PlaneDlg::isValid( QString& msg ) break; case 1: ok = Group3Pnts->SpinBox_DX->isValid( msg, !IsPreview() ) && - myPoint1 && myPoint2 && myPoint3 && - myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3; + myPoint1 && myPoint2 && myPoint3 && + myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3; break; case 2: ok = GroupFace->SpinBox_DX->isValid( msg, !IsPreview() ) && myFace; break; case 3: ok = Group2Vec->SpinBox_DX->isValid( msg, !IsPreview() ) && - myVec1 && myVec2 && myVec1 != myVec2; + myVec1 && myVec2 && myVec1 != myVec2; break; case 4: ok = GroupLCS->SpinBox_DX->isValid( msg, !IsPreview() ); diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx index 3d50660bd..7be8f8212 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -114,7 +114,7 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace, Standard_Real anArea = Properties.Mass(); Standard_Real AreaTol = Radius*Radius*1.e-6; if (anArea > HalfArea - AreaTol) //no chance to avoid singularity - return Standard_False; + return Standard_False; /////////////////////////////////////////////// gp_Ax3 ax3 = sp.Position(); if(Abs(Vmax-Vmin) < PI2) { diff --git a/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx index eada5f0f2..b5043a215 100644 --- a/src/DlgRef/DlgRef.cxx +++ b/src/DlgRef/DlgRef.cxx @@ -911,7 +911,7 @@ QString DlgRef::PrintDoubleValue( double theValue, int thePrecision ) // remove trailing zeroes QRegExp expre( QString( "(%1|%2)[+-]?[0-9]+$" ).arg( QLocale().exponential().toLower(), - QLocale().exponential().toUpper() ) ); + QLocale().exponential().toUpper() ) ); int idx = aRes.indexOf( expre ); QString aResExp = ""; diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 9ca190195..bd2ddf62c 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -1073,10 +1073,10 @@ void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId ) Group4Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_VY2" ) ); Group4Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_RADIUS2" ) ); Group4Spin->TextLabel4->setText( tr( "GEOM_SKETCHER_ANGLE2" ) ); - initSpinBox( Group4Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision" ); - initSpinBox( Group4Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 0.1, "length_precision" ); - initSpinBox( Group4Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 0.1, "length_precision" ); - initSpinBox( Group4Spin->SpinBox_DS, COORD_MIN, COORD_MAX, 5., "length_precision" ); + initSpinBox( Group4Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision" ); + initSpinBox( Group4Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 0.1, "length_precision" ); + initSpinBox( Group4Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 0.1, "length_precision" ); + initSpinBox( Group4Spin->SpinBox_DS, COORD_MIN, COORD_MAX, 5., "length_precision" ); Group4Spin->SpinBox_DX->setValue( myDX ); Group4Spin->SpinBox_DY->setValue( myDY ); // myRadius = 100.0; @@ -1147,7 +1147,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd() TopoDS_Shape myShape = aProfile.GetShape( &isDone ); if ( isDone ) { if ( myShape.ShapeType() != TopAbs_VERTEX ) - myCommand.append( ":WW" ); + myCommand.append( ":WW" ); } } else { diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index 6e1b0cefd..682dec272 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -739,7 +739,7 @@ void EntityGUI_SubShapeDlg::activateSelection() { TopoDS_Shape aSubShape = anExp.Current(); int index = aSubShapesMap.FindIndex(aSubShape); - QString anEntry = QString( "TEMP_" ) + anEntryBase + QString("_%1").arg(index); + QString anEntry = QString( "TEMP_" ) + anEntryBase + QString("_%1").arg(index); SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView); if (aPrs) { diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 993b0f10a..6f0addd83 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -773,7 +773,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, { TObjectData* data = aStEntry2ObjDataPtrIt->second; if ( data->_unpublished && !data->_pyName.IsEmpty() ) { - aScript += unpublishCmd + data->_pyName + ")"; + aScript += unpublishCmd + data->_pyName + ")"; } } @@ -1397,8 +1397,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand, if(MYDEBUG) cout<<"aParamIndex: "< Standard_EXPORT void BuildDraftSolid(const TopoDS_Shape& theSolid, - TopoDS_Shape& theDraftSolid, - TopTools_ListOfShape& theInternalFaces) ; + TopoDS_Shape& theDraftSolid, + TopTools_ListOfShape& theInternalFaces) ; NMTTools_PPaveFiller myPaveFiller; diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx index fce765fc8..deb1d9973 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx @@ -100,7 +100,7 @@ static static Standard_Boolean RefineShell(const TopoDS_Shell& , - TopoDS_Shell& ); + TopoDS_Shell& ); //======================================================================= //function : @@ -189,7 +189,7 @@ void GEOMAlgo_BuilderSolid::PerformShapesToAvoid() } /* else { - int a=0; + int a=0; } */ } @@ -396,7 +396,7 @@ void GEOMAlgo_BuilderSolid::PerformLoops() // bRefine=RefineShell(aShell, aShx); if (bRefine) { - myLoops.Append(aShx); + myLoops.Append(aShx); } } } // for (; aItF.More(); aItF.Next()) { @@ -640,8 +640,8 @@ void GEOMAlgo_BuilderSolid::PerformInternalShapes() { TopExp_Explorer aExp(aSolid, TopAbs_FACE); while (aExp.More()) { - aMFS.Add(aExp.Current()); - aExp.Next(); + aMFS.Add(aExp.Current()); + aExp.Next(); } } //modified by NIZNHY-PKV Wed Mar 07 08:52:20 2012t @@ -655,10 +655,10 @@ void GEOMAlgo_BuilderSolid::PerformInternalShapes() const TopoDS_Face& aF=*((TopoDS_Face*)(&aItMF.Key())); //modified by NIZNHY-PKV Wed Mar 07 08:54:56 2012f if (!aMFS.Contains(aF)) { - bFlag=GEOMAlgo_Tools3D::IsInternalFace(aF, aSolid, aMEF, 1.e-14, myContext); - if (bFlag) { - aMFP.Add(aF); - } + bFlag=GEOMAlgo_Tools3D::IsInternalFace(aF, aSolid, aMEF, 1.e-14, myContext); + if (bFlag) { + aMFP.Add(aF); + } } //if (GEOMAlgo_Tools3D::IsInternalFace(aF, aSolid, aMEF, 1.e-14, myContext)) { // aMFP.Add(aF); @@ -850,7 +850,7 @@ Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell) //purpose : //======================================================================= Standard_Boolean RefineShell(const TopoDS_Shell& aShell, - TopoDS_Shell& aShx) + TopoDS_Shell& aShx) { Standard_Boolean bRet; @@ -881,7 +881,7 @@ Standard_Boolean RefineShell(const TopoDS_Shell& aShell, const TopoDS_Face& aF1=*((TopoDS_Face*)(&aLF.First())); if (aNbF==1) { if (aOrE==TopAbs_INTERNAL) { - continue; + continue; } aMFx.Add(aF1); } @@ -889,14 +889,14 @@ Standard_Boolean RefineShell(const TopoDS_Shell& aShell, else if (aNbF==2) { const TopoDS_Face& aF2=*((TopoDS_Face*)(&aLF.Last())); if (aF2.IsSame(aF1)) { - if (BRep_Tool::IsClosed(aE, aF1)) { - continue; - } - if (aOrE==TopAbs_INTERNAL) { - continue; - } - aMFx.Add(aF1); - aMFx.Add(aF2); + if (BRep_Tool::IsClosed(aE, aF1)) { + continue; + } + if (aOrE==TopAbs_INTERNAL) { + continue; + } + aMFx.Add(aF1); + aMFx.Add(aF2); } } } diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx index 7a19831d4..8494ea7aa 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx @@ -40,7 +40,7 @@ class GEOMAlgo_BuilderTools public: Standard_EXPORT static Standard_Boolean IsHole(const TopoDS_Shape& aW, - const TopoDS_Shape& aF) ; + const TopoDS_Shape& aF) ; Standard_EXPORT static Standard_Boolean IsHole(const TopoDS_Shape& aShell) ; diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx index 65f6929a0..1d8d5b634 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx @@ -153,7 +153,7 @@ static //modified by NIZNHY-PKV Wed Oct 27 11:19:30 2010f aNbLB=aLB.Extent(); if (aIsCB && aNbLB<2) { - aIsCB=0; + aIsCB=0; } //modified by NIZNHY-PKV Wed Oct 27 11:19:34 2010t // diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx index d699f1dc8..4e1a8c6e7 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx @@ -103,8 +103,8 @@ static static Standard_Boolean IsClosed(const TopoDS_Edge& , - const TopoDS_Face&, - Standard_Boolean& ); + const TopoDS_Face&, + Standard_Boolean& ); //======================================================================= //function : FillImagesFaces @@ -347,15 +347,15 @@ void GEOMAlgo_Builder::BuildSplitFaces() } continue; }// if (bIsClosed){ - // - //modified by NIZNHY-PKV Wed Nov 28 13:50:34 2012f - if (!bIsClosed && bFlagClosed) { - if (!BRep_Tool::IsClosed(aSp, aF)){ - BOPTools_Tools3D::DoSplitSEAMOnFace(aSp, aF); - } - } - //modified by NIZNHY-PKV Wed Nov 28 13:50:36 2012t - // + // + //modified by NIZNHY-PKV Wed Nov 28 13:50:34 2012f + if (!bIsClosed && bFlagClosed) { + if (!BRep_Tool::IsClosed(aSp, aF)){ + BOPTools_Tools3D::DoSplitSEAMOnFace(aSp, aF); + } + } + //modified by NIZNHY-PKV Wed Nov 28 13:50:36 2012t + // // aSp.Orientation(anOriE); bToReverse=BOPTools_Tools3D::IsSplitToReverse1(aSp, aE, aCtx); @@ -612,7 +612,7 @@ void GEOMAlgo_Builder::FillSameDomainFaces() for (k=1; k<=aNbMFj; ++k) { const TopoDS_Shape& aFk=aMFj(k); if (!aDMSI.IsBound(aFk)) { - aDMSI.Bind(aFk, j); + aDMSI.Bind(aFk, j); } } } @@ -629,20 +629,20 @@ void GEOMAlgo_Builder::FillSameDomainFaces() bIsImage=mySplitFaces.IsImage(aFSD); aFOld=aFSD; if (bIsImage) { - aFOld=mySplitFaces.ImageFrom(aFSD); + aFOld=mySplitFaces.ImageFrom(aFSD); } // aIx=aDMSI.Find(aFOld); if (j==1) { - aIxMin=aIx; - aFSDmin=aFSD; - continue; + aIxMin=aIx; + aFSDmin=aFSD; + continue; } else { - if (aIx +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx index bf9628d8c..9618091c5 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx -// Created: Wed Feb 22 10:58:14 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx +// Created: Wed Feb 22 10:58:14 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx index ef00b3ed9..b83deb06b 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx -// Created: Wed Feb 22 11:01:34 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx +// Created: Wed Feb 22 11:01:34 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx index c572630b1..b8108d12f 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx -// Created: Wed Feb 22 10:53:47 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx +// Created: Wed Feb 22 10:53:47 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx index f51e2c7ff..a8fcb2f0d 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx -// Created: Wed Feb 22 11:08:26 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx +// Created: Wed Feb 22 11:08:26 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx index ce6ffea08..c463540ef 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx -// Created: Wed Feb 22 11:11:09 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx +// Created: Wed Feb 22 11:11:09 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx index aaf0d6bb1..35c07d904 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx -// Created: Wed Feb 22 10:49:11 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx +// Created: Wed Feb 22 10:49:11 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx index 413056ac9..17452053e 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx -// Created: Wed Feb 22 08:39:02 2012 +// File: GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx +// Created: Wed Feb 22 08:39:02 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx index aea60012f..a5884db1c 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfOrientedShapeShape.hxx -// Created: Wed Feb 22 11:03:36 2012 +// File: GEOMAlgo_DataMapOfOrientedShapeShape.hxx +// Created: Wed Feb 22 11:03:36 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx index 76edfb3a1..36c21ad03 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfPassKeyInteger.hxx -// Created: Wed Feb 22 10:55:55 2012 +// File: GEOMAlgo_DataMapOfPassKeyInteger.hxx +// Created: Wed Feb 22 10:55:55 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx index d410d2ae7..e3285b846 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfPassKeyShapeShape.hxx -// Created: Wed Feb 22 11:00:16 2012 +// File: GEOMAlgo_DataMapOfPassKeyShapeShape.hxx +// Created: Wed Feb 22 11:00:16 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx index 757dab3cc..d3ac84756 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfRealListOfShape.hxx -// Created: Wed Feb 22 10:51:48 2012 +// File: GEOMAlgo_DataMapOfRealListOfShape.hxx +// Created: Wed Feb 22 10:51:48 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx index 66d99621e..50836be36 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfShapeMapOfShape.hxx -// Created: Wed Feb 22 11:07:16 2012 +// File: GEOMAlgo_DataMapOfShapeMapOfShape.hxx +// Created: Wed Feb 22 11:07:16 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx index 204dcf708..73d653672 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfShapePnt.hxx -// Created: Wed Feb 22 11:10:15 2012 +// File: GEOMAlgo_DataMapOfShapePnt.hxx +// Created: Wed Feb 22 11:10:15 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx index 34d9f7baa..538b6c54c 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfShapeReal.hxx -// Created: Wed Feb 22 10:47:23 2012 +// File: GEOMAlgo_DataMapOfShapeReal.hxx +// Created: Wed Feb 22 10:47:23 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx index 3498b1c99..179a4d78c 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_DataMapOfShapeShapeSet.hxx -// Created: Wed Feb 22 08:36:15 2012 +// File: GEOMAlgo_DataMapOfShapeShapeSet.hxx +// Created: Wed Feb 22 08:36:15 2012 // Author: -// +// #ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx index 09caf37e2..2e010b6b0 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx @@ -81,9 +81,9 @@ class GEOMAlgo_FinderShapeOn : public GEOMAlgo_ShapeAlgo Standard_EXPORT static void CopySource(const TopoDS_Shape& aS, - TopTools_DataMapOfShapeShape& aImages, - TopTools_DataMapOfShapeShape& aOriginals, - TopoDS_Shape& aSC) ; + TopTools_DataMapOfShapeShape& aImages, + TopTools_DataMapOfShapeShape& aOriginals, + TopoDS_Shape& aSC) ; Standard_EXPORT static Standard_Boolean BuildTriangulation(const TopoDS_Shape& aS) ; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index 721d1c29f..23ed9c354 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -715,33 +715,33 @@ void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF, aHatcher.Trim(aIx); bIsDone=aHatcher.TrimDone(aIx); if (!bIsDone) { - myErrorStatus=42; - return; + myErrorStatus=42; + return; } // aHatcher.ComputeDomains(aIx); bIsDone=aHatcher.IsDone(aIx); if (!bIsDone) { - continue; + continue; } // aNbDomains=aHatcher.NbDomains(aIx); for (j=1; j<=aNbDomains; ++j) { - const HatchGen_Domain& aDomain=aHatcher.Domain (aIx, j) ; - // 1 - bHasFirstPoint=aDomain.HasFirstPoint(); - bHasSecondPoint=aDomain.HasSecondPoint(); - if (!bHasFirstPoint || !bHasSecondPoint) { - continue; - } - // 2 - aV1=aDomain.FirstPoint().Parameter(); - aV2=aDomain.SecondPoint().Parameter(); - aVx=IntTools_Tools::IntermediatePoint(aV1, aV2); - // 3 - aS->D0(aUx, aVx, aPx); - aLP.Append(aPx); - break; + const HatchGen_Domain& aDomain=aHatcher.Domain (aIx, j) ; + // 1 + bHasFirstPoint=aDomain.HasFirstPoint(); + bHasSecondPoint=aDomain.HasSecondPoint(); + if (!bHasFirstPoint || !bHasSecondPoint) { + continue; + } + // 2 + aV1=aDomain.FirstPoint().Parameter(); + aV2=aDomain.SecondPoint().Parameter(); + aVx=IntTools_Tools::IntermediatePoint(aV1, aV2); + // 3 + aS->D0(aUx, aVx, aPx); + aLP.Append(aPx); + break; } }// for (i=1; i @@ -66,22 +66,22 @@ static Standard_Integer PntInEdge(const TopoDS_Edge& aF, - gp_Pnt& aP); + gp_Pnt& aP); static Standard_Integer PntInEdge(const TopoDS_Edge& aF, - gp_Pnt& aP, - Standard_Real& aT); + gp_Pnt& aP, + Standard_Real& aT); static Standard_Integer PntInFace(const TopoDS_Face& aF, - gp_Pnt& aP); + gp_Pnt& aP); static Standard_Integer PntInFace(const TopoDS_Face& aF, - gp_Pnt& aP, - gp_Pnt2d& theP2D); + gp_Pnt& aP, + gp_Pnt2d& theP2D); static Standard_Integer PntInSolid(const TopoDS_Solid& aZ, - const Standard_Real aTol, - gp_Pnt& aP); + const Standard_Real aTol, + gp_Pnt& aP); //======================================================================= @@ -89,7 +89,7 @@ static //purpose : //======================================================================= Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2) + const TopoDS_Shape& aS2) { Standard_Boolean bOk; Standard_Integer iErr; @@ -157,11 +157,11 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1, aDmin=aPPC.LowerDistance(); aT=aPPC.LowerDistanceParameter(); if (aDmin < myTolerance) { - dT=1.e-12; - BRep_Tool::Curve(aE1, aT1, aT2); + dT=1.e-12; + BRep_Tool::Curve(aE1, aT1, aT2); if(aT > (aT1-dT) && aT < (aT2+dT)) { - bOk=Standard_True; - } + bOk=Standard_True; + } } } //else { @@ -197,7 +197,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1, //purpose : //======================================================================= Standard_Integer PntInEdge(const TopoDS_Edge& aE, - gp_Pnt& aP) + gp_Pnt& aP) { Standard_Integer iErr; @@ -212,8 +212,8 @@ Standard_Integer PntInEdge(const TopoDS_Edge& aE, //purpose : //======================================================================= Standard_Integer PntInEdge(const TopoDS_Edge& aE, - gp_Pnt& aP, - Standard_Real& aT) + gp_Pnt& aP, + Standard_Real& aT) { Standard_Integer iErr; Standard_Real aT1, aT2; @@ -232,8 +232,8 @@ Standard_Integer PntInEdge(const TopoDS_Edge& aE, //purpose : //======================================================================= Standard_Integer PntInSolid(const TopoDS_Solid& aZ, - const Standard_Real aTol, - gp_Pnt& aP) + const Standard_Real aTol, + gp_Pnt& aP) { Standard_Integer iErr; Standard_Real aUx, aVx, aCoef; @@ -271,7 +271,7 @@ Standard_Integer PntInSolid(const TopoDS_Solid& aZ, //purpose : //======================================================================= Standard_Integer PntInFace(const TopoDS_Face& aF, - gp_Pnt& aP) + gp_Pnt& aP) { Standard_Integer iErr; // @@ -286,8 +286,8 @@ Standard_Integer PntInFace(const TopoDS_Face& aF, //purpose : //======================================================================= Standard_Integer PntInFace(const TopoDS_Face& aF, - gp_Pnt& theP, - gp_Pnt2d& theP2D) + gp_Pnt& theP, + gp_Pnt2d& theP2D) { Standard_Boolean bIsDone, bHasFirstPoint, bHasSecondPoint; Standard_Integer iErr, aIx, aNbDomains, i; @@ -312,8 +312,8 @@ Standard_Integer PntInFace(const TopoDS_Face& aF, // Geom2dHatch_Intersector aIntr(aTotArcIntr, aTolTangfIntr); Geom2dHatch_Hatcher aHatcher(aIntr, - aTolHatch2D, aTolHatch3D, - Standard_True, Standard_False); + aTolHatch2D, aTolHatch3D, + Standard_True, Standard_False); // iErr=0; aEpsT=1.e-12; diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx index a4f4d2aa5..f21ba165b 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_GetInPlace_2.cxx +// File: GEOMAlgo_GetInPlace_2.cxx // Created: -// Author: Peter KURNEV +// Author: Peter KURNEV #include @@ -51,7 +51,7 @@ static Standard_Integer Dimension(const TopAbs_ShapeEnum aType); static void PointProperties(const TopoDS_Shape& aS, - GProp_GProps& aGProps); + GProp_GProps& aGProps); //======================================================================= //function : CheckGProps @@ -87,7 +87,7 @@ void GEOMAlgo_GetInPlace::CheckGProps(const TopoDS_Shape& aS1) const TopoDS_Shape& aS1x=aIt.Value(); CheckGProps(aS1x); if (!myFound) { - return; + return; } } } diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx index 793cb306f..1dcf1021b 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_GetInPlaceIterator.cxx +// File: GEOMAlgo_GetInPlaceIterator.cxx // Created: -// Author: Peter KURNEV +// Author: Peter KURNEV #include @@ -29,7 +29,7 @@ static Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2); + const TopAbs_ShapeEnum aType2); //======================================================================= //function : @@ -82,7 +82,7 @@ void GEOMAlgo_GetInPlaceIterator::AppendPair(const NMTTools_CoupleOfShape& theCS //purpose : //======================================================================= void GEOMAlgo_GetInPlaceIterator::Initialize(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2) + const TopAbs_ShapeEnum aType2) { Standard_Integer iX; // @@ -123,7 +123,7 @@ const NMTTools_CoupleOfShape& GEOMAlgo_GetInPlaceIterator::Value()const //purpose : //======================================================================= Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2) + const TopAbs_ShapeEnum aType2) { Standard_Integer iRet; // diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index fbb560ab9..88f1c6d8f 100755 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -20,10 +20,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_Gluer.cxx -// Created: Sat Dec 04 12:45:53 2004 -// Author: Peter KURNEV -// +// File: GEOMAlgo_Gluer.cxx +// Created: Sat Dec 04 12:45:53 2004 +// Author: Peter KURNEV +// // #include @@ -96,7 +96,7 @@ // static void GetSubShapes(const TopoDS_Shape& aS, - TopTools_IndexedMapOfShape& aMSS); + TopTools_IndexedMapOfShape& aMSS); //======================================================================= //function : GEOMAlgo_Gluer @@ -278,53 +278,53 @@ void GEOMAlgo_Gluer::MakeVertices() aNbIP=aMIP.Extent(); aIt1.Initialize(aMIP); for(; aIt1.More(); aIt1.Next()) { - aIP=aIt1.Key(); - if (aMIPC.Contains(aIP)) { - continue; - } - // - const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP); - //modified by NIZNHY-PKV Thu Jan 21 10:04:09 2010f - const NMTDS_BndSphere& aBoxVP=aMSB.FindFromKey(aVP); - //const Bnd_Box& aBoxVP=aMSB.FindFromKey(aVP); - //modified by NIZNHY-PKV Thu Jan 21 10:04:11 2010t - // - aSelector.Clear(); - aSelector.SetBox(aBoxVP); - // - aNbVSD=aBBTree.Select(aSelector); - if (!aNbVSD) { - continue; // it must not be - } - // - const TColStd_ListOfInteger& aLI=aSelector.Indices(); - // - aIt.Initialize(aLI); - for (; aIt.More(); aIt.Next()) { - aIP1=aIt.Value(); - if (aMIP.Contains(aIP1)) { - continue; - } - aMIP1.Add(aIP1); - } //for (; aIt.More(); aIt.Next()) { + aIP=aIt1.Key(); + if (aMIPC.Contains(aIP)) { + continue; + } + // + const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP); + //modified by NIZNHY-PKV Thu Jan 21 10:04:09 2010f + const NMTDS_BndSphere& aBoxVP=aMSB.FindFromKey(aVP); + //const Bnd_Box& aBoxVP=aMSB.FindFromKey(aVP); + //modified by NIZNHY-PKV Thu Jan 21 10:04:11 2010t + // + aSelector.Clear(); + aSelector.SetBox(aBoxVP); + // + aNbVSD=aBBTree.Select(aSelector); + if (!aNbVSD) { + continue; // it must not be + } + // + const TColStd_ListOfInteger& aLI=aSelector.Indices(); + // + aIt.Initialize(aLI); + for (; aIt.More(); aIt.Next()) { + aIP1=aIt.Value(); + if (aMIP.Contains(aIP1)) { + continue; + } + aMIP1.Add(aIP1); + } //for (; aIt.More(); aIt.Next()) { }//for(; aIt1.More(); aIt1.Next()) { // aNbIP1=aMIP1.Extent(); if (!aNbIP1) { - break; + break; } // aIt1.Initialize(aMIP); for(; aIt1.More(); aIt1.Next()) { - aIP=aIt1.Key(); - aMIPC.Add(aIP); + aIP=aIt1.Key(); + aMIPC.Add(aIP); } // aMIP.Clear(); aIt1.Initialize(aMIP1); for(; aIt1.More(); aIt1.Next()) { - aIP=aIt1.Key(); - aMIP.Add(aIP); + aIP=aIt1.Key(); + aMIP.Add(aIP); } aMIP1.Clear(); }// while(1) @@ -340,13 +340,13 @@ void GEOMAlgo_Gluer::MakeVertices() else { // SD vertices founded [ aMIPC ] aIt1.Initialize(aMIPC); for(j=0; aIt1.More(); aIt1.Next(), ++j) { - aIP=aIt1.Key(); - const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP); - if (!j) { - aVF=aVP; - } - aLVSD.Append(aVP); - aMVProcessed.Add(aVP); + aIP=aIt1.Key(); + const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP); + if (!j) { + aVF=aVP; + } + aLVSD.Append(aVP); + aMVProcessed.Add(aVP); } } myImages.Bind(aVF, aLVSD); @@ -391,7 +391,7 @@ void GEOMAlgo_Gluer::MakeVertices() for (; aItS.More(); aItS.Next()) { const TopoDS_Shape& aVSD=aItS.Value(); if (!myOrigins.IsBound(aVSD)) { - myOrigins.Bind(aVSD, aV); + myOrigins.Bind(aVSD, aV); } } } @@ -556,12 +556,12 @@ void GEOMAlgo_Gluer::MakeShells() const TopoDS_Face& aF=TopoDS::Face(aExp.Current()); aFR=TopoDS::Face(myOrigins.Find(aF)); if (aFR.IsSame(aF)) { - aBB.Add(aNewShell, aF); - continue; + aBB.Add(aNewShell, aF); + continue; } bIsToReverse=IsToReverse(aFR, aF); if (bIsToReverse) { - aFR.Reverse(); + aFR.Reverse(); } aBB.Add(aNewShell, aFR); } @@ -662,25 +662,25 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType) if (aNbSDF==1) { bHasNewSubShape=HasNewSubShape(aS1); if (!bHasNewSubShape) { - aNewShape=aS1; - aNewShape.Orientation(TopAbs_FORWARD); + aNewShape=aS1; + aNewShape.Orientation(TopAbs_FORWARD); } } // if (bHasNewSubShape) { if (aType==TopAbs_FACE) { - TopoDS_Face aNewFace; - // - const TopoDS_Face& aF1=TopoDS::Face(aS1); - MakeFace(aF1, aNewFace); - aNewShape=aNewFace; + TopoDS_Face aNewFace; + // + const TopoDS_Face& aF1=TopoDS::Face(aS1); + MakeFace(aF1, aNewFace); + aNewShape=aNewFace; } else if (aType==TopAbs_EDGE) { - TopoDS_Edge aNewEdge; - // - const TopoDS_Edge& aE1=TopoDS::Edge(aS1); - MakeEdge(aE1, aNewEdge); - aNewShape=aNewEdge; + TopoDS_Edge aNewEdge; + // + const TopoDS_Edge& aE1=TopoDS::Edge(aS1); + MakeEdge(aE1, aNewEdge); + aNewShape=aNewEdge; } } // @@ -690,7 +690,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType) for (; aItS.More(); aItS.Next()) { const TopoDS_Shape& aFSD=aItS.Value(); if (!myOrigins.IsBound(aFSD)) { - myOrigins.Bind(aFSD, aNewShape); + myOrigins.Bind(aFSD, aNewShape); } } } @@ -730,12 +730,12 @@ void GEOMAlgo_Gluer::CheckResult() for (j=1; j<=aNbFS; ++j) { const TopoDS_Shape& aFS=aMFS(j); if (aMFR.Contains(aFS)) { - const TopTools_ListOfShape& aLSx=aMFR.FindFromKey(aFS); - aNbSx=aLSx.Extent(); - if (aNbSx==2) { - bFound=!bFound; - break; - } + const TopTools_ListOfShape& aLSx=aMFR.FindFromKey(aFS); + aNbSx=aLSx.Extent(); + if (aNbSx==2) { + bFound=!bFound; + break; + } } } // @@ -797,7 +797,7 @@ void GEOMAlgo_Gluer::InnerTolerance() //purpose : //======================================================================= void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF, - GEOMAlgo_PassKeyShape& aPK) + GEOMAlgo_PassKeyShape& aPK) { Standard_Integer i, aNbE; TopTools_ListOfShape aLE; @@ -822,7 +822,7 @@ void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF, //purpose : //======================================================================= void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE, - GEOMAlgo_PassKeyShape& aPK) + GEOMAlgo_PassKeyShape& aPK) { TopoDS_Vertex aV1, aV2; // @@ -841,7 +841,7 @@ void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE, //purpose : //======================================================================= void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV, - TopoDS_Vertex& aNewVertex) + TopoDS_Vertex& aNewVertex) { Standard_Integer aNbV; Standard_Real aTolV, aD, aDmax; @@ -887,7 +887,7 @@ void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV, //purpose : //======================================================================= void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE, - TopoDS_Edge& aNewEdge) + TopoDS_Edge& aNewEdge) { myErrorStatus=0; // @@ -941,7 +941,7 @@ void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE, //purpose : //======================================================================= void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF, - TopoDS_Face& aNewFace) + TopoDS_Face& aNewFace) { myErrorStatus=0; // @@ -977,20 +977,20 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF, // aER.Orientation(TopAbs_FORWARD); if (!BRep_Tool::Degenerated(aER)) { - // build p-curve - if (bIsUPeriodic) { - GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax); - } - BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD); + // build p-curve + if (bIsUPeriodic) { + GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax); + } + BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD); - // orient image - bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext); - if (bIsToReverse) { - aER.Reverse(); - } + // orient image + bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext); + if (bIsToReverse) { + aER.Reverse(); + } } else { - aER.Orientation(aE.Orientation()); + aER.Orientation(aE.Orientation()); } // aBB.Add(newWire, aER); @@ -1011,7 +1011,7 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF, //purpose : //======================================================================= Standard_Boolean GEOMAlgo_Gluer::IsToReverse(const TopoDS_Face& aFR, - const TopoDS_Face& aF) + const TopoDS_Face& aF) { Standard_Boolean bRet; Standard_Real aT, aT1, aT2, aTR, aScPr; @@ -1090,7 +1090,7 @@ Standard_Boolean GEOMAlgo_Gluer::HasNewSubShape(const TopoDS_Shape& aS)const //purpose : //======================================================================= void GetSubShapes(const TopoDS_Shape& aS, - TopTools_IndexedMapOfShape& aMSS) + TopTools_IndexedMapOfShape& aMSS) { Standard_Integer aR; TopAbs_ShapeEnum aType; @@ -1129,7 +1129,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS) if(myOrigins.IsBound(aS)) { const TopoDS_Shape& aSnew=myOrigins.Find(aS); if (!aSnew.IsSame(aS)) { - myGenerated.Append(aSnew); + myGenerated.Append(aSnew); } } } diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx index f8d74f7ff..a8390d1e5 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx @@ -21,10 +21,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_Gluer.hxx -// Created: Sat Dec 04 12:45:53 2004 -// Author: Peter KURNEV -// +// File: GEOMAlgo_Gluer.hxx +// Created: Sat Dec 04 12:45:53 2004 +// Author: Peter KURNEV +// // #ifndef _GEOMAlgo_Gluer_HeaderFile #define _GEOMAlgo_Gluer_HeaderFile @@ -122,35 +122,35 @@ public: Standard_EXPORT void EdgePassKey(const TopoDS_Edge& aE, - GEOMAlgo_PassKeyShape& aPK) ; + GEOMAlgo_PassKeyShape& aPK) ; Standard_EXPORT void FacePassKey(const TopoDS_Face& aF, - GEOMAlgo_PassKeyShape& aPK) ; + GEOMAlgo_PassKeyShape& aPK) ; Standard_EXPORT void MakeVertex(const TopTools_ListOfShape& aLV, - TopoDS_Vertex& aNewV) ; + TopoDS_Vertex& aNewV) ; Standard_EXPORT void MakeEdge(const TopoDS_Edge& aEdge, - TopoDS_Edge& aNewEdge) ; + TopoDS_Edge& aNewEdge) ; Standard_EXPORT void MakeFace(const TopoDS_Face& aFace, - TopoDS_Face& aNewEdge) ; + TopoDS_Face& aNewEdge) ; Standard_EXPORT Standard_Boolean IsToReverse(const TopoDS_Face& aFR, - const TopoDS_Face& aF) ; + const TopoDS_Face& aF) ; Standard_EXPORT Standard_Boolean HasNewSubShape(const TopoDS_Shape& aS) const; Standard_EXPORT void MakeSubShapes(const TopoDS_Shape& aS, - TopTools_MapOfShape& aM, - TopoDS_Compound& aC) ; + TopTools_MapOfShape& aM, + TopoDS_Compound& aC) ; Standard_Boolean myCheckGeometry; diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx index 8a218d4d1..1fc5687d6 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx @@ -19,10 +19,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_Gluer2_2.cxx +// File: GEOMAlgo_Gluer2_2.cxx // Created: -// Author: Peter KURNEV -// +// Author: Peter KURNEV +// // #include @@ -75,7 +75,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer2::Modified(const TopoDS_Shape& theS) // aType=theS.ShapeType(); if (!(aType==TopAbs_VERTEX || aType==TopAbs_EDGE || - aType==TopAbs_FACE || aType==TopAbs_SOLID)) { + aType==TopAbs_FACE || aType==TopAbs_SOLID)) { return myHistShapes; } // @@ -143,7 +143,7 @@ Standard_Boolean GEOMAlgo_Gluer2::IsDeleted(const TopoDS_Shape& theS) //purpose : //======================================================================= void GEOMAlgo_Gluer2::MapShapes(const TopoDS_Shape& theS, - TopTools_MapOfShape& theM) + TopTools_MapOfShape& theM) { TopoDS_Iterator aIt; // diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx index 24b680085..e0b8473b7 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx @@ -19,10 +19,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_GluerAlgo.cxx +// File: GEOMAlgo_GluerAlgo.cxx // Created: -// Author: Peter KURNEV -// +// Author: Peter KURNEV +// // #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx index b480d6464..f532d52b6 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_IndexedDataMapOfIntegerShape.hxx -// Created: Wed Feb 22 11:22:18 2012 +// File: GEOMAlgo_IndexedDataMapOfIntegerShape.hxx +// Created: Wed Feb 22 11:22:18 2012 // Author: -// +// #ifndef GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx index 3b5076b12..4499b3be3 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx -// Created: Wed Feb 22 11:24:27 2012 +// File: GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx +// Created: Wed Feb 22 11:24:27 2012 // Author: -// +// #ifndef GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx index ac7ca6484..8f333dc09 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_IndexedDataMapOfShapeBox.hxx -// Created: Wed Feb 22 11:14:14 2012 +// File: GEOMAlgo_IndexedDataMapOfShapeBox.hxx +// Created: Wed Feb 22 11:14:14 2012 // Author: -// +// #ifndef GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx index 33581c1df..4496dccf2 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx -// Created: Wed Feb 22 11:16:54 2012 +// File: GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx +// Created: Wed Feb 22 11:16:54 2012 // Author: -// +// #ifndef GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx index b11597b5b..4907611f8 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx @@ -33,10 +33,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_IndexedDataMapOfShapeState.hxx -// Created: Wed Feb 22 11:19:56 2012 +// File: GEOMAlgo_IndexedDataMapOfShapeState.hxx +// Created: Wed Feb 22 11:19:56 2012 // Author: -// +// #ifndef GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx index 1d945d314..28c121684 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx -// Created: Wed Feb 22 08:26:34 2012 +// File: GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx +// Created: Wed Feb 22 08:26:34 2012 // Author: -// +// #ifndef GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile #define GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx index dafb123b2..65d878e91 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ListIteratorOfListOfPnt.hxx -// Created: Wed Feb 22 08:33:12 2012 +// File: GEOMAlgo_ListIteratorOfListOfPnt.hxx +// Created: Wed Feb 22 08:33:12 2012 // Author: -// +// #ifndef GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx index d2bca1b0d..ffa570c53 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ListOfCoupleOfShapes.hxx -// Created: Wed Feb 22 08:23:27 2012 +// File: GEOMAlgo_ListOfCoupleOfShapes.hxx +// Created: Wed Feb 22 08:23:27 2012 // Author: -// +// #ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile #define GEOMAlgo_ListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx index d584df0c6..8da50de23 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ListOfPnt.hxx -// Created: Wed Feb 22 08:31:47 2012 +// File: GEOMAlgo_ListOfPnt.hxx +// Created: Wed Feb 22 08:31:47 2012 // Author: -// +// #ifndef GEOMAlgo_ListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx index 888540471..87fba9a40 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx @@ -65,18 +65,18 @@ class GEOMAlgo_PassKey { Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2) ; + const Standard_Integer aI2) ; Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2, - const Standard_Integer aI3) ; + const Standard_Integer aI2, + const Standard_Integer aI3) ; Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2, - const Standard_Integer aI3, - const Standard_Integer aI4) ; + const Standard_Integer aI2, + const Standard_Integer aI3, + const Standard_Integer aI4) ; Standard_EXPORT void SetIds(const TColStd_ListOfInteger& aLS) ; diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx index 8bcb31efe..22f3a9bf0 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx @@ -42,10 +42,10 @@ class GEOMAlgo_PassKeyMapHasher { public: Standard_EXPORT static Standard_Integer HashCode(const GEOMAlgo_PassKey& aPKey, - const Standard_Integer Upper) ; + const Standard_Integer Upper) ; Standard_EXPORT static Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aPKey1, - const GEOMAlgo_PassKey& aPKey2) ; + const GEOMAlgo_PassKey& aPKey2) ; }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx index fecb08417..8ea6cb84a 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx @@ -65,18 +65,18 @@ class GEOMAlgo_PassKeyShape { Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2) ; + const TopoDS_Shape& aS2) ; Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2, - const TopoDS_Shape& aS3) ; + const TopoDS_Shape& aS2, + const TopoDS_Shape& aS3) ; Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2, - const TopoDS_Shape& aS3, - const TopoDS_Shape& aS4) ; + const TopoDS_Shape& aS2, + const TopoDS_Shape& aS3, + const TopoDS_Shape& aS4) ; Standard_EXPORT void SetShapes(const TopTools_ListOfShape& aLS) ; diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx index 7cb5d41e9..8b3ad711b 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx @@ -43,10 +43,10 @@ class GEOMAlgo_PassKeyShapeMapHasher public: Standard_EXPORT static Standard_Integer HashCode(const GEOMAlgo_PassKeyShape& aPKey, - const Standard_Integer Upper) ; + const Standard_Integer Upper) ; Standard_EXPORT static Standard_Boolean IsEqual(const GEOMAlgo_PassKeyShape& aPKey1, - const GEOMAlgo_PassKeyShape& aPKey2) ; + const GEOMAlgo_PassKeyShape& aPKey2) ; }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx index b8603b056..077af539c 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx @@ -150,10 +150,10 @@ void GEOMAlgo_RemoverWebs::BuildSolid() const TopTools_ListOfShape& aLSx=aMFS(i); aNbSx=aLSx.Extent(); if (aNbSx==1) { - aSFS.Append(aFx); + aSFS.Append(aFx); } else if (aNbSx==2) { - ++aNbF2; + ++aNbF2; } } } @@ -172,10 +172,10 @@ void GEOMAlgo_RemoverWebs::BuildSolid() for (; aIt2.More(); aIt2.Next()) { const TopoDS_Shape& aSi=aIt2.Value(); if (aSi.ShapeType()!=TopAbs_SHELL) { - aOr=aSi.Orientation(); - if (aOr==TopAbs_INTERNAL) { - aMSI.Add(aSi); - } + aOr=aSi.Orientation(); + if (aOr==TopAbs_INTERNAL) { + aMSI.Add(aSi); + } } } } @@ -212,7 +212,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() //purpose : //======================================================================= void GEOMAlgo_RemoverWebs::AddInternalShapes(const TopTools_ListOfShape& aLSR, - const TopTools_IndexedMapOfShape& aMSI) + const TopTools_IndexedMapOfShape& aMSI) { Standard_Integer i, aNbSI; TopAbs_State aState; @@ -233,10 +233,10 @@ void GEOMAlgo_RemoverWebs::AddInternalShapes(const TopTools_ListOfShape& aLSR, // aState=GEOMAlgo_Tools3D::ComputeStateByOnePoint(aSI, aSd, 1.e-11, aCtx); if (aState==TopAbs_IN) { - aBB.Add(aSd, aSI); - // - BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSd); - aSC.Load(aSd); + aBB.Add(aSd, aSI); + // + BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSd); + aSC.Load(aSd); } } } diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx index 575a5fdcf..57e1d904c 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx @@ -68,7 +68,7 @@ protected: Standard_EXPORT static void AddInternalShapes(const TopTools_ListOfShape& , - const TopTools_IndexedMapOfShape& ); + const TopTools_IndexedMapOfShape& ); // }; diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx index 0d88c9fce..d8b1e5aef 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx @@ -56,36 +56,36 @@ class GEOMAlgo_SurfaceTools Standard_EXPORT static Standard_Boolean IsCoaxial(const gp_Pnt& aP1, - const gp_Pnt& aP2, - const gp_Cylinder& aCyl, - const Standard_Real aTol) ; + const gp_Pnt& aP2, + const gp_Cylinder& aCyl, + const Standard_Real aTol) ; Standard_EXPORT static Standard_Boolean IsConformState(const TopAbs_State aST1, - const GEOMAlgo_State aST2) ; + const GEOMAlgo_State aST2) ; Standard_EXPORT static Standard_Integer GetState(const gp_Pnt& aP, - const GeomAdaptor_Surface& aS, - const Standard_Real aTol,TopAbs_State& aSt) ; + const GeomAdaptor_Surface& aS, + const Standard_Real aTol,TopAbs_State& aSt) ; Standard_EXPORT static Standard_Integer GetState(const gp_Pnt& aP, - const Handle(Geom_Surface)& aS, - const Standard_Real aTol, - TopAbs_State& aSt) ; + const Handle(Geom_Surface)& aS, + const Standard_Real aTol, + TopAbs_State& aSt) ; Standard_EXPORT static Standard_Real Distance(const gp_Pnt& aP, - const gp_Pln& aPln) ; + const gp_Pln& aPln) ; Standard_EXPORT static Standard_Real Distance(const gp_Pnt& aP, - const gp_Cylinder& aCyl) ; + const gp_Cylinder& aCyl) ; Standard_EXPORT static Standard_Real Distance(const gp_Pnt& aP, - const gp_Sphere& aSph) ; + const gp_Sphere& aSph) ; Standard_EXPORT static TopAbs_State ReverseState(const TopAbs_State aSt) ; diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.hxx b/src/GEOMAlgo/GEOMAlgo_Tools.hxx index 8ed8d2471..cc9742b4b 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.hxx @@ -56,54 +56,54 @@ public: Standard_EXPORT static Standard_Integer RefineSDShapes(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD, - const Standard_Real aTol, - const Handle(IntTools_Context)& aCtx) ; + const Standard_Real aTol, + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE, - const Standard_Real aTol, - TopTools_IndexedDataMapOfShapeListOfShape& aMEE, - const Handle(IntTools_Context)& aCtx) ; + const Standard_Real aTol, + TopTools_IndexedDataMapOfShapeListOfShape& aMEE, + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1, - const TopTools_ListOfShape& aLE, - const Standard_Real aTol, - TopTools_ListOfShape& aLESD, - const Handle(IntTools_Context)& aCtx) ; + const TopTools_ListOfShape& aLE, + const Standard_Real aTol, + TopTools_ListOfShape& aLESD, + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1, - const TopoDS_Shape& aS,gp_Pnt& aP2, - const Handle(IntTools_Context)& aCtx) ; + const TopoDS_Shape& aS,gp_Pnt& aP2, + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void PointOnShape(const TopoDS_Shape& aS, - gp_Pnt& aP3D) ; + gp_Pnt& aP3D) ; Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE, - gp_Pnt& aP3D) ; + gp_Pnt& aP3D) ; Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE, - const Standard_Real aT,gp_Pnt& aP3D) ; + const Standard_Real aT,gp_Pnt& aP3D) ; Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF, - gp_Pnt& aP3D) ; + gp_Pnt& aP3D) ; Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF, - const Standard_Real aU, - const Standard_Real aV, - gp_Pnt& aP3D) ; + const Standard_Real aU, + const Standard_Real aV, + gp_Pnt& aP3D) ; Standard_EXPORT static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE, - const TopoDS_Face& aF, - const Standard_Real aU1, - const Standard_Real aU2) ; + const TopoDS_Face& aF, + const Standard_Real aU1, + const Standard_Real aU2) ; Standard_EXPORT static Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS) ; @@ -113,9 +113,9 @@ public: Standard_EXPORT static Standard_Integer BuildPCurveForEdgeOnFace(const TopoDS_Edge& aE, - const TopoDS_Edge& aEold, - const TopoDS_Face& aF, - const Handle(IntTools_Context)& aCtx) ; + const TopoDS_Edge& aEold, + const TopoDS_Face& aF, + const Handle(IntTools_Context)& aCtx) ; }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx index 664f59dfa..c49ebdda3 100755 --- a/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx @@ -1185,8 +1185,8 @@ void GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aEx, //purpose : //======================================================================= Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF, - gp_Pnt& theP, - gp_Pnt2d& theP2D) + gp_Pnt& theP, + gp_Pnt2d& theP2D) { Standard_Boolean bIsDone, bHasFirstPoint, bHasSecondPoint; Standard_Integer iErr, aIx, aNbDomains, i; @@ -1211,8 +1211,8 @@ Standard_Integer GEOMAlgo_Tools3D::PntInFace(const TopoDS_Face& aF, // Geom2dHatch_Intersector aIntr(aTotArcIntr, aTolTangfIntr); Geom2dHatch_Hatcher aHatcher(aIntr, - aTolHatch2D, aTolHatch3D, - Standard_True, Standard_False); + aTolHatch2D, aTolHatch3D, + Standard_True, Standard_False); // iErr=0; aEpsT=1.e-12; diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx index 6dd63c8d0..f5fcd32cd 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx @@ -60,8 +60,8 @@ class GEOMAlgo_Tools3D { //! theContext - cashed geometrical tools
Standard_EXPORT static Standard_Boolean IsSplitToReverse(const TopoDS_Shape& theSplit, - const TopoDS_Shape& theShape, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Shape& theShape, + const Handle(IntTools_Context)& theContext) ; //! Returns True if normal direction of the face
//! theShape is not the same as for the face
@@ -69,8 +69,8 @@ class GEOMAlgo_Tools3D { //! theContext - cashed geometrical tools
Standard_EXPORT static Standard_Boolean IsSplitToReverse(const TopoDS_Face& theSplit, - const TopoDS_Face& theShape, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Face& theShape, + const Handle(IntTools_Context)& theContext) ; //! Returns True if tangent direction of the edge
//! theEdge is not the same as for the edge
@@ -78,8 +78,8 @@ class GEOMAlgo_Tools3D { //! theContext - cashed geometrical tools
Standard_EXPORT static Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theEdge, - const TopoDS_Edge& theSplit, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Edge& theSplit, + const Handle(IntTools_Context)& theContext) ; //! For the couple of faces theF1, theF2
//! computes sense value
@@ -88,18 +88,18 @@ class GEOMAlgo_Tools3D { //! Returns 2 if the faces have opposite sense
Standard_EXPORT static Standard_Integer Sense(const TopoDS_Face& theF1, - const TopoDS_Face& theF2) ; + const TopoDS_Face& theF2) ; //! Makes new face theF2 from surface and wires
//! of the face theF1
Standard_EXPORT static void CopyFace(const TopoDS_Face& theF1, - TopoDS_Face& theF2) ; + TopoDS_Face& theF2) ; //! Makes empty shape theShape of the type theType
Standard_EXPORT static void MakeContainer(const TopAbs_ShapeEnum theType, - TopoDS_Shape& theShape) ; + TopoDS_Shape& theShape) ; //! For the list of faces theLS build block
//! theLSCB in terms of connexity by edges
@@ -107,8 +107,8 @@ class GEOMAlgo_Tools3D { //! the treatment
Standard_EXPORT static void MakeConnexityBlock(const TopTools_ListOfShape& theLS, - const TopTools_IndexedMapOfShape& theMapAvoid, - TopTools_ListOfShape& theLSCB) ; + const TopTools_IndexedMapOfShape& theMapAvoid, + TopTools_ListOfShape& theLSCB) ; //! Computes the 3-D state of the shape theShape
//! toward solid theSolid.
@@ -117,9 +117,9 @@ class GEOMAlgo_Tools3D { //! Returns 3-D state.
Standard_EXPORT static TopAbs_State ComputeStateByOnePoint(const TopoDS_Shape& theShape, - const TopoDS_Solid& theSolid, - const Standard_Real theTol, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const Standard_Real theTol, + const Handle(IntTools_Context)& theContext) ; //! Computes the 3-D state of the point thePoint
//! toward solid theSolid.
@@ -128,9 +128,9 @@ class GEOMAlgo_Tools3D { //! Returns 3-D state.
Standard_EXPORT static TopAbs_State ComputeState(const gp_Pnt& thePoint, - const TopoDS_Solid& theSolid, - const Standard_Real theTol, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const Standard_Real theTol, + const Handle(IntTools_Context)& theContext) ; //! Computes the 3-D state of the vertex theVertex
//! toward solid theSolid.
@@ -139,9 +139,9 @@ class GEOMAlgo_Tools3D { //! Returns 3-D state.
Standard_EXPORT static TopAbs_State ComputeState(const TopoDS_Vertex& theVertex, - const TopoDS_Solid& theSolid, - const Standard_Real theTol, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const Standard_Real theTol, + const Handle(IntTools_Context)& theContext) ; //! Computes the 3-D state of the edge theEdge
//! toward solid theSolid.
@@ -150,9 +150,9 @@ class GEOMAlgo_Tools3D { //! Returns 3-D state.
Standard_EXPORT static TopAbs_State ComputeState(const TopoDS_Edge& theEdge, - const TopoDS_Solid& theSolid, - const Standard_Real theTol, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const Standard_Real theTol, + const Handle(IntTools_Context)& theContext) ; //! Computes the 3-D state of the face theFace
//! toward solid theSolid.
@@ -162,10 +162,10 @@ class GEOMAlgo_Tools3D { //! Returns 3-D state.
Standard_EXPORT static TopAbs_State ComputeState(const TopoDS_Face& theFace, - const TopoDS_Solid& theSolid, - const Standard_Real theTol, - const TopTools_IndexedMapOfShape& theBounds, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const Standard_Real theTol, + const TopTools_IndexedMapOfShape& theBounds, + const Handle(IntTools_Context)& theContext) ; //! Returns True if the face theFace is inside of the
//! couple of faces theFace1, theFace2.
@@ -173,10 +173,10 @@ class GEOMAlgo_Tools3D { //! share the edge theEdge
Standard_EXPORT static Standard_Boolean IsInternalFace(const TopoDS_Face& theFace, - const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace1, - const TopoDS_Face& theFace2, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Edge& theEdge, + const TopoDS_Face& theFace1, + const TopoDS_Face& theFace2, + const Handle(IntTools_Context)& theContext) ; //! Returns True if the face theFace is inside of the
//! appropriate couple of faces (from the set theLF) .
@@ -184,9 +184,9 @@ class GEOMAlgo_Tools3D { //! share the edge theEdge
Standard_EXPORT static Standard_Boolean IsInternalFace(const TopoDS_Face& theFace, - const TopoDS_Edge& theEdge, - const TopTools_ListOfShape& theLF, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Edge& theEdge, + const TopTools_ListOfShape& theLF, + const Handle(IntTools_Context)& theContext) ; //! Returns True if the face theFace is inside the
//! solid theSolid.
@@ -195,10 +195,10 @@ class GEOMAlgo_Tools3D { //! theContext- cahed geometrical tools
Standard_EXPORT static Standard_Boolean IsInternalFace(const TopoDS_Face& theFace, - const TopoDS_Solid& theSolid, - const TopTools_IndexedDataMapOfShapeListOfShape& theMEF, - const Standard_Real theTol, - const Handle(IntTools_Context)& theContext) ; + const TopoDS_Solid& theSolid, + const TopTools_IndexedDataMapOfShapeListOfShape& theMEF, + const Standard_Real theTol, + const Handle(IntTools_Context)& theContext) ; //! For the face theFace and its edge theEdge
//! finds the face suitable to produce shell.
@@ -206,9 +206,9 @@ class GEOMAlgo_Tools3D { //! from theLCEF must share edge theEdge
Standard_EXPORT static void GetFaceOff(const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace, - const NMTTools_ListOfCoupleOfShape& theLCEF, - TopoDS_Face& theFaceOff) ; + const TopoDS_Face& theFace, + const NMTTools_ListOfCoupleOfShape& theLCEF, + TopoDS_Face& theFaceOff) ; //! For the face theFace gets the edge theEdgeOnF
//! that is the same as theEdge
@@ -216,8 +216,8 @@ class GEOMAlgo_Tools3D { //! Returns False if there is no such edge
Standard_EXPORT static Standard_Boolean GetEdgeOnFace(const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace, - TopoDS_Edge& theEdgeOnF) ; + const TopoDS_Face& theFace, + TopoDS_Edge& theEdgeOnF) ; //! Returns True if the face theFace contains
//! the edge theEdge but with opposite orientation.
@@ -225,8 +225,8 @@ class GEOMAlgo_Tools3D { //! edge founded
Standard_EXPORT static Standard_Boolean GetEdgeOff(const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace, - TopoDS_Edge& theEdgeOff) ; + const TopoDS_Face& theFace, + TopoDS_Edge& theEdgeOff) ; //! Computes a point inside the face .
//! - 2D representation of
@@ -234,7 +234,7 @@ class GEOMAlgo_Tools3D { //! Returns 0 in case of success.
Standard_EXPORT static Standard_Integer PntInFace(const TopoDS_Face& theF, - gp_Pnt& theP, - gp_Pnt2d& theP2D) ; + gp_Pnt& theP, + gp_Pnt2d& theP2D) ; }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx index 622288d65..9f43ac2e3 100644 --- a/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_WESScaler.cxx +// File: GEOMAlgo_WESScaler.cxx // Created: // Author: -// +// #include diff --git a/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx index 7048a303f..77788c447 100644 --- a/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_WESScaler.hxx +// File: GEOMAlgo_WESScaler.hxx // Created: // Author: -// +// #ifndef _GEOMAlgo_WESScaler_HeaderFile #define _GEOMAlgo_WESScaler_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx index c0ca486e1..37248cc4d 100755 --- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx @@ -117,7 +117,7 @@ static //modified by NIZNHY-PKV Thu Apr 19 09:04:59 2012f static Standard_Integer NbWaysOut(const TopoDS_Edge& aEOuta, - const BOP_ListOfEdgeInfo& aLEInfo); + const BOP_ListOfEdgeInfo& aLEInfo); //static // Standard_Integer NbWaysOut(const BOP_ListOfEdgeInfo& ); //modified by NIZNHY-PKV Thu Apr 19 09:04:53 2012t @@ -578,7 +578,7 @@ static // if (anIsOut && anIsNotPassed) { if (aE.IsSame(aEOuta)) { - continue; + continue; } // if (iCnt==1) { @@ -852,7 +852,7 @@ Standard_Real Angle (const gp_Dir2d& aDir2D) // purpose: //======================================================================= Standard_Integer NbWaysOut(const TopoDS_Edge& aEOuta, - const BOP_ListOfEdgeInfo& aLEInfo) + const BOP_ListOfEdgeInfo& aLEInfo) { Standard_Boolean bIsOut, bIsNotPassed; Standard_Integer iCnt=0; @@ -866,7 +866,7 @@ Standard_Integer NbWaysOut(const TopoDS_Edge& aEOuta, bIsNotPassed=!aEI.Passed(); if (bIsOut && bIsNotPassed) { if (!aE.IsSame(aEOuta)) { - iCnt++; + iCnt++; } } } diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx index 2d0cd2bd7..26b11e36e 100644 --- a/src/GEOMBase/GEOMBase.cxx +++ b/src/GEOMBase/GEOMBase.cxx @@ -115,8 +115,8 @@ TopoDS_Shape GEOMBase::GetTopoFromSelection( const SALOME_ListIO& IObjects ) _PTR(SObject) obj( studyDS->FindObjectID( IO->getEntry() ) ); _PTR(GenericAttribute) anAttr; if ( obj && obj->FindAttribute( anAttr, "AttributeIOR" ) ) { - _PTR(AttributeIOR) anIOR( anAttr ); - shape = GetShapeFromIOR( anIOR->Value().c_str() ); + _PTR(AttributeIOR) anIOR( anAttr ); + shape = GetShapeFromIOR( anIOR->Value().c_str() ); } } } @@ -140,13 +140,13 @@ int GEOMBase::GetNameOfSelectedIObjects( const SALOME_ListIO& IObjects, Handle(SALOME_InteractiveObject) anIObj = IObjects.First(); SalomeApp_Study* study = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); if ( anIObj->hasEntry() && study ) { - _PTR(Study) studyDS = study->studyDS(); - _PTR(SObject) obj( studyDS->FindObjectID( anIObj->getEntry() ) ); - _PTR(GenericAttribute) anAttr; - if ( obj && obj->FindAttribute( anAttr, "AttributeName" ) ) { - _PTR(AttributeName) aNameAttr ( anAttr ); - name = aNameAttr->Value().c_str(); - } + _PTR(Study) studyDS = study->studyDS(); + _PTR(SObject) obj( studyDS->FindObjectID( anIObj->getEntry() ) ); + _PTR(GenericAttribute) anAttr; + if ( obj && obj->FindAttribute( anAttr, "AttributeName" ) ) { + _PTR(AttributeName) aNameAttr ( anAttr ); + name = aNameAttr->Value().c_str(); + } } } } @@ -176,88 +176,88 @@ QString GEOMBase::GetShapeTypeString(const TopoDS_Shape& shape) switch ( shape.ShapeType() ) { case TopAbs_COMPOUND: { - aTypeString = QObject::tr( "GEOM_COMPOUND" ); - break; + aTypeString = QObject::tr( "GEOM_COMPOUND" ); + break; } case TopAbs_COMPSOLID: { - aTypeString = QObject::tr( "GEOM_COMPOUNDSOLID" ); - break; + aTypeString = QObject::tr( "GEOM_COMPOUNDSOLID" ); + break; } case TopAbs_SOLID: { - aTypeString = QObject::tr( "GEOM_SOLID" ); - break; + aTypeString = QObject::tr( "GEOM_SOLID" ); + break; } case TopAbs_SHELL: { - aTypeString = QObject::tr( "GEOM_SHELL" ); - break; + aTypeString = QObject::tr( "GEOM_SHELL" ); + break; } case TopAbs_FACE: { BRepAdaptor_Surface surf( TopoDS::Face( shape ) ); - switch ( surf.GetType() ) { - case GeomAbs_Plane: - { - aTypeString = QObject::tr( "GEOM_PLANE" ); - break; - } - case GeomAbs_Cylinder: - { - aTypeString = QObject::tr( "GEOM_SURFCYLINDER" ); - break; - } - case GeomAbs_Sphere: - { - aTypeString = QObject::tr( "GEOM_SURFSPHERE" ); - break; - } - case GeomAbs_Torus: - { - aTypeString = QObject::tr( "GEOM_SURFTORUS" ); - break; - } - case GeomAbs_Cone: - { - aTypeString = QObject::tr( "GEOM_SURFCONE" ); - break; - } - default: - { - aTypeString = QObject::tr( "GEOM_FACE" ); - break; - } - } - break; + switch ( surf.GetType() ) { + case GeomAbs_Plane: + { + aTypeString = QObject::tr( "GEOM_PLANE" ); + break; + } + case GeomAbs_Cylinder: + { + aTypeString = QObject::tr( "GEOM_SURFCYLINDER" ); + break; + } + case GeomAbs_Sphere: + { + aTypeString = QObject::tr( "GEOM_SURFSPHERE" ); + break; + } + case GeomAbs_Torus: + { + aTypeString = QObject::tr( "GEOM_SURFTORUS" ); + break; + } + case GeomAbs_Cone: + { + aTypeString = QObject::tr( "GEOM_SURFCONE" ); + break; + } + default: + { + aTypeString = QObject::tr( "GEOM_FACE" ); + break; + } + } + break; } case TopAbs_WIRE: { aTypeString = QObject::tr( "GEOM_WIRE" ); - break; + break; } case TopAbs_EDGE: { BRepAdaptor_Curve curv( TopoDS::Edge( shape ) ); - switch ( curv.GetType() ) { - case GeomAbs_Line: - { - aTypeString = ( qAbs( curv.FirstParameter() ) >= 1E6 || qAbs( curv.LastParameter() ) >= 1E6 ) ? - QObject::tr( "GEOM_LINE" ) : QObject::tr( "GEOM_EDGE" ); - break; - } - case GeomAbs_Circle: - { - aTypeString = curv.IsClosed() ? QObject::tr( "GEOM_CIRCLE" ) : QObject::tr( "GEOM_ARC" ); - break; - } - default: - { - aTypeString = QObject::tr( "GEOM_EDGE" ); - break; - } - } - break; + switch ( curv.GetType() ) { + case GeomAbs_Line: + { + aTypeString = ( qAbs( curv.FirstParameter() ) >= 1E6 || qAbs( curv.LastParameter() ) >= 1E6 ) ? + QObject::tr( "GEOM_LINE" ) : QObject::tr( "GEOM_EDGE" ); + break; + } + case GeomAbs_Circle: + { + aTypeString = curv.IsClosed() ? QObject::tr( "GEOM_CIRCLE" ) : QObject::tr( "GEOM_ARC" ); + break; + } + default: + { + aTypeString = QObject::tr( "GEOM_EDGE" ); + break; + } + } + break; } case TopAbs_VERTEX: { @@ -271,7 +271,7 @@ QString GEOMBase::GetShapeTypeString(const TopoDS_Shape& shape) } default: { - break; + break; } } } @@ -294,31 +294,31 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const QString& IOR, boo if ( obj ) { QList views; if ( onlyInActiveView ) - views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() ); + views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() ); else - views = SUIT_Session::session()->activeApplication()->desktop()->windows(); + views = SUIT_Session::session()->activeApplication()->desktop()->windows(); foreach ( SUIT_ViewWindow* view, views ) { - if ( view && view->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { - Handle(AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)view->getViewManager()->getViewModel())->getAISContext(); - - AIS_ListOfInteractive displayed; - ic->DisplayedObjects( displayed ); - ic->ObjectsInCollector( displayed ); - - AIS_ListIteratorOfListOfInteractive it( displayed ); - while ( it.More() && shape.IsNull() ) { - if ( it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) { - Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() ); - if ( !sh.IsNull() && sh->hasIO() ) { - Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( sh->getIO() ); - if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) - shape = sh; - } - } - it.Next(); - } - } - if ( !shape.IsNull() ) break; + if ( view && view->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { + Handle(AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)view->getViewManager()->getViewModel())->getAISContext(); + + AIS_ListOfInteractive displayed; + ic->DisplayedObjects( displayed ); + ic->ObjectsInCollector( displayed ); + + AIS_ListIteratorOfListOfInteractive it( displayed ); + while ( it.More() && shape.IsNull() ) { + if ( it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) { + Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() ); + if ( !sh.IsNull() && sh->hasIO() ) { + Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( sh->getIO() ); + if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) + shape = sh; + } + } + it.Next(); + } + } + if ( !shape.IsNull() ) break; } } } @@ -341,31 +341,31 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const QString& IOR, bool onlyInActiv if ( obj ) { QList views; if ( onlyInActiveView ) - views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() ); + views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() ); else - views = SUIT_Session::session()->activeApplication()->desktop()->windows(); + views = SUIT_Session::session()->activeApplication()->desktop()->windows(); foreach ( SUIT_ViewWindow* view, views ) { - if ( view && view->getViewManager()->getType() == SVTK_Viewer::Type() ) { - SVTK_ViewWindow* aVTKViewWindow = dynamic_cast( view ); - if( !aVTKViewWindow ) - continue; - vtkRenderer* Renderer = aVTKViewWindow->getRenderer(); - vtkActorCollection* theActors = Renderer->GetActors(); - theActors->InitTraversal(); - vtkActor* a = theActors->GetNextActor(); - while( a && !actor ) { - if ( a->IsA( "GEOM_Actor" ) ) { - GEOM_Actor* ga = GEOM_Actor::SafeDownCast( a ); - if ( ga && ga->hasIO() ) { - Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( ga->getIO() ); - if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) - actor = ga; - } - } - a = theActors->GetNextActor(); - } - } - if ( actor ) break; + if ( view && view->getViewManager()->getType() == SVTK_Viewer::Type() ) { + SVTK_ViewWindow* aVTKViewWindow = dynamic_cast( view ); + if( !aVTKViewWindow ) + continue; + vtkRenderer* Renderer = aVTKViewWindow->getRenderer(); + vtkActorCollection* theActors = Renderer->GetActors(); + theActors->InitTraversal(); + vtkActor* a = theActors->GetNextActor(); + while( a && !actor ) { + if ( a->IsA( "GEOM_Actor" ) ) { + GEOM_Actor* ga = GEOM_Actor::SafeDownCast( a ); + if ( ga && ga->hasIO() ) { + Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( ga->getIO() ); + if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() ) + actor = ga; + } + } + a = theActors->GetNextActor(); + } + } + if ( actor ) break; } } } @@ -611,25 +611,25 @@ bool GEOMBase::SelectionByNameInDialogs( QWidget* widget, const QString& objectU if ( listSO.size() < 1 ) { SUIT_MessageBox::critical( widget, - QObject::tr( "GEOM_WRN_WARNING" ), - QObject::tr( "GEOM_NAME_INCORRECT" ), - QObject::tr( "GEOM_BUT_OK" ) ); + QObject::tr( "GEOM_WRN_WARNING" ), + QObject::tr( "GEOM_NAME_INCORRECT" ), + QObject::tr( "GEOM_BUT_OK" ) ); return false; } /* More than one object with same name */ if ( listSO.size() > 1 ) { SUIT_MessageBox::critical( widget, - QObject::tr("GEOM_WRN_WARNING"), - QObject::tr("GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE"), - QObject::tr("GEOM_BUT_OK") ); + QObject::tr("GEOM_WRN_WARNING"), + QObject::tr("GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE"), + QObject::tr("GEOM_BUT_OK") ); return false; } /* Create a SALOME_InteractiveObject with a SALOME::SObject */ Handle(SALOME_InteractiveObject) IO = new SALOME_InteractiveObject( listSO[0]->GetID().c_str(), - "GEOM", - objectUserName.toLatin1().constData() ); + "GEOM", + objectUserName.toLatin1().constData() ); /* Add as a selected object */ /* Clear any previous selection : */ @@ -671,7 +671,7 @@ QString GEOMBase::GetDefaultName( const QString& operation, bool extractPrefix ) if ( component ) { _PTR(ChildIterator) it( studyDS->NewChildIterator( component ) ); for ( it->InitEx( true ); it->More(); it->Next() ) { - names.insert( it->Value()->GetName() ); + names.insert( it->Value()->GetName() ); } } @@ -683,13 +683,13 @@ QString GEOMBase::GetDefaultName( const QString& operation, bool extractPrefix ) if ( extractPrefix ) { QStringList parts = prefix.split( "_", QString::KeepEmptyParts ); if ( parts.count() > 1 ) { - bool ok; - aNumber = parts.last().toLong( &ok ); - if ( ok ) { - parts.removeLast(); - prefix = parts.join( "_" ); - aNumber--; - } + bool ok; + aNumber = parts.last().toLong( &ok ); + if ( ok ) { + parts.removeLast(); + prefix = parts.join( "_" ); + aNumber--; + } } } @@ -716,9 +716,9 @@ void GEOMBase::ShowErrorMessage( const QString& errorCode, const QString& commen text << QObject::tr( comment.toLatin1().constData() ); SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(), - QObject::tr( "GEOM_ERROR" ), + QObject::tr( "GEOM_ERROR" ), text.join( "\n" ), - QObject::tr( "GEOM_BUT_OK" ) ); + QObject::tr( "GEOM_BUT_OK" ) ); } @@ -771,26 +771,26 @@ QString GEOMBase::GetName( GEOM::GEOM_Object_ptr object ) _PTR(SObject) aSObj( study->studyDS()->FindObjectIOR( std::string( IOR.in() ) ) ); _PTR(GenericAttribute) anAttr; if ( aSObj && aSObj->FindAttribute( anAttr, "AttributeName") ) { - _PTR(AttributeName) aNameAttr( anAttr ); - name = aNameAttr->Value().c_str(); + _PTR(AttributeName) aNameAttr( anAttr ); + name = aNameAttr->Value().c_str(); } } // 2. if object is not found in the study, try default name if ( name.isEmpty() ) { if ( object->IsMainShape() ) { - name = GetDefaultName( "geomObj" ); + name = GetDefaultName( "geomObj" ); } else { - GEOM::GEOM_Object_var mainShape = object->GetMainShape(); - if ( !CORBA::is_nil( mainShape ) ) { - GEOM::ListOfLong_var indices = object->GetSubShapeIndices(); - if ( indices->length() > 0 ) { - TopAbs_ShapeEnum type = (TopAbs_ShapeEnum)( object->GetShapeType() ); - name = QString( "%1:%2_%3" ).arg( GetName( mainShape.in() ) ) - .arg( TypeName( type ) ).arg( indices[0] ); - } - } + GEOM::GEOM_Object_var mainShape = object->GetMainShape(); + if ( !CORBA::is_nil( mainShape ) ) { + GEOM::ListOfLong_var indices = object->GetSubShapeIndices(); + if ( indices->length() > 0 ) { + TopAbs_ShapeEnum type = (TopAbs_ShapeEnum)( object->GetShapeType() ); + name = QString( "%1:%2_%3" ).arg( GetName( mainShape.in() ) ) + .arg( TypeName( type ) ).arg( indices[0] ); + } + } } } } @@ -871,7 +871,7 @@ void GEOMBase::PublishSubObject( GEOM::GEOM_Object_ptr object ) if ( entry.isEmpty() && !CORBA::is_nil( father ) && !fatherEntry.isEmpty() ) { QString name = GetName( object ); GeometryGUI::GetGeomGen()->AddInStudy( GeometryGUI::ClientStudyToStudy( studyDS ), - object, name.toLatin1().data(), father.in() ); + object, name.toLatin1().data(), father.in() ); } } } diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index f771609b7..f52c3c178 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/src/GEOMBase/GEOMBase.h @@ -57,37 +57,37 @@ public : static int GetIndex( const TopoDS_Shape& subshape, const TopoDS_Shape& shape ); static TopoDS_Shape GetShapeFromIOR( const QString& IOR ); static bool GetShape( GEOM::GEOM_Object_ptr object, - TopoDS_Shape& shape, - const TopAbs_ShapeEnum type = TopAbs_SHAPE ); + TopoDS_Shape& shape, + const TopAbs_ShapeEnum type = TopAbs_SHAPE ); static TopoDS_Shape GetTopoFromSelection( const SALOME_ListIO& IObjects ); static int GetNameOfSelectedIObjects( const SALOME_ListIO& IObjects, - QString& name, - const bool shapesOnly = false ); + QString& name, + const bool shapesOnly = false ); static QString GetShapeTypeString( const TopoDS_Shape& shape ); /* Convertions */ static Handle(GEOM_AISShape) ConvertIOinGEOMAISShape( const Handle(SALOME_InteractiveObject)& IO, - bool onlyInActiveView = false ); + bool onlyInActiveView = false ); static Handle(AIS_InteractiveObject) GetAIS( const Handle(SALOME_InteractiveObject)& IO, - bool onlyInActiveView = false, - bool onlyGeom = false ); + bool onlyInActiveView = false, + bool onlyGeom = false ); static QStringList ConvertListOfIOInListOfIOR( const SALOME_ListIO& IObjects ); static Handle(GEOM_AISShape) ConvertIORinGEOMAISShape( const QString& IOR, - bool onlyInActiveView = false ); + bool onlyInActiveView = false ); static GEOM_Actor* ConvertIORinGEOMActor( const QString& IOR, - bool onlyInActiveView = false ); + bool onlyInActiveView = false ); static GEOM::GEOM_Object_ptr ConvertIOinGEOMObject( const Handle(SALOME_InteractiveObject)& IO ); static void ConvertListOfIOInListOfGO( const SALOME_ListIO& IObjects, - GEOM::ListOfGO& geomObjects, - bool shapesOnly = false ); + GEOM::ListOfGO& geomObjects, + bool shapesOnly = false ); static GEOM::GEOM_Object_ptr GetObjectFromIOR( const QString& IOR ); @@ -99,17 +99,17 @@ public : /* Used just by Plane and Prism */ static bool LinearEdgeExtremities( const TopoDS_Shape& shape, - gp_Pnt& point1, gp_Pnt& point2 ); + gp_Pnt& point1, gp_Pnt& point2 ); static void GetBipointDxDyDz( const gp_Pnt& point1, const gp_Pnt& point2, - double& dx, double& dy, double& dz ); + double& dx, double& dy, double& dz ); /* Simulation management */ static TopoDS_Shape CreateArrowForLinearEdge( const TopoDS_Shape& tds ); /* Generates default names */ static bool SelectionByNameInDialogs( QWidget* widget, - const QString& userObjectName, - const SALOME_ListIO& IObjects ); + const QString& userObjectName, + const SALOME_ListIO& IObjects ); /* Shows message box with error code */ static void DefineDlgPosition( QWidget* dlg, int& x, int& y ); diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx index 100b5270e..dd19cf2ba 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.cxx +++ b/src/GEOMGUI/GEOMGUI_Selection.cxx @@ -116,11 +116,11 @@ void GEOMGUI_Selection::init( const QString& context, LightApp_SelectionMgr* sel for ( int idx = 0; idx < count(); idx++ ) { QString anEntry = entry( idx ); if ( study && !anEntry.isEmpty() ) { - _PTR(SObject) aSO( study->FindObjectID( anEntry.toStdString() ) ); - if ( aSO ) { - CORBA::Object_var varObj = GeometryGUI::ClientSObjectToObject( aSO ); - myObjects[idx] = GEOM::GEOM_Object::_narrow( varObj ); - } + _PTR(SObject) aSO( study->FindObjectID( anEntry.toStdString() ) ); + if ( aSO ) { + CORBA::Object_var varObj = GeometryGUI::ClientSObjectToObject( aSO ); + myObjects[idx] = GEOM::GEOM_Object::_narrow( varObj ); + } } } } @@ -301,44 +301,44 @@ QString GEOMGUI_Selection::displayMode( const int index ) const SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1().constData() ); if ( prs ) { if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC - SOCC_Prs* occPrs = (SOCC_Prs*) prs; - AIS_ListOfInteractive lst; - occPrs->GetObjects( lst ); - if ( lst.Extent() ) { - Handle(AIS_InteractiveObject) io = lst.First(); - if ( !io.IsNull() ) { - int dm; - Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); - if(!aSh.IsNull()) { - dm = aSh->isTopLevel() ? aSh->prevDisplayMode() : aSh->DisplayMode(); - } else { - dm = io->DisplayMode(); - } - OCC_DISPLAY_MODE_TO_STRING( res, dm ); - if ( res.isEmpty() ) { // return default display mode of AIS_InteractiveContext - OCCViewer_Viewer* occViewer = (OCCViewer_Viewer*)SUIT_Session::session()->activeApplication()-> - desktop()->activeWindow()->getViewManager()->getViewModel(); - Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); - dm = ic->DisplayMode(); - OCC_DISPLAY_MODE_TO_STRING( res, dm ); - } - } - } + SOCC_Prs* occPrs = (SOCC_Prs*) prs; + AIS_ListOfInteractive lst; + occPrs->GetObjects( lst ); + if ( lst.Extent() ) { + Handle(AIS_InteractiveObject) io = lst.First(); + if ( !io.IsNull() ) { + int dm; + Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); + if(!aSh.IsNull()) { + dm = aSh->isTopLevel() ? aSh->prevDisplayMode() : aSh->DisplayMode(); + } else { + dm = io->DisplayMode(); + } + OCC_DISPLAY_MODE_TO_STRING( res, dm ); + if ( res.isEmpty() ) { // return default display mode of AIS_InteractiveContext + OCCViewer_Viewer* occViewer = (OCCViewer_Viewer*)SUIT_Session::session()->activeApplication()-> + desktop()->activeWindow()->getViewManager()->getViewModel(); + Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); + dm = ic->DisplayMode(); + OCC_DISPLAY_MODE_TO_STRING( res, dm ); + } + } + } } else if ( viewType == SVTK_Viewer::Type() ) { // assuming VTK - SVTK_Prs* vtkPrs = dynamic_cast( prs ); - vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; - if ( lst ) { - lst->InitTraversal(); - vtkActor* actor = lst->GetNextActor(); - if ( actor ) { - SALOME_Actor* salActor = dynamic_cast( actor ); - if ( salActor ) { - int dm = salActor->getDisplayMode(); - VTK_DISPLAY_MODE_TO_STRING( res, dm ); - } // if ( salome actor ) - } // if ( actor ) - } // if ( lst == vtkPrs->GetObjects() ) + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + vtkActor* actor = lst->GetNextActor(); + if ( actor ) { + SALOME_Actor* salActor = dynamic_cast( actor ); + if ( salActor ) { + int dm = salActor->getDisplayMode(); + VTK_DISPLAY_MODE_TO_STRING( res, dm ); + } // if ( salome actor ) + } // if ( actor ) + } // if ( lst == vtkPrs->GetObjects() ) } // if VTK } } @@ -362,30 +362,30 @@ bool GEOMGUI_Selection::isVectorsMode( const int index ) const SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1().constData() ); if ( prs ) { if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC - SOCC_Prs* occPrs = (SOCC_Prs*) prs; - AIS_ListOfInteractive lst; - occPrs->GetObjects( lst ); - if ( lst.Extent() ) { - Handle(AIS_InteractiveObject) io = lst.First(); - if ( !io.IsNull() ) { - Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); - if ( !aSh.IsNull() ) - res = aSh->isShowVectors(); - } - } + SOCC_Prs* occPrs = (SOCC_Prs*) prs; + AIS_ListOfInteractive lst; + occPrs->GetObjects( lst ); + if ( lst.Extent() ) { + Handle(AIS_InteractiveObject) io = lst.First(); + if ( !io.IsNull() ) { + Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); + if ( !aSh.IsNull() ) + res = aSh->isShowVectors(); + } + } } else if ( viewType == SVTK_Viewer::Type() ) { // assuming VTK - SVTK_Prs* vtkPrs = dynamic_cast( prs ); - vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; - if ( lst ) { - lst->InitTraversal(); - vtkActor* actor = lst->GetNextActor(); - if ( actor ) { - GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(actor); - if ( aGeomActor ) - res = aGeomActor->GetVectorMode(); - } - } + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + vtkActor* actor = lst->GetNextActor(); + if ( actor ) { + GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(actor); + if ( aGeomActor ) + res = aGeomActor->GetVectorMode(); + } + } } } } @@ -549,17 +549,17 @@ bool GEOMGUI_Selection::topLevel( const int index ) const SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1().constData() ); if ( prs ) { if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC - SOCC_Prs* occPrs = (SOCC_Prs*) prs; - AIS_ListOfInteractive lst; - occPrs->GetObjects( lst ); - if ( lst.Extent() ) { - Handle(AIS_InteractiveObject) io = lst.First(); - if ( !io.IsNull() ) { - Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); - if ( !aSh.IsNull() ) - res = (bool)aSh->isTopLevel(); - } - } + SOCC_Prs* occPrs = (SOCC_Prs*) prs; + AIS_ListOfInteractive lst; + occPrs->GetObjects( lst ); + if ( lst.Extent() ) { + Handle(AIS_InteractiveObject) io = lst.First(); + if ( !io.IsNull() ) { + Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); + if ( !aSh.IsNull() ) + res = (bool)aSh->isTopLevel(); + } + } } } } @@ -585,33 +585,33 @@ bool GEOMGUI_Selection::isPhysicalMaterial( const int idx ) const SALOME_Prs* prs = view->CreatePrs( entry( idx ).toLatin1().constData() ); if ( prs ) { if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC - SOCC_Prs* occPrs = (SOCC_Prs*) prs; - AIS_ListOfInteractive lst; - occPrs->GetObjects( lst ); - if ( lst.Extent() ) { - Handle(AIS_InteractiveObject) io = lst.First(); - if ( !io.IsNull() ) { - Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); - if ( !aSh.IsNull() ) - res = (bool) aSh->Attributes()->ShadingAspect()-> - Material(Aspect_TOFM_BOTH_SIDE).MaterialType( Graphic3d_MATERIAL_PHYSIC ); - } - } + SOCC_Prs* occPrs = (SOCC_Prs*) prs; + AIS_ListOfInteractive lst; + occPrs->GetObjects( lst ); + if ( lst.Extent() ) { + Handle(AIS_InteractiveObject) io = lst.First(); + if ( !io.IsNull() ) { + Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io); + if ( !aSh.IsNull() ) + res = (bool) aSh->Attributes()->ShadingAspect()-> + Material(Aspect_TOFM_BOTH_SIDE).MaterialType( Graphic3d_MATERIAL_PHYSIC ); + } + } } else if ( viewType == SVTK_Viewer::Type() ) { // assuming VTK - SVTK_Prs* vtkPrs = dynamic_cast( prs ); - vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; - if ( lst ) { - lst->InitTraversal(); - vtkActor* actor = lst->GetNextActor(); - if ( actor ) { - GEOM_Actor* aGeomGActor = GEOM_Actor::SafeDownCast( actor ); - if ( aGeomGActor ) { - GEOM_VTKPropertyMaterial* mat = GEOM_VTKPropertyMaterial::SafeDownCast(aGeomGActor->GetProperty()); - res = mat->GetPhysical(); - } // if ( salome actor ) - } // if ( actor ) - } // if ( lst == vtkPrs->GetObjects() ) + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + vtkActor* actor = lst->GetNextActor(); + if ( actor ) { + GEOM_Actor* aGeomGActor = GEOM_Actor::SafeDownCast( actor ); + if ( aGeomGActor ) { + GEOM_VTKPropertyMaterial* mat = GEOM_VTKPropertyMaterial::SafeDownCast(aGeomGActor->GetProperty()); + res = mat->GetPhysical(); + } // if ( salome actor ) + } // if ( actor ) + } // if ( lst == vtkPrs->GetObjects() ) } } } diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index d4b40cb5c..95b50621c 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -625,25 +625,25 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // - wireframe color Handle(Prs3d_LineAspect) anAspect = AISShape->Attributes()->LineAspect(); anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value() ) ); + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value() ) ); AISShape->Attributes()->SetLineAspect( anAspect ); // - unfree boundaries color anAspect = AISShape->Attributes()->UnFreeBoundaryAspect(); anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value() ) ); + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value() ) ); AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect ); // - free boundaries color anAspect = AISShape->Attributes()->FreeBoundaryAspect(); anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value() ) ); + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value() ) ); AISShape->Attributes()->SetFreeBoundaryAspect( anAspect ); // - standalone edges color anAspect = AISShape->Attributes()->WireAspect(); anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::LineColor ) ).value() ) ); + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::LineColor ) ).value() ) ); AISShape->Attributes()->SetWireAspect( anAspect ); // - color for edges in shading+edges mode @@ -654,10 +654,10 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // set display mode AISShape->SetDisplayMode( HasDisplayMode() ? - // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function - GetDisplayMode() : - // display mode from properties - propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); + // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function + GetDisplayMode() : + // display mode from properties + propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); // set display vectors flag AISShape->SetDisplayVectors( propMap.value( GEOM::propertyName( GEOM::EdgesDirection ) ).toBool() ); @@ -697,10 +697,10 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // set line width AISShape->SetWidth( HasWidth() ? - // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function - GetWidth() : - // libe width from properties - propMap.value( GEOM::propertyName( GEOM::LineWidth ) ).toInt() ); + // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function + GetWidth() : + // libe width from properties + propMap.value( GEOM::propertyName( GEOM::LineWidth ) ).toInt() ); // set top-level flag AISShape->setTopLevel( propMap.value( GEOM::propertyName( GEOM::TopLevel ) ).toBool() ); @@ -716,10 +716,10 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap anAspect->SetScale( aScaleOfMarker ); anAspect->SetTypeOfMarker( (Aspect_TypeOfMarker)( aTypeOfMarker-1 ) ); anAspect->SetColor( HasColor() ? - // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function - (Quantity_NameOfColor)GetColor() : - // color from properties - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value() ) ); + // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function + (Quantity_NameOfColor)GetColor() : + // color from properties + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value() ) ); AISShape->Attributes()->SetPointAspect( anAspect ); } else if ( aList.size() == 1 ) { @@ -729,21 +729,21 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap #if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 Handle(TColStd_HArray1OfByte) aTexture = #else - Handle(Graphic3d_HArray1OfBytes) aTexture = + Handle(Graphic3d_HArray1OfBytes) aTexture = #endif - GeometryGUI::getTexture( study, textureId, aWidth, aHeight ); + GeometryGUI::getTexture( study, textureId, aWidth, aHeight ); if ( !aTexture.IsNull() ) { - static int TextureId = 0; - Handle(Prs3d_PointAspect) aTextureAspect = - new Prs3d_PointAspect( HasColor() ? - // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function - (Quantity_NameOfColor)GetColor() : - // color from properties - SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value() ), - ++TextureId, - aWidth, aHeight, - aTexture ); - AISShape->Attributes()->SetPointAspect( aTextureAspect ); + static int TextureId = 0; + Handle(Prs3d_PointAspect) aTextureAspect = + new Prs3d_PointAspect( HasColor() ? + // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function + (Quantity_NameOfColor)GetColor() : + // color from properties + SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value() ), + ++TextureId, + aWidth, aHeight, + aTexture ); + AISShape->Attributes()->SetPointAspect( aTextureAspect ); } } } @@ -864,10 +864,10 @@ void GEOM_Displayer::updateActorProperties( GEOM_Actor* actor, bool create ) // set line width actor->SetWidth( HasWidth() ? - // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function - GetWidth() : - // libe width from properties - propMap.value( GEOM::propertyName( GEOM::LineWidth ) ).toInt() ); + // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function + GetWidth() : + // libe width from properties + propMap.value( GEOM::propertyName( GEOM::LineWidth ) ).toInt() ); // set display vectors flag actor->SetVectorMode( propMap.value( GEOM::propertyName( GEOM::EdgesDirection ) ).toBool() ); @@ -967,36 +967,36 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) if ( occPrs->IsNull() ) { - // new presentation is being created + // new presentation is being created aTrh = new GEOM_AISTrihedron( aPlc ); occPrs->AddObject( aTrh ); } else { - // presentation is being updated + // presentation is being updated AIS_ListOfInteractive aList; occPrs->GetObjects( aList ); AIS_ListIteratorOfListOfInteractive anIter( aList ); for ( ; anIter.More() && aTrh.IsNull(); anIter.Next() ) { aTrh = Handle(GEOM_AISTrihedron)::DownCast( anIter.Value() ); - } + } } - + if ( !aTrh.IsNull() ) { - // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function + // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function if ( HasColor() ) aTrh->SetColor( (Quantity_NameOfColor)GetColor() ); - // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function + // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function if ( HasWidth() ) aTrh->SetWidth( GetWidth() ); - + if ( !myIO.IsNull() ) { aTrh->setIO( myIO ); aTrh->SetOwner( myIO ); } - aTrh->SetComponent( aPlc ); - aTrh->SetToUpdate(); + aTrh->SetComponent( aPlc ); + aTrh->SetToUpdate(); } occPrs->SetToActivate( ToActivate() ); } @@ -1012,7 +1012,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) { // create presentation (specific for vectors) Handle(GEOM_AISShape) AISShape = ( myType == GEOM_VECTOR ) ? new GEOM_AISVector( myShape, "" ) - : new GEOM_AISShape ( myShape, "" ); + : new GEOM_AISShape ( myShape, "" ); // update shape properties updateShapeProperties( AISShape, true ); @@ -1024,18 +1024,18 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) occPrs->SetToActivate( ToActivate() ); if ( AISShape->isTopLevel() && GEOM_AISShape::topLevelDisplayMode() == GEOM_AISShape::TopShowAdditionalWActor ) { - // 21671: EDF 1829 GEOM : Bring to front selected objects (continuation): - - // create additional wireframe shape - Handle(GEOM_TopWireframeShape) aWirePrs = new GEOM_TopWireframeShape(myShape); - aWirePrs->SetWidth(AISShape->Width()); - if ( !myIO.IsNull() ) { - aWirePrs->setIO( myIO ); - aWirePrs->SetOwner( myIO ); - } - - // add shape to the presentation - occPrs->AddObject( aWirePrs ); + // 21671: EDF 1829 GEOM : Bring to front selected objects (continuation): + + // create additional wireframe shape + Handle(GEOM_TopWireframeShape) aWirePrs = new GEOM_TopWireframeShape(myShape); + aWirePrs->SetWidth(AISShape->Width()); + if ( !myIO.IsNull() ) { + aWirePrs->setIO( myIO ); + aWirePrs->SetOwner( myIO ); + } + + // add shape to the presentation + occPrs->AddObject( aWirePrs ); } } // if presentation is found -> set again shape for it @@ -1046,20 +1046,20 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) AIS_ListIteratorOfListOfInteractive Iter( IOList ); for ( ; Iter.More(); Iter.Next() ) { - Handle(GEOM_AISShape) AISShape = Handle(GEOM_AISShape)::DownCast( Iter.Value() ); - if ( AISShape.IsNull() ) - continue; + Handle(GEOM_AISShape) AISShape = Handle(GEOM_AISShape)::DownCast( Iter.Value() ); + if ( AISShape.IsNull() ) + continue; - // re-set shape (it might be changed) - if ( AISShape->Shape() != myShape ) - AISShape->Set( myShape ); + // re-set shape (it might be changed) + if ( AISShape->Shape() != myShape ) + AISShape->Set( myShape ); - // update shape properties - updateShapeProperties( AISShape, false ); + // update shape properties + updateShapeProperties( AISShape, false ); - // force updating - AISShape->UpdateSelection(); - AISShape->SetToUpdate(); + // force updating + AISShape->UpdateSelection(); + AISShape->SetToUpdate(); } } } @@ -1095,42 +1095,42 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) GEOM_VTKTrihedron* aTrh = 0; if ( vtkPrs->IsNull() ) { - // new presentation is being created - aTrh = GEOM_VTKTrihedron::New(); - vtkPrs->AddObject( aTrh ); + // new presentation is being created + aTrh = GEOM_VTKTrihedron::New(); + vtkPrs->AddObject( aTrh ); } else { - // presentation is being updated - vtkActorCollection* actors = vtkPrs->GetObjects(); - if ( actors ) { - actors->InitTraversal(); - vtkActor* a = actors->GetNextActor(); - while ( a && !aTrh ) { - aTrh = GEOM_VTKTrihedron::SafeDownCast( a ); - a = actors->GetNextActor(); - } - } + // presentation is being updated + vtkActorCollection* actors = vtkPrs->GetObjects(); + if ( actors ) { + actors->InitTraversal(); + vtkActor* a = actors->GetNextActor(); + while ( a && !aTrh ) { + aTrh = GEOM_VTKTrihedron::SafeDownCast( a ); + a = actors->GetNextActor(); + } + } } if ( aTrh ) { - // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function - if ( HasColor() ) { - Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); - aTrh->SetColor( aColor.Red(), aColor.Green(), aColor.Blue() ); - } + // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function + if ( HasColor() ) { + Quantity_Color aColor( (Quantity_NameOfColor)GetColor() ); + aTrh->SetColor( aColor.Red(), aColor.Green(), aColor.Blue() ); + } #ifdef VTK_TRIHEDRON_WIDTH - // - // VSR: currently isn't supported - // - // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function + // + // VSR: currently isn't supported + // + // predefined line width, manually set to displayer via GEOM_Displayer::SetLineWidth() function if ( HasWidth() ) aTrh->SetWidth( GetWidth() ); #endif if ( !myIO.IsNull() ) - aTrh->setIO( myIO ); + aTrh->setIO( myIO ); - aTrh->SetPlacement( aPlc ); + aTrh->SetPlacement( aPlc ); } } } @@ -1154,16 +1154,16 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) // presentation is being updated vtkActorCollection* actors = vtkPrs->GetObjects(); if ( actors ) { - actors->InitTraversal(); - vtkActor* a = actors->GetNextActor(); - while ( a ) { - GEOM_Actor* actor = GEOM_Actor::SafeDownCast( a ); - if ( actor ) { - // update actor properties - updateActorProperties( actor, false ); - a = actors->GetNextActor(); - } - } + actors->InitTraversal(); + vtkActor* a = actors->GetNextActor(); + while ( a ) { + GEOM_Actor* actor = GEOM_Actor::SafeDownCast( a ); + if ( actor ) { + // update actor properties + updateActorProperties( actor, false ); + a = actors->GetNextActor(); + } + } } } } @@ -1824,8 +1824,8 @@ SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QList& th } PropMap GEOM_Displayer::getObjectProperties( SalomeApp_Study* study, - const QString& entry, - SALOME_View* view ) + const QString& entry, + SALOME_View* view ) { // get default properties for the explicitly specified default view type PropMap propMap = GEOM_Displayer::getDefaultPropertyMap(); @@ -1840,62 +1840,62 @@ PropMap GEOM_Displayer::getObjectProperties( SalomeApp_Study* study, PropMap storedMap = study->getObjectPropMap( viewId, entry ); // overwrite default properties from stored ones (that are specified) for ( int prop = GEOM::Visibility; prop <= GEOM::LastProperty; prop++ ) { - if ( storedMap.contains( GEOM::propertyName( (GEOM::Property)prop ) ) ) - propMap.insert( GEOM::propertyName( (GEOM::Property)prop ), - storedMap.value( GEOM::propertyName( (GEOM::Property)prop ) ) ); + if ( storedMap.contains( GEOM::propertyName( (GEOM::Property)prop ) ) ) + propMap.insert( GEOM::propertyName( (GEOM::Property)prop ), + storedMap.value( GEOM::propertyName( (GEOM::Property)prop ) ) ); } // ... specific processing for color // ... current implementation is to use same stored color for all aspects // ... (TODO) possible future improvements about free boundaries, standalone edges etc colors can be here if ( storedMap.contains( GEOM::propertyName( GEOM::Color ) ) ) { - propMap.insert( GEOM::propertyName( GEOM::ShadingColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); - propMap.insert( GEOM::propertyName( GEOM::WireframeColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); - propMap.insert( GEOM::propertyName( GEOM::LineColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); - propMap.insert( GEOM::propertyName( GEOM::FreeBndColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); - propMap.insert( GEOM::propertyName( GEOM::PointColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); + propMap.insert( GEOM::propertyName( GEOM::ShadingColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); + propMap.insert( GEOM::propertyName( GEOM::WireframeColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); + propMap.insert( GEOM::propertyName( GEOM::LineColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); + propMap.insert( GEOM::propertyName( GEOM::FreeBndColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); + propMap.insert( GEOM::propertyName( GEOM::PointColor ), storedMap.value( GEOM::propertyName( GEOM::Color ) ) ); } if ( !entry.isEmpty() ) { - // get CORBA reference to geom object - _PTR(SObject) SO( study->studyDS()->FindObjectID( entry.toStdString() ) ); - if ( SO ) { - CORBA::Object_var object = GeometryGUI::ClientSObjectToObject( SO ); - if ( !CORBA::is_nil( object ) ) { - GEOM::GEOM_Object_var geomObject = GEOM::GEOM_Object::_narrow( object ); - // check that geom object has color properly set - bool hasColor = false; - SALOMEDS::Color aSColor = getColor( geomObject, hasColor ); - // set color from geometry object (only once, if it is not yet set in GUI) - // current implementation is to use same color for all aspects - // (TODO) possible future improvements about free boundaries, standalone edges etc colors can be here - if ( hasColor && !storedMap.contains( GEOM::propertyName( GEOM::Color ) ) ) { - QColor objColor = QColor::fromRgbF( aSColor.R, aSColor.G, aSColor.B ); - propMap.insert( GEOM::propertyName( GEOM::ShadingColor ), objColor ); - propMap.insert( GEOM::propertyName( GEOM::WireframeColor ), objColor ); - propMap.insert( GEOM::propertyName( GEOM::LineColor ), objColor ); - propMap.insert( GEOM::propertyName( GEOM::FreeBndColor ), objColor ); - propMap.insert( GEOM::propertyName( GEOM::PointColor ), objColor ); - } - // check that object has point marker properly set - GEOM::marker_type mType = geomObject->GetMarkerType(); - GEOM::marker_size mSize = geomObject->GetMarkerSize(); - int mTextureId = geomObject->GetMarkerTexture(); - bool hasMarker = ( mType > GEOM::MT_NONE && mType < GEOM::MT_USER && mSize > GEOM::MS_NONE && mSize <= GEOM::MS_70 ) || - ( mType == GEOM::MT_USER && mTextureId > 0 ); - // set point marker from geometry object (only once, if it is not yet set in GUI) - if ( hasMarker && !storedMap.contains( GEOM::propertyName( GEOM::PointMarker ) ) ) { - if ( mType > GEOM::MT_NONE && mType < GEOM::MT_USER ) { - // standard type - propMap.insert( GEOM::propertyName( GEOM::PointMarker ), - QString( "%1%2%3" ).arg( (int)mType ).arg( GEOM::subSectionSeparator() ).arg( (int)mSize ) ); - } - else if ( mType == GEOM::MT_USER ) { - // custom texture - propMap.insert( GEOM::propertyName( GEOM::PointMarker ), QString::number( mTextureId ) ); - } - } - } - } + // get CORBA reference to geom object + _PTR(SObject) SO( study->studyDS()->FindObjectID( entry.toStdString() ) ); + if ( SO ) { + CORBA::Object_var object = GeometryGUI::ClientSObjectToObject( SO ); + if ( !CORBA::is_nil( object ) ) { + GEOM::GEOM_Object_var geomObject = GEOM::GEOM_Object::_narrow( object ); + // check that geom object has color properly set + bool hasColor = false; + SALOMEDS::Color aSColor = getColor( geomObject, hasColor ); + // set color from geometry object (only once, if it is not yet set in GUI) + // current implementation is to use same color for all aspects + // (TODO) possible future improvements about free boundaries, standalone edges etc colors can be here + if ( hasColor && !storedMap.contains( GEOM::propertyName( GEOM::Color ) ) ) { + QColor objColor = QColor::fromRgbF( aSColor.R, aSColor.G, aSColor.B ); + propMap.insert( GEOM::propertyName( GEOM::ShadingColor ), objColor ); + propMap.insert( GEOM::propertyName( GEOM::WireframeColor ), objColor ); + propMap.insert( GEOM::propertyName( GEOM::LineColor ), objColor ); + propMap.insert( GEOM::propertyName( GEOM::FreeBndColor ), objColor ); + propMap.insert( GEOM::propertyName( GEOM::PointColor ), objColor ); + } + // check that object has point marker properly set + GEOM::marker_type mType = geomObject->GetMarkerType(); + GEOM::marker_size mSize = geomObject->GetMarkerSize(); + int mTextureId = geomObject->GetMarkerTexture(); + bool hasMarker = ( mType > GEOM::MT_NONE && mType < GEOM::MT_USER && mSize > GEOM::MS_NONE && mSize <= GEOM::MS_70 ) || + ( mType == GEOM::MT_USER && mTextureId > 0 ); + // set point marker from geometry object (only once, if it is not yet set in GUI) + if ( hasMarker && !storedMap.contains( GEOM::propertyName( GEOM::PointMarker ) ) ) { + if ( mType > GEOM::MT_NONE && mType < GEOM::MT_USER ) { + // standard type + propMap.insert( GEOM::propertyName( GEOM::PointMarker ), + QString( "%1%2%3" ).arg( (int)mType ).arg( GEOM::subSectionSeparator() ).arg( (int)mSize ) ); + } + else if ( mType == GEOM::MT_USER ) { + // custom texture + propMap.insert( GEOM::propertyName( GEOM::PointMarker ), QString::number( mTextureId ) ); + } + } + } + } } } } @@ -1916,52 +1916,52 @@ PropMap GEOM_Displayer::getDefaultPropertyMap() // - nb isos (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::NbIsos ), - QString( "%1%2%3" ). - arg( resMgr->integerValue( "Geometry", "iso_number_u", 1 ) ). - arg( GEOM::subSectionSeparator() ). - arg( resMgr->integerValue( "Geometry", "iso_number_v", 1 ) ) ); + QString( "%1%2%3" ). + arg( resMgr->integerValue( "Geometry", "iso_number_u", 1 ) ). + arg( GEOM::subSectionSeparator() ). + arg( resMgr->integerValue( "Geometry", "iso_number_v", 1 ) ) ); // - transparency (opacity = 1-transparency) propMap.insert( GEOM::propertyName( GEOM::Transparency ), 0.0 ); // - display mode (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::DisplayMode ), - resMgr->integerValue( "Geometry", "display_mode", 0 ) ); + resMgr->integerValue( "Geometry", "display_mode", 0 ) ); // - show edges direction flag (false by default) propMap.insert( GEOM::propertyName( GEOM::EdgesDirection ), false ); // - shading color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::ShadingColor ), - colorFromResources( "shading_color", QColor( 255, 255, 0 ) ) ); + colorFromResources( "shading_color", QColor( 255, 255, 0 ) ) ); // - wireframe color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::WireframeColor ), - colorFromResources( "wireframe_color", QColor( 255, 255, 0 ) ) ); + colorFromResources( "wireframe_color", QColor( 255, 255, 0 ) ) ); // - standalone edges color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::LineColor ), - colorFromResources( "line_color", QColor( 255, 0, 0 ) ) ); + colorFromResources( "line_color", QColor( 255, 0, 0 ) ) ); // - free boundaries color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::FreeBndColor ), - colorFromResources( "free_bound_color", QColor( 0, 255, 0 ) ) ); + colorFromResources( "free_bound_color", QColor( 0, 255, 0 ) ) ); // - points color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::PointColor ), - colorFromResources( "point_color", QColor( 255, 255, 0 ) ) ); + colorFromResources( "point_color", QColor( 255, 255, 0 ) ) ); // - isos color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::IsosColor ), - colorFromResources( "isos_color", QColor( 200, 200, 200 ) ) ); + colorFromResources( "isos_color", QColor( 200, 200, 200 ) ) ); // - outlines color (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::OutlineColor ), - colorFromResources( "edges_in_shading_color", QColor( 180, 180, 180 ) ) ); + colorFromResources( "edges_in_shading_color", QColor( 180, 180, 180 ) ) ); // - deflection coefficient (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::Deflection ), - resMgr->doubleValue( "Geometry", "deflection_coeff", 0.001 ) ); + resMgr->doubleValue( "Geometry", "deflection_coeff", 0.001 ) ); // - material (take default value from preferences) Material_Model material; @@ -1970,18 +1970,18 @@ PropMap GEOM_Displayer::getDefaultPropertyMap() // - edge width (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::LineWidth ), - resMgr->integerValue( "Geometry", "edge_width", 1 ) ); + resMgr->integerValue( "Geometry", "edge_width", 1 ) ); // - isos width (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::IsosWidth ), - resMgr->integerValue( "Geometry", "isolines_width", 1 ) ); + resMgr->integerValue( "Geometry", "isolines_width", 1 ) ); // - point marker (take default value from preferences) propMap.insert( GEOM::propertyName( GEOM::PointMarker ), - QString( "%1%2%3" ). - arg( resMgr->integerValue( "Geometry", "type_of_marker", 1 ) + 1 ). - arg( GEOM::subSectionSeparator() ). - arg( resMgr->integerValue( "Geometry", "marker_scale", 1 ) ) ); + QString( "%1%2%3" ). + arg( resMgr->integerValue( "Geometry", "type_of_marker", 1 ) + 1 ). + arg( GEOM::subSectionSeparator() ). + arg( resMgr->integerValue( "Geometry", "marker_scale", 1 ) ) ); // - top-level flag (false by default) propMap.insert( GEOM::propertyName( GEOM::TopLevel ), false ); @@ -2005,39 +2005,39 @@ SALOMEDS::Color GEOM_Displayer::getColor(GEOM::GEOM_Object_var theGeomObject, bo hasColor = aSColor.R >= 0 && aSColor.G >= 0 && aSColor.B >= 0; if ( !hasColor ) { #ifdef GENERAL_AUTOCOLOR // auto-color for all sub-shapes - bool general_autocolor = true; + bool general_autocolor = true; #else // auto-color for groups only - bool general_autocolor = false; + bool general_autocolor = false; #endif // GENERAL_AUTOCOLOR - if ( general_autocolor || theGeomObject->GetType() == GEOM_GROUP ) { - GEOM::GEOM_Object_var aMainObject = theGeomObject->GetMainShape(); - if ( !CORBA::is_nil( aMainObject ) && aMainObject->GetAutoColor() ) { + if ( general_autocolor || theGeomObject->GetType() == GEOM_GROUP ) { + GEOM::GEOM_Object_var aMainObject = theGeomObject->GetMainShape(); + if ( !CORBA::is_nil( aMainObject ) && aMainObject->GetAutoColor() ) { #ifdef SIMPLE_AUTOCOLOR // simplified algorithm for auto-colors - aSColor = getPredefinedUniqueColor(); - hasColor = true; + aSColor = getPredefinedUniqueColor(); + hasColor = true; #else // old algorithm for auto-colors - QList aReservedColors; - CORBA::String_var IOR = app->orb()->object_to_string( aMainObject ); - _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( IOR.in() ) ); - if ( aMainSObject ) { - _PTR(ChildIterator) it( aStudy->NewChildIterator( aMainSObject ) ); - for ( ; it->More(); it->Next() ) { - _PTR(SObject) aChildSObject( it->Value() ); - GEOM::GEOM_Object_var aChildObject = - GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aChildSObject)); - if ( CORBA::is_nil( aChildObject ) ) - continue; - - SALOMEDS::Color aReservedColor = aChildObject->GetColor(); - if ( aReservedColor.R >= 0 && aReservedColor.G >= 0 && aReservedColor.B >= 0 ) - aReservedColors.append( aReservedColor ); - } - } - aSColor = getUniqueColor( aReservedColors ); - hasColor = true; + QList aReservedColors; + CORBA::String_var IOR = app->orb()->object_to_string( aMainObject ); + _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( IOR.in() ) ); + if ( aMainSObject ) { + _PTR(ChildIterator) it( aStudy->NewChildIterator( aMainSObject ) ); + for ( ; it->More(); it->Next() ) { + _PTR(SObject) aChildSObject( it->Value() ); + GEOM::GEOM_Object_var aChildObject = + GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aChildSObject)); + if ( CORBA::is_nil( aChildObject ) ) + continue; + + SALOMEDS::Color aReservedColor = aChildObject->GetColor(); + if ( aReservedColor.R >= 0 && aReservedColor.G >= 0 && aReservedColor.B >= 0 ) + aReservedColors.append( aReservedColor ); + } + } + aSColor = getUniqueColor( aReservedColors ); + hasColor = true; #endif // SIMPLE_AUTOCOLOR - } - } + } + } } } } diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index cb177d736..4f0c137f4 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -101,7 +101,7 @@ public: const bool updateViewer = true ); void EraseWithChildren(const Handle(SALOME_InteractiveObject)& theIO, - const bool eraseOnlyChildren = false); + const bool eraseOnlyChildren = false); /* Display/Erase list of objects methods */ diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 2b8a4abcb..31e2fca51 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -544,11 +544,11 @@ void GEOMToolsGUI::OnEditDelete() else { // GEOM component is not selected: check if selected objects are in use if ( inUse( aStudy, geomComp, allDeleted ) && - SUIT_MessageBox::question( app->desktop(), - QObject::tr("WRN_WARNING"), - QObject::tr("DEP_OBJECT"), - SUIT_MessageBox::Yes | SUIT_MessageBox::No, - SUIT_MessageBox::No ) != SUIT_MessageBox::Yes ) { + SUIT_MessageBox::question( app->desktop(), + QObject::tr("WRN_WARNING"), + QObject::tr("DEP_OBJECT"), + SUIT_MessageBox::Yes | SUIT_MessageBox::No, + SUIT_MessageBox::No ) != SUIT_MessageBox::Yes ) { return; // object(s) in use } // ... and then delete all objects diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 61a9883f8..f2ede2679 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -543,8 +543,8 @@ void GEOMToolsGUI::OnMaterialProperties() void GEOMToolsGUI::OnMaterialsLibrary() { - GEOMToolsGUI_MaterialPropertiesDlg dlg( SUIT_Session::session()->activeApplication()->desktop(), false, true, QtxDialog::Standard ); - dlg.setWindowTitle( tr( "MATERIAL_LIBRARY_TLT" ) ); + GEOMToolsGUI_MaterialPropertiesDlg dlg( SUIT_Session::session()->activeApplication()->desktop(), false, true, QtxDialog::Standard ); + dlg.setWindowTitle( tr( "MATERIAL_LIBRARY_TLT" ) ); dlg.exec(); } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx index 6423f3e1c..f737b3761 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx @@ -101,7 +101,7 @@ GEOMToolsGUI_MaterialPropertiesDlg::GEOMToolsGUI_MaterialPropertiesDlg( QWidget* myShowSelWidget = showSelWidget; // Set title setWindowTitle( tr( "MATERIAL_PROPERTIES_TLT" ) ); - + // main layout QVBoxLayout* main = new QVBoxLayout( mainFrame() ); main->setMargin( 0 ); @@ -329,7 +329,7 @@ GEOMToolsGUI_MaterialPropertiesDlg::GEOMToolsGUI_MaterialPropertiesDlg( QWidget* if ( window ) { int mgrId = window->getViewManager()->getGlobalId(); PropMap propMap = study->getObjectPropMap( mgrId, io->getEntry() ); - QString matProp = propMap.value(GEOM::propertyName( GEOM::Material )).toString(); + QString matProp = propMap.value(GEOM::propertyName( GEOM::Material )).toString(); if ( !matProp.isEmpty() ) myCurrentModel.fromProperties( matProp ); QColor c = propMap.value(GEOM::propertyName( GEOM::Color )).value(); @@ -625,10 +625,10 @@ void GEOMToolsGUI_MaterialPropertiesDlg::onChanged() // it is no allowed to change global material // user is asked about creating of a new user material model based on the currently selected one if ( SUIT_MessageBox::question( this, - tr( "GEOM_WRN_WARNING" ), - tr( "QUE_CREATE_NEW_MATERIAL" ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::Yes ) == QMessageBox::Yes ) { + tr( "GEOM_WRN_WARNING" ), + tr( "QUE_CREATE_NEW_MATERIAL" ), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::Yes ) == QMessageBox::Yes ) { // user has chosen creation of new user model onAddMaterial(); } @@ -708,10 +708,10 @@ void GEOMToolsGUI_MaterialPropertiesDlg::onDeleteMaterial() QListWidgetItem* item = myMaterials->currentItem(); if ( item && item->data( TypeRole ).toInt() == User ) { if ( SUIT_MessageBox::question( this, - tr( "GEOM_WRN_WARNING" ), - tr( "QUE_REMOVE_MATERIAL" ).arg( item->text() ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::Yes ) == QMessageBox::Yes ) { + tr( "GEOM_WRN_WARNING" ), + tr( "QUE_REMOVE_MATERIAL" ).arg( item->text() ), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::Yes ) == QMessageBox::Yes ) { myResourceMgr.remove( item->data( NameRole ).toString() ); delete item; } @@ -758,7 +758,7 @@ void GEOMToolsGUI_MaterialPropertiesDlg::SetEditCurrentArgument() // enable line edit myLineEditCurArg->setEnabled(true); myLineEditCurArg->setFocus(); - SelectionIntoArgument(); + SelectionIntoArgument(); // after setFocus(), because it will be setDown(false) when loses focus send->setDown(true); } @@ -778,7 +778,7 @@ void GEOMToolsGUI_MaterialPropertiesDlg::SelectionIntoArgument() if ( study ) { SALOME_ListIO aSelList; aSelMgr->selectedObjects(aSelList); - int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true); - } + int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true); + } myLineEditCurArg->setText( aString ); } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h index 9423e5de8..2885d1583 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h @@ -57,8 +57,8 @@ private: void toModel( Material_Model& ) const; void fromModel( const Material_Model& ); QString findUniqueName( const QString&, - QListWidgetItem* = 0, - bool = false ); + QListWidgetItem* = 0, + bool = false ); signals: void changed(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx index a41be5949..a8a70fc3f 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx @@ -193,26 +193,26 @@ QTreeWidgetItem* GEOMToolsGUI_PublishDlg::findParentItem(_PTR(Study) theStudy, S QString targetEntry = aParrent->entry(); if( !(aResult = myEntryToItem.value(targetEntry)) ) { if( aParrent != myGeomRoot ) { - QString aName; - _PTR(SObject) aSO ( theStudy->FindObjectID(qPrintable(aParrent->entry()))); - _PTR(GenericAttribute) anAttr; - if ( aSO->FindAttribute(anAttr, "AttributeName") ) { - _PTR(AttributeName) anAttrName (anAttr); - aName = anAttrName->Value().c_str(); - } - theList.push_front(qMakePair(targetEntry, aName)); - aResult = findParentItem(theStudy,aParrent,theList); + QString aName; + _PTR(SObject) aSO ( theStudy->FindObjectID(qPrintable(aParrent->entry()))); + _PTR(GenericAttribute) anAttr; + if ( aSO->FindAttribute(anAttr, "AttributeName") ) { + _PTR(AttributeName) anAttrName (anAttr); + aName = anAttrName->Value().c_str(); + } + theList.push_front(qMakePair(targetEntry, aName)); + aResult = findParentItem(theStudy,aParrent,theList); } else { - //Publish List - for(int i = 0; i < theList.size(); i++ ) { - aResult = createItem(aResult, theList[i], false); - } - theList.clear(); + //Publish List + for(int i = 0; i < theList.size(); i++ ) { + aResult = createItem(aResult, theList[i], false); + } + theList.clear(); } } else { //Publish List for(int i = 0; i < theList.size(); i++ ) { - aResult = createItem(aResult, theList[i], false); + aResult = createItem(aResult, theList[i], false); } theList.clear(); } @@ -242,8 +242,8 @@ void GEOMToolsGUI_PublishDlg::buildTree(_PTR(Study) theStudy, SalomeApp_DataObje if(!isDrawable) { QString aName; if ( SO->FindAttribute(anAttr, "AttributeName") ) { - _PTR(AttributeName) aAttrName (anAttr); - aName = aAttrName->Value().c_str(); + _PTR(AttributeName) aAttrName (anAttr); + aName = aAttrName->Value().c_str(); } BufferedList aList; QTreeWidgetItem* parentItem = findParentItem(theStudy, theItem, aList); @@ -291,12 +291,12 @@ void GEOMToolsGUI_PublishDlg::clickOnApply() { aDrw->SetDrawable( true ); //Remove or change item if( item != myTreeWidget->invisibleRootItem() ){ - if( item->data(0,Qt::UserRole).toBool() ) { - delete item; - } else { - item->setFlags(item->flags() & ~Qt::ItemIsUserCheckable); - item->setData(0,Qt::CheckStateRole,QVariant()); - } + if( item->data(0,Qt::UserRole).toBool() ) { + delete item; + } else { + item->setFlags(item->flags() & ~Qt::ItemIsUserCheckable); + item->setData(0,Qt::CheckStateRole,QVariant()); + } } } } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index e2f9f60fe..bf304cba6 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -317,7 +317,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency() if ( !aisShape.IsNull() ) { ic->SetTransparency( aisShape, newValue, false ); ic->Redisplay( aisShape, Standard_False, Standard_True ); - aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), GEOM::propertyName( GEOM::Transparency ) , newValue ); + aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), GEOM::propertyName( GEOM::Transparency ) , newValue ); } } // for... ic->UpdateCurrentViewer(); diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx index ceda0060a..efbee01cb 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx @@ -100,7 +100,7 @@ void GEOM_Swig::init() // update Object browser if ( dynamic_cast( app ) ) - dynamic_cast( app )->updateObjectBrowser( true ); + dynamic_cast( app )->updateObjectBrowser( true ); } }; @@ -157,11 +157,11 @@ void GEOM_Swig::createAndDisplayFitAllGO( const char* theEntry ) { SUIT_Application* app = SUIT_Session::session()->activeApplication(); if ( app ) { - SUIT_ViewWindow* window = app->desktop()->activeWindow(); - if ( dynamic_cast( window ) ) - dynamic_cast( window )->onFitAll(); + SUIT_ViewWindow* window = app->desktop()->activeWindow(); + if ( dynamic_cast( window ) ) + dynamic_cast( window )->onFitAll(); else if ( dynamic_cast( window ) ) - dynamic_cast( window )->onViewFitAll(); + dynamic_cast( window )->onViewFitAll(); } } }; @@ -308,9 +308,9 @@ const char* GEOM_Swig::getShapeTypeIcon( const char* theIOR ) if ( !CORBA::is_nil( anObject ) ) { GEOM::GEOM_Object_var aShape = GEOM::GEOM_Object::_narrow( anObject.in() ); if ( !CORBA::is_nil( aShape ) ) { - GEOM::shape_type aType = aShape->GetShapeType(); - if ( aType >= GEOM::COMPOUND && aType < GEOM::SHAPE ) - anIcon = icons[ (int)aType ]; + GEOM::shape_type aType = aShape->GetShapeType(); + if ( aType >= GEOM::COMPOUND && aType < GEOM::SHAPE ) + anIcon = icons[ (int)aType ]; } } } @@ -329,16 +329,16 @@ class TSetPropertyEvent: public SALOME_Event public: TSetPropertyEvent( const QString& _entry, - const QString& _property, - const QVariant& _value, - bool _update = true ); + const QString& _property, + const QVariant& _value, + bool _update = true ); virtual void Execute(); }; TSetPropertyEvent::TSetPropertyEvent( const QString& _entry, - const QString& _property, - const QVariant& _value, - bool _update ): + const QString& _property, + const QVariant& _value, + bool _update ): myEntry( _entry ), myProperty( _property ), myValue( _value ), @@ -376,7 +376,7 @@ void TSetPropertyEvent::Execute() void GEOM_Swig::setDisplayMode( const char* theEntry, int theMode, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::DisplayMode ), - theMode, theUpdateViewer ) ); + theMode, theUpdateViewer ) ); } /*! @@ -388,7 +388,7 @@ void GEOM_Swig::setDisplayMode( const char* theEntry, int theMode, bool theUpdat void GEOM_Swig::setVectorsMode( const char* theEntry, bool theOn, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::EdgesDirection ), - theOn, theUpdateViewer ) ); + theOn, theUpdateViewer ) ); } /*! @@ -402,7 +402,7 @@ void GEOM_Swig::setVectorsMode( const char* theEntry, bool theOn, bool theUpdate void GEOM_Swig::setColor( const char* theEntry, int theRed, int theGreen, int theBlue, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::Color ), - QColor( theRed, theGreen, theBlue ), theUpdateViewer ) ); + QColor( theRed, theGreen, theBlue ), theUpdateViewer ) ); } /*! @@ -415,8 +415,8 @@ void GEOM_Swig::setColor( const char* theEntry, int theRed, int theGreen, int th void GEOM_Swig::setIsos( const char* theEntry, int theNbU, int theNbV, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::NbIsos ), - QString( "%1%2%3" ).arg( theNbU ).arg( GEOM::subSectionSeparator() ).arg( theNbV ), - theUpdateViewer ) ); + QString( "%1%2%3" ).arg( theNbU ).arg( GEOM::subSectionSeparator() ).arg( theNbV ), + theUpdateViewer ) ); } /*! @@ -428,7 +428,7 @@ void GEOM_Swig::setIsos( const char* theEntry, int theNbU, int theNbV, bool theU void GEOM_Swig::setTransparency( const char* theEntry, float theTransparency, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::Transparency ), - theTransparency, theUpdateViewer ) ); + theTransparency, theUpdateViewer ) ); } /*! @@ -440,7 +440,7 @@ void GEOM_Swig::setTransparency( const char* theEntry, float theTransparency, bo void GEOM_Swig::setDeflection( const char* theEntry, float theDeflection, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::Deflection ), - theDeflection, theUpdateViewer ) ); + theDeflection, theUpdateViewer ) ); } /*! @@ -454,7 +454,7 @@ void GEOM_Swig::setMaterial( const char* theEntry, const char* theMaterial, bool Material_Model material; material.fromResources( theMaterial ); ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::Material ), - material.toProperties(), theUpdateViewer ) ); + material.toProperties(), theUpdateViewer ) ); } /*! @@ -466,7 +466,7 @@ void GEOM_Swig::setMaterial( const char* theEntry, const char* theMaterial, bool void GEOM_Swig::setMaterialProperty( const char* theEntry, const char* theMaterial, bool theUpdateViewer ) { ProcessVoidEvent( new TSetPropertyEvent( theEntry, GEOM::propertyName( GEOM::Material ), - theMaterial, theUpdateViewer ) ); + theMaterial, theUpdateViewer ) ); } class TInitGeomGenEvent: public SALOME_Event diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index 9054ce7a6..a5f81be42 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -245,7 +245,7 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() GEOM::shape_type maxallowed = getConstructorId() == 1 ? GEOM::FACE : GEOM::SHELL; GEOM::shape_type minallowed = getConstructorId() == 1 ? GEOM::EDGE : GEOM::VERTEX; if ( stype < maxallowed || stype > minallowed ) - continue; + continue; myBaseObjects << objects[i]; } if ( !myBaseObjects.isEmpty() ) { @@ -261,9 +261,9 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( myPath.get() ); myEditCurrentArgument->setText( aName ); if ( getConstructorId() == 1 && !myVec ) - GroupPoints->PushButton3->click(); + GroupPoints->PushButton3->click(); else if ( myBaseObjects.isEmpty() ) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); } } else if (myEditCurrentArgument == GroupPoints->LineEdit3) { @@ -272,9 +272,9 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( myVec.get() ); myEditCurrentArgument->setText( aName ); if ( myBaseObjects.isEmpty() ) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); else if ( !myPath ) - GroupPoints->PushButton2->click(); + GroupPoints->PushButton2->click(); } } diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx index 5da059ad2..905428c0f 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx @@ -203,9 +203,9 @@ void GenerationGUI_PipePathDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName(myShape.get()); myEditCurrentArgument->setText(aName); if (myBase1Objects.isEmpty()) - GroupPoints->PushButton2->click(); + GroupPoints->PushButton2->click(); else if (myBase2Objects.isEmpty()) - GroupPoints->PushButton3->click(); + GroupPoints->PushButton3->click(); } } else if (myEditCurrentArgument == GroupPoints->LineEdit2) { diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index a2f263013..d5046707a 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -195,7 +195,7 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument() for ( int i = 0; i < objects.count(); i++ ) { GEOM::shape_type stype = objects[i]->GetMaxShapeType(); if ( stype < GEOM::SHELL || stype > GEOM::VERTEX ) - continue; + continue; myBaseObjects << objects[i]; } if ( !myBaseObjects.isEmpty() ) { @@ -209,7 +209,7 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( myAxis.get() ); myEditCurrentArgument->setText( aName ); if ( myBaseObjects.isEmpty() ) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); } } processPreview(); diff --git a/src/Material/Material_Model.cxx b/src/Material/Material_Model.cxx index 467e12874..3f95c135a 100644 --- a/src/Material/Material_Model.cxx +++ b/src/Material/Material_Model.cxx @@ -425,10 +425,12 @@ double Material_Model::reflection( ReflectionType type, bool theIsFront ) const { double value = 0.0; if ( type >= 0 && type < 4 ) + { if ( theIsFront ) value = myReflection[ type ].front_coef; else value = myReflection[ type ].back_coef; + } return value; } @@ -442,10 +444,12 @@ double Material_Model::reflection( ReflectionType type, bool theIsFront ) const void Material_Model::setReflection( ReflectionType type, double value, bool theIsFront ) { if ( type >= 0 && type < 4 ) + { if ( theIsFront ) myReflection[ type ].front_coef = value; else myReflection[ type ].back_coef = value; + } } /*! diff --git a/src/Material/Material_ResourceMgr.cxx b/src/Material/Material_ResourceMgr.cxx index 9b38b3cb2..12cb46790 100644 --- a/src/Material/Material_ResourceMgr.cxx +++ b/src/Material/Material_ResourceMgr.cxx @@ -178,7 +178,7 @@ void Material_ResourceMgr::watchUserFile( bool on ) myWatcher = new QFileSystemWatcher( this ); QFileInfo ufile = userFileName( appName() ); if ( ufile.exists() ) { - myWatcher->addPath( ufile.filePath() ); + myWatcher->addPath( ufile.filePath() ); } connect( myWatcher, SIGNAL( fileChanged( QString ) ), this, SLOT( update() ) ); } diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index a133fd3b6..eb026c9c4 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -381,11 +381,11 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs() anIO->SetArrowSize(arrowSize); } - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - int w = resMgr->integerValue("Geometry", "measures_line_width", 1); + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + int w = resMgr->integerValue("Geometry", "measures_line_width", 1); Handle(Prs3d_AngleAspect) asp = new Prs3d_AngleAspect(); asp->LineAspect()->SetWidth(w); - anIO->Attributes()->SetAngleAspect(asp); + anIO->Attributes()->SetAngleAspect(asp); SOCC_Prs* aPrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx index 04ccf5785..7b1d13987 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx @@ -371,7 +371,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged() TopoDS_Shape aSubShape = anIndices.FindKey( aObjLst[i] ); QString aType = GEOMBase::GetShapeTypeString( aSubShape ); if ( !aType.isEmpty() ) - aSubShapeList.append( QString( "%1_%2" ).arg( aType ).arg( aObjLst[i] ) ); + aSubShapeList.append( QString( "%1_%2" ).arg( aType ).arg( aObjLst[i] ) ); } } myGrp->ListBox2->clear(); diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx index 43afc8c97..b3c674b91 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx @@ -595,8 +595,8 @@ QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters ) { QString strid = QString( "GEOM_ADVANCED_%1" ).arg( myObj->GetType() ); aKindStr = tr( strid.toLatin1().constData() ) == strid ? - tr( "GEOM_ADVANCED" ).arg( myObj->GetType() ) : - tr( strid.toLatin1().constData() ); + tr( "GEOM_ADVANCED" ).arg( myObj->GetType() ) : + tr( strid.toLatin1().constData() ); break; } default: diff --git a/src/NMTDS/NMTDS_BndSphere.cxx b/src/NMTDS/NMTDS_BndSphere.cxx index b418c3a12..a022f365c 100644 --- a/src/NMTDS/NMTDS_BndSphere.cxx +++ b/src/NMTDS/NMTDS_BndSphere.cxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphere.cxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphere.cxx +// Created: +// Author: Peter KURNEV +// // #include diff --git a/src/NMTDS/NMTDS_BndSphere.hxx b/src/NMTDS/NMTDS_BndSphere.hxx index 18261095d..ce1de2873 100644 --- a/src/NMTDS/NMTDS_BndSphere.hxx +++ b/src/NMTDS/NMTDS_BndSphere.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphere.hxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphere.hxx +// Created: +// Author: Peter KURNEV +// #ifndef _NMTDS_BndSphere_HeaderFile #define _NMTDS_BndSphere_HeaderFile diff --git a/src/NMTDS/NMTDS_BndSphere.lxx b/src/NMTDS/NMTDS_BndSphere.lxx index c1d11f9aa..5af4b70da 100644 --- a/src/NMTDS/NMTDS_BndSphere.lxx +++ b/src/NMTDS/NMTDS_BndSphere.lxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphere.lxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphere.lxx +// Created: +// Author: Peter KURNEV +// //======================================================================= //function : SetCenter //purpose : diff --git a/src/NMTDS/NMTDS_BndSphereTree.cxx b/src/NMTDS/NMTDS_BndSphereTree.cxx index 575e6e78c..71099cd68 100644 --- a/src/NMTDS/NMTDS_BndSphereTree.cxx +++ b/src/NMTDS/NMTDS_BndSphereTree.cxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphereTree.cxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphereTree.cxx +// Created: +// Author: Peter KURNEV +// // #include //======================================================================= diff --git a/src/NMTDS/NMTDS_BndSphereTree.hxx b/src/NMTDS/NMTDS_BndSphereTree.hxx index 35e3251b0..076bc8adb 100644 --- a/src/NMTDS/NMTDS_BndSphereTree.hxx +++ b/src/NMTDS/NMTDS_BndSphereTree.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphereTree.hxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphereTree.hxx +// Created: +// Author: Peter KURNEV +// // #ifndef NMTDS_BndSphereTree_HeaderFile #define NMTDS_BndSphereTree_HeaderFile diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange.cxx b/src/NMTDS/NMTDS_CArray1OfIndexRange.cxx index d0e245078..afba06c29 100644 --- a/src/NMTDS/NMTDS_CArray1OfIndexRange.cxx +++ b/src/NMTDS/NMTDS_CArray1OfIndexRange.cxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_CArray1OfIndexRange.hxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_CArray1OfIndexRange.hxx +// Created: +// Author: Peter KURNEV +// #include diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx index c79bd32ae..dc57adbc2 100644 --- a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx +++ b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_BndSphere.hxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_BndSphere.hxx +// Created: +// Author: Peter KURNEV +// #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile #define _NMTDS_CArray1OfIndexRange_HeaderFile @@ -46,7 +46,7 @@ class NMTDS_CArray1OfIndexRange { Standard_EXPORT NMTDS_CArray1OfIndexRange(const Standard_Integer Length = 0, - const Standard_Integer BlockLength = 5); + const Standard_Integer BlockLength = 5); Standard_EXPORT void Resize(const Standard_Integer theNewLength) ; diff --git a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx index 5fc2d4d4e..f4c477c65 100644 --- a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx +++ b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx -// Created: Mon Feb 20 09:31:43 2012 -// Author: -// +// File: NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx +// Created: Mon Feb 20 09:31:43 2012 +// Author: +// #ifndef NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile diff --git a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx index d745ce6b7..4c959f144 100644 --- a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx +++ b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_DataMapOfIntegerMapOfInteger.hxx -// Created: Mon Feb 20 09:27:40 2012 -// Author: -// +// File: NMTDS_DataMapOfIntegerMapOfInteger.hxx +// Created: Mon Feb 20 09:27:40 2012 +// Author: +// #ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx index 0686ecb5b..c1010d255 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx +++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_IndexedDataMapOfIntegerShape.hxx -// Created: Mon Feb 20 09:20:07 2012 -// Author: -// +// File: NMTDS_IndexedDataMapOfIntegerShape.hxx +// Created: Mon Feb 20 09:20:07 2012 +// Author: +// #ifndef NMTDS_IndexedDataMapOfIntegerShape_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx index f553ca52a..fbc0fbfe9 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx +++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_IndexedDataMapOfShapeBndSphere.hxx -// Created: Mon Feb 20 09:17:01 2012 -// Author: -// +// File: NMTDS_IndexedDataMapOfShapeBndSphere.hxx +// Created: Mon Feb 20 09:17:01 2012 +// Author: +// #ifndef NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx index bac339a72..9c79b380e 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx +++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_IndexedDataMapOfShapeBox.hxx -// Created: Mon Feb 20 09:17:01 2012 -// Author: -// +// File: NMTDS_IndexedDataMapOfShapeBox.hxx +// Created: Mon Feb 20 09:17:01 2012 +// Author: +// #ifndef NMTDS_IndexedDataMapOfShapeBox_HeaderFile diff --git a/src/NMTDS/NMTDS_InterfPool.cxx b/src/NMTDS/NMTDS_InterfPool.cxx index 6a8575006..c416edc24 100644 --- a/src/NMTDS/NMTDS_InterfPool.cxx +++ b/src/NMTDS/NMTDS_InterfPool.cxx @@ -52,7 +52,7 @@ NMTDS_InterfPool::NMTDS_InterfPool() //purpose : //======================================================================= Standard_Boolean NMTDS_InterfPool::Add (const NMTDS_PairBoolean& aPKB, - const NMTDS_InterfType aType) + const NMTDS_InterfType aType) { Standard_Boolean bRet; Standard_Integer iType; @@ -70,8 +70,8 @@ Standard_Boolean NMTDS_InterfPool::Add (const NMTDS_PairBoolean& aPKB, //purpose : //======================================================================= Standard_Boolean NMTDS_InterfPool::Add (const Standard_Integer aInd1, - const Standard_Integer aInd2, - const NMTDS_InterfType aType) + const Standard_Integer aInd2, + const NMTDS_InterfType aType) { NMTDS_PairBoolean aPKB; // @@ -83,9 +83,9 @@ Standard_Boolean NMTDS_InterfPool::Add (const Standard_Integer aInd1, //purpose : //======================================================================= Standard_Boolean NMTDS_InterfPool::Add (const Standard_Integer aInd1, - const Standard_Integer aInd2, - const Standard_Boolean bFlag, - const NMTDS_InterfType aType) + const Standard_Integer aInd2, + const Standard_Boolean bFlag, + const NMTDS_InterfType aType) { NMTDS_PairBoolean aPKB; // diff --git a/src/NMTDS/NMTDS_InterfPool.hxx b/src/NMTDS/NMTDS_InterfPool.hxx index 6699df3fd..d5e71892b 100644 --- a/src/NMTDS/NMTDS_InterfPool.hxx +++ b/src/NMTDS/NMTDS_InterfPool.hxx @@ -53,25 +53,25 @@ class NMTDS_InterfPool { Standard_EXPORT Standard_Boolean Add(const NMTDS_PairBoolean& aPKB, - const NMTDS_InterfType aType) ; + const NMTDS_InterfType aType) ; Standard_EXPORT Standard_Boolean Add(const Standard_Integer aInd1, - const Standard_Integer aInd2, - const NMTDS_InterfType aType) ; + const Standard_Integer aInd2, + const NMTDS_InterfType aType) ; Standard_EXPORT Standard_Boolean Add(const Standard_Integer aInd1, - const Standard_Integer aInd2, - const Standard_Boolean bFlag, - const NMTDS_InterfType aType) ; + const Standard_Integer aInd2, + const Standard_Boolean bFlag, + const NMTDS_InterfType aType) ; Standard_EXPORT Standard_Boolean Contains(const NMTDS_PairBoolean& aPKB) const; Standard_EXPORT Standard_Boolean Contains(const Standard_Integer aInd1, - const Standard_Integer aInd2) const; + const Standard_Integer aInd2) const; Standard_EXPORT const NMTDS_ListOfPairBoolean& Get() const; @@ -84,7 +84,7 @@ class NMTDS_InterfPool { Standard_EXPORT const NMTDS_ListOfPairBoolean& Get(const Standard_Integer aInd, - const NMTDS_InterfType aType) const; + const NMTDS_InterfType aType) const; //! Returns the reference to array Of F/F interferences
Standard_EXPORT BOPTools_CArray1OfSSInterference& SSInterferences() ; diff --git a/src/NMTDS/NMTDS_InterfType.hxx b/src/NMTDS/NMTDS_InterfType.hxx index 034b0ee59..21627d588 100644 --- a/src/NMTDS/NMTDS_InterfType.hxx +++ b/src/NMTDS/NMTDS_InterfType.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_InterfType.hxx -// Created: -// Author: Peter KURNEV -// +// File: NMTDS_InterfType.hxx +// Created: +// Author: Peter KURNEV +// #ifndef _NMTDS_InterfType_HeaderFile diff --git a/src/NMTDS/NMTDS_Iterator.cxx b/src/NMTDS/NMTDS_Iterator.cxx index e364d6fa2..8efe54cd3 100755 --- a/src/NMTDS/NMTDS_Iterator.cxx +++ b/src/NMTDS/NMTDS_Iterator.cxx @@ -125,7 +125,7 @@ Standard_Integer NMTDS_Iterator::BlockLength() const // purpose: //======================================================================= void NMTDS_Iterator::Initialize(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2) + const TopAbs_ShapeEnum aType2) { Standard_Integer iX; // @@ -160,8 +160,8 @@ void NMTDS_Iterator::Next() // purpose: //======================================================================= void NMTDS_Iterator::Current(Standard_Integer& aIndex1, - Standard_Integer& aIndex2, - Standard_Boolean& aWithSubShape) const + Standard_Integer& aIndex2, + Standard_Boolean& aWithSubShape) const { const NMTDS_PairBoolean& aPKB=myIterator.Value(); aPKB.Ids(aIndex1, aIndex2); @@ -323,11 +323,11 @@ void NMTDS_Iterator::Intersect() aMPKXB.Remove(aPKXB); } } - // - aNbLV1=aLV1.Extent(); - if (aNbLV1) { - aMVSD.Bind(i, aLV1); - } + // + aNbLV1=aLV1.Extent(); + if (aNbLV1) { + aMVSD.Bind(i, aLV1); + } } }//for (i=i1; i<=i2; ++i) { }//for (iR=1; iR +// File: NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx index bbd73ed8d..0efd0bed7 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfPair.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListIteratorOfListOfPair.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListIteratorOfListOfPair_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx index 72eb3ad4b..b7b43c1ae 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfPairBoolean.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListIteratorOfListOfPairBoolean.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx index 6986a1349..e7d2a14f2 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfPassKey.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListIteratorOfListOfPassKey.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListIteratorOfListOfPassKey_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx index 896b09d3e..b73ae36f7 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 6b4d67657..9ebb31e80 100644 --- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfPair.hxx b/src/NMTDS/NMTDS_ListOfPair.hxx index fae2d9345..77249fce0 100644 --- a/src/NMTDS/NMTDS_ListOfPair.hxx +++ b/src/NMTDS/NMTDS_ListOfPair.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListOfPair.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListOfPair.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListOfPair_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfPairBoolean.hxx b/src/NMTDS/NMTDS_ListOfPairBoolean.hxx index eefb86dbd..af5928083 100644 --- a/src/NMTDS/NMTDS_ListOfPairBoolean.hxx +++ b/src/NMTDS/NMTDS_ListOfPairBoolean.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListOfPairBoolean.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListOfPairBoolean.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListOfPairBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfPassKey.hxx b/src/NMTDS/NMTDS_ListOfPassKey.hxx index 2de573f4e..18664f273 100644 --- a/src/NMTDS/NMTDS_ListOfPassKey.hxx +++ b/src/NMTDS/NMTDS_ListOfPassKey.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListOfPassKey.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListOfPassKey.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListOfPassKey_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx index 444aa5708..05c1c065f 100644 --- a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx +++ b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListOfPassKeyBoolean.hxx -// Created: Mon Feb 20 07:27:34 2012 -// Author: -// +// File: NMTDS_ListOfPassKeyBoolean.hxx +// Created: Mon Feb 20 07:27:34 2012 +// Author: +// #ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx index 9bee8f67f..0d1cd35f3 100644 --- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx +++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_MapIteratorOfMapOfPairBoolean.hxx -// Created: Mon Feb 20 08:22:39 2012 -// Author: -// +// File: NMTDS_MapIteratorOfMapOfPairBoolean.hxx +// Created: Mon Feb 20 08:22:39 2012 +// Author: +// #ifndef NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx index 7875cbd54..571c62fd7 100644 --- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx +++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMRCol_MapIteratorOfMapOfPassKey.hxx -// Created: Mon Feb 20 08:22:39 2012 -// Author: -// +// File: NMRCol_MapIteratorOfMapOfPassKey.hxx +// Created: Mon Feb 20 08:22:39 2012 +// Author: +// #ifndef NMRCol_MapIteratorOfMapOfPassKey_HeaderFile diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx index 97f43748c..b2568ff91 100644 --- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx +++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMRCol_MapIteratorOfMapOfPassKeyBoolean.hxx -// Created: Mon Feb 20 08:22:39 2012 -// Author: -// +// File: NMRCol_MapIteratorOfMapOfPassKeyBoolean.hxx +// Created: Mon Feb 20 08:22:39 2012 +// Author: +// #ifndef NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_MapOfPairBoolean.hxx b/src/NMTDS/NMTDS_MapOfPairBoolean.hxx index b420d2b69..89dbcc2bd 100644 --- a/src/NMTDS/NMTDS_MapOfPairBoolean.hxx +++ b/src/NMTDS/NMTDS_MapOfPairBoolean.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_MapOfPairBoolean.hxx -// Created: Mon Feb 20 08:19:07 2012 -// Author: -// +// File: NMTDS_MapOfPairBoolean.hxx +// Created: Mon Feb 20 08:19:07 2012 +// Author: +// #ifndef NMTDS_MapOfPairBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_MapOfPassKey.hxx b/src/NMTDS/NMTDS_MapOfPassKey.hxx index f3374f94d..ee65b2fe6 100644 --- a/src/NMTDS/NMTDS_MapOfPassKey.hxx +++ b/src/NMTDS/NMTDS_MapOfPassKey.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_MapOfPassKey.hxx -// Created: Mon Feb 20 08:19:07 2012 -// Author: -// +// File: NMTDS_MapOfPassKey.hxx +// Created: Mon Feb 20 08:19:07 2012 +// Author: +// #ifndef NMTDS_MapOfPassKey_HeaderFile diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx index f6ba5385b..7e3e28fd9 100644 --- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx +++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_MapOfPassKeyBoolean.hxx -// Created: Mon Feb 20 08:19:07 2012 -// Author: -// +// File: NMTDS_MapOfPassKeyBoolean.hxx +// Created: Mon Feb 20 08:19:07 2012 +// Author: +// #ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile diff --git a/src/NMTDS/NMTDS_Pair.cxx b/src/NMTDS/NMTDS_Pair.cxx index 2e8d6b883..1a728eda6 100644 --- a/src/NMTDS/NMTDS_Pair.cxx +++ b/src/NMTDS/NMTDS_Pair.cxx @@ -86,7 +86,7 @@ NMTDS_Pair::NMTDS_Pair(const NMTDS_Pair& aOther) //purpose : //======================================================================= void NMTDS_Pair::SetIds(const Standard_Integer aId1, - const Standard_Integer aId2) + const Standard_Integer aId2) { Clear(); myId1=aId1; @@ -101,7 +101,7 @@ NMTDS_Pair::NMTDS_Pair(const NMTDS_Pair& aOther) //purpose : //======================================================================= void NMTDS_Pair::Ids(Standard_Integer& aId1, - Standard_Integer& aId2) const + Standard_Integer& aId2) const { aId1=myId1; aId2=myId2; diff --git a/src/NMTDS/NMTDS_Pair.hxx b/src/NMTDS/NMTDS_Pair.hxx index c0e5758c1..61fb74fce 100644 --- a/src/NMTDS/NMTDS_Pair.hxx +++ b/src/NMTDS/NMTDS_Pair.hxx @@ -54,11 +54,11 @@ class NMTDS_Pair { Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2) ; + const Standard_Integer aI2) ; Standard_EXPORT void Ids(Standard_Integer& aI1, - Standard_Integer& aI2) const; + Standard_Integer& aI2) const; Standard_EXPORT Standard_Boolean IsEqual(const NMTDS_Pair& aOther) const; diff --git a/src/NMTDS/NMTDS_PairMapHasher.cxx b/src/NMTDS/NMTDS_PairMapHasher.cxx index 7f87e39cb..7cf3f98a5 100644 --- a/src/NMTDS/NMTDS_PairMapHasher.cxx +++ b/src/NMTDS/NMTDS_PairMapHasher.cxx @@ -30,7 +30,7 @@ //purpose : //======================================================================= Standard_Integer NMTDS_PairMapHasher::HashCode(const NMTDS_Pair& aPK, - const Standard_Integer Upper) + const Standard_Integer Upper) { return aPK.HashCode(Upper); } @@ -39,7 +39,7 @@ Standard_Integer NMTDS_PairMapHasher::HashCode(const NMTDS_Pair& aPK, //purpose : //======================================================================= Standard_Boolean NMTDS_PairMapHasher::IsEqual(const NMTDS_Pair& aPK1, - const NMTDS_Pair& aPK2) + const NMTDS_Pair& aPK2) { return aPK1.IsEqual(aPK2); } diff --git a/src/NMTDS/NMTDS_PairMapHasher.hxx b/src/NMTDS/NMTDS_PairMapHasher.hxx index 6ec9efe82..1809ddf03 100644 --- a/src/NMTDS/NMTDS_PairMapHasher.hxx +++ b/src/NMTDS/NMTDS_PairMapHasher.hxx @@ -40,10 +40,10 @@ class NMTDS_PairMapHasher { public: Standard_EXPORT static Standard_Integer HashCode(const NMTDS_Pair& aPKey, - const Standard_Integer Upper) ; + const Standard_Integer Upper) ; Standard_EXPORT static Standard_Boolean IsEqual(const NMTDS_Pair& aPKey1, - const NMTDS_Pair& aPKey2) ; + const NMTDS_Pair& aPKey2) ; }; #endif diff --git a/src/NMTDS/NMTDS_PassKey.hxx b/src/NMTDS/NMTDS_PassKey.hxx index a4e147b4a..4f9870731 100644 --- a/src/NMTDS/NMTDS_PassKey.hxx +++ b/src/NMTDS/NMTDS_PassKey.hxx @@ -61,18 +61,18 @@ class NMTDS_PassKey { Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2) ; + const Standard_Integer aI2) ; Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2, - const Standard_Integer aI3) ; + const Standard_Integer aI2, + const Standard_Integer aI3) ; Standard_EXPORT void SetIds(const Standard_Integer aI1, - const Standard_Integer aI2, - const Standard_Integer aI3, - const Standard_Integer aI4) ; + const Standard_Integer aI2, + const Standard_Integer aI3, + const Standard_Integer aI4) ; Standard_EXPORT void SetIds(const TColStd_ListOfInteger& aLS) ; diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.hxx b/src/NMTDS/NMTDS_PassKeyMapHasher.hxx index ac314ab29..1b879d31d 100644 --- a/src/NMTDS/NMTDS_PassKeyMapHasher.hxx +++ b/src/NMTDS/NMTDS_PassKeyMapHasher.hxx @@ -43,10 +43,10 @@ class NMTDS_PassKeyMapHasher { public: Standard_EXPORT static Standard_Integer HashCode(const NMTDS_PassKey& aPKey, - const Standard_Integer Upper) ; + const Standard_Integer Upper) ; Standard_EXPORT static Standard_Boolean IsEqual(const NMTDS_PassKey& aPKey1, - const NMTDS_PassKey& aPKey2) ; + const NMTDS_PassKey& aPKey2) ; }; #endif diff --git a/src/NMTDS/NMTDS_PassKeyShape.hxx b/src/NMTDS/NMTDS_PassKeyShape.hxx index d5183642d..7db9cf408 100644 --- a/src/NMTDS/NMTDS_PassKeyShape.hxx +++ b/src/NMTDS/NMTDS_PassKeyShape.hxx @@ -60,18 +60,18 @@ class NMTDS_PassKeyShape { Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2) ; + const TopoDS_Shape& aS2) ; Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2, - const TopoDS_Shape& aS3) ; + const TopoDS_Shape& aS2, + const TopoDS_Shape& aS3) ; Standard_EXPORT void SetShapes(const TopoDS_Shape& aS1, - const TopoDS_Shape& aS2, - const TopoDS_Shape& aS3, - const TopoDS_Shape& aS4) ; + const TopoDS_Shape& aS2, + const TopoDS_Shape& aS3, + const TopoDS_Shape& aS4) ; Standard_EXPORT void SetShapes(const TopTools_ListOfShape& aLS) ; diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx index f4af7b028..a6970255c 100644 --- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx +++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx @@ -39,10 +39,10 @@ class NMTDS_PassKeyShapeMapHasher { public: Standard_EXPORT static Standard_Integer HashCode(const NMTDS_PassKeyShape& aPKey, - const Standard_Integer Upper) ; + const Standard_Integer Upper) ; Standard_EXPORT static Standard_Boolean IsEqual(const NMTDS_PassKeyShape& aPKey1, - const NMTDS_PassKeyShape& aPKey2) ; + const NMTDS_PassKeyShape& aPKey2) ; }; #endif diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.cxx b/src/NMTDS/NMTDS_ShapesDataStructure.cxx index 90187b105..a693f97dd 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.cxx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.cxx @@ -372,8 +372,8 @@ void GetAllSuccessorsS(const Standard_Integer nS, // purpose: //======================================================================= void ComputeBoxExS(const Standard_Integer aIx, - const NMTDS_ShapesDataStructure* pDS, - Bnd_Box& aBoxEx) + const NMTDS_ShapesDataStructure* pDS, + Bnd_Box& aBoxEx) { Standard_Integer i, aNbS, iS; // diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.hxx b/src/NMTDS/NMTDS_ShapesDataStructure.hxx index d173f7df2..745e0e81b 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.hxx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.hxx @@ -67,25 +67,25 @@ class NMTDS_ShapesDataStructure : public BooleanOperations_ShapesDataStructure Standard_EXPORT virtual Standard_Integer ShapeIndex(const TopoDS_Shape& aS, - const Standard_Integer iRank) const; + const Standard_Integer iRank) const; Standard_EXPORT void FillMap(const TopoDS_Shape& aS, - BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA, - BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const; + BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA, + BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const; Standard_EXPORT void FillSubshapes(const TopoDS_Shape& aS, - BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA, - BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const; + BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMSA, + BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors& aMS) const; Standard_EXPORT void GetAllSuccessors(const Standard_Integer anIndex, - TColStd_IndexedMapOfInteger& aScrs) const; + TColStd_IndexedMapOfInteger& aScrs) const; Standard_EXPORT void ComputeBoxEx(const Standard_Integer anIndex, - Bnd_Box& aBox) const; + Bnd_Box& aBox) const; protected: diff --git a/src/NMTDS/NMTDS_Tools.hxx b/src/NMTDS/NMTDS_Tools.hxx index 73fd3ad81..77ea0692a 100644 --- a/src/NMTDS/NMTDS_Tools.hxx +++ b/src/NMTDS/NMTDS_Tools.hxx @@ -42,22 +42,22 @@ class NMTDS_Tools public: Standard_EXPORT static Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aT1, - const TopAbs_ShapeEnum aT2) ; + const TopAbs_ShapeEnum aT2) ; Standard_EXPORT static Standard_Boolean HasBRep(const TopAbs_ShapeEnum aT) ; Standard_EXPORT static Standard_Integer ComputeVV(const TopoDS_Vertex& aV1, - const TopoDS_Vertex& aV2) ; + const TopoDS_Vertex& aV2) ; Standard_EXPORT static void CopyShape(const TopoDS_Shape& aS, - TopoDS_Shape& aSC) ; + TopoDS_Shape& aSC) ; Standard_EXPORT static void CopyShape(const TopoDS_Shape& aS, - TopoDS_Shape& aSC, - TopTools_IndexedDataMapOfShapeShape& aMSS) ; + TopoDS_Shape& aSC, + TopTools_IndexedDataMapOfShapeShape& aMSS) ; }; #endif diff --git a/src/NMTTools/NMTTools_CheckerSI.hxx b/src/NMTTools/NMTTools_CheckerSI.hxx index 375dadd17..4def33d31 100644 --- a/src/NMTTools/NMTTools_CheckerSI.hxx +++ b/src/NMTTools/NMTTools_CheckerSI.hxx @@ -61,7 +61,7 @@ class NMTTools_CheckerSI : public NMTTools_PaveFiller Standard_EXPORT virtual void PreparePaveBlocks(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2) ; + const TopAbs_ShapeEnum aType2) ; Standard_Integer myStopStatus; diff --git a/src/NMTTools/NMTTools_DEProcessor.cxx b/src/NMTTools/NMTTools_DEProcessor.cxx index f349776a9..fd7885cae 100644 --- a/src/NMTTools/NMTTools_DEProcessor.cxx +++ b/src/NMTTools/NMTTools_DEProcessor.cxx @@ -484,18 +484,18 @@ aC2D=BRep_Tool::CurveOnSurface(aDE, aDF, aT1, aT2); dT1=aT1-t1; if (dT1<0.) { - dT1=-dT1; + dT1=-dT1; } // dT2=aT2-t2; if (dT2<0.) { - dT2=-dT2; + dT2=-dT2; } aDT=Precision::PConfusion(); if(dT1Clear(); - return; + BOPTools_ListOfPaveBlock* pLPB=(BOPTools_ListOfPaveBlock*)&aSplitEdges; + pLPB->Clear(); + return; } } } diff --git a/src/NMTTools/NMTTools_DEProcessor.hxx b/src/NMTTools/NMTTools_DEProcessor.hxx index c8e35d53a..c48d956c7 100644 --- a/src/NMTTools/NMTTools_DEProcessor.hxx +++ b/src/NMTTools/NMTTools_DEProcessor.hxx @@ -82,31 +82,31 @@ protected: Standard_EXPORT void FindPaveBlocks(const Standard_Integer nED, - const Standard_Integer nVD, - const Standard_Integer nFD, - BOPTools_ListOfPaveBlock& aLPB) ; + const Standard_Integer nVD, + const Standard_Integer nFD, + BOPTools_ListOfPaveBlock& aLPB) ; Standard_EXPORT void FillPaveSet(const Standard_Integer nED, - const Standard_Integer nVD, - const Standard_Integer nFD, - const BOPTools_ListOfPaveBlock& aLPB) ; + const Standard_Integer nVD, + const Standard_Integer nFD, + const BOPTools_ListOfPaveBlock& aLPB) ; Standard_EXPORT void FillSplitEdgesPool(const Standard_Integer nED) ; Standard_EXPORT void MakeSplitEdges(const Standard_Integer nED, - const Standard_Integer nFD) ; + const Standard_Integer nFD) ; Standard_EXPORT void MakeSplitEdge(const TopoDS_Edge& aS1, - const TopoDS_Face& aF, - const TopoDS_Vertex& aV1, - const Standard_Real aP1, - const TopoDS_Vertex& aV2, - const Standard_Real aP2, - TopoDS_Edge& aNewEdge) ; + const TopoDS_Face& aF, + const TopoDS_Vertex& aV1, + const Standard_Real aP1, + const TopoDS_Vertex& aV2, + const Standard_Real aP2, + TopoDS_Edge& aNewEdge) ; NMTTools_PPaveFiller myFiller; diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx index d506cd799..75142deb0 100644 --- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx +++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx -// Created: Mon Feb 20 12:24:47 2012 +// File: NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx +// Created: Mon Feb 20 12:24:47 2012 // Author: -// +// #ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx index 7f6855db6..1dc64a8ef 100644 --- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx +++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx -// Created: Mon Feb 20 12:04:52 2012 +// File: NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx +// Created: Mon Feb 20 12:04:52 2012 // Author: -// +// #ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx index 34827ca12..0300f5ae8 100644 --- a/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx +++ b/src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_DataMapOfIntegerFaceInfo.hxx -// Created: Mon Feb 20 12:21:55 2012 +// File: NMTTools_DataMapOfIntegerFaceInfo.hxx +// Created: Mon Feb 20 12:21:55 2012 // Author: -// +// #ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx index 9a3b28289..4f50b85e7 100644 --- a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx +++ b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_DataMapOfIntegerListOfPaveBlock.hxx -// Created: Mon Feb 20 09:27:40 2012 +// File: NMTTools_DataMapOfIntegerListOfPaveBlock.hxx +// Created: Mon Feb 20 09:27:40 2012 // Author: -// +// #ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx index 57f83af47..827972dde 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx -// Created: Mon Feb 20 09:20:07 2012 +// File: NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx +// Created: Mon Feb 20 09:20:07 2012 // Author: -// +// #ifndef NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx index ed9fb608a..402d5166b 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx @@ -16,14 +16,14 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx -// Created: Mon Feb 20 09:20:07 2012 +// File: NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx +// Created: Mon Feb 20 09:20:07 2012 // Author: -// -// File: NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx -// Created: Mon Feb 20 11:59:23 2012 +// +// File: NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx +// Created: Mon Feb 20 11:59:23 2012 // Author: -// +// #ifndef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx index bfc22d975..472c4034c 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_IndexedDataMapOfShapePaveBlock.hxx -// Created: Mon Feb 20 11:55:34 2012 +// File: NMTTools_IndexedDataMapOfShapePaveBlock.hxx +// Created: Mon Feb 20 11:55:34 2012 // Author: -// +// #ifndef NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx index 943d9032c..0f75fefa5 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfCommonBlock.hxx -// Created: Mon Feb 20 11:25:23 2012 +// File: NMTDS_ListIteratorOfListOfCommonBlock.hxx +// Created: Mon Feb 20 11:25:23 2012 // Author: -// +// #ifndef NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile #define NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx index e0ef6e95a..5741b3566 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTDS_ListIteratorOfListOfCoupleOfShape.hxx -// Created: Mon Feb 20 11:25:23 2012 +// File: NMTDS_ListIteratorOfListOfCoupleOfShape.hxx +// Created: Mon Feb 20 11:25:23 2012 // Author: -// +// #ifndef NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile #define NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx index 49d282e34..208eb93e7 100644 --- a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx +++ b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_ListOfCommonBlock.hxx -// Created: Mon Feb 20 07:27:34 2012 +// File: NMTTools_ListOfCommonBlock.hxx +// Created: Mon Feb 20 07:27:34 2012 // Author: -// +// #ifndef NMTTools_ListOfCommonBlock_HeaderFile #define NMTTools_ListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx index 207f34df6..c4e77d2b6 100644 --- a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_ListOfCoupleOfShape.hxx -// Created: Mon Feb 20 07:27:34 2012 +// File: NMTTools_ListOfCoupleOfShape.hxx +// Created: Mon Feb 20 07:27:34 2012 // Author: -// +// #ifndef NMTTools_ListOfCoupleOfShape_HeaderFile #define NMTTools_ListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx index 717fd3dad..b01c87f95 100644 --- a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx +++ b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx @@ -16,10 +16,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_MapIteratorOfMapOfPaveBlock.hxx -// Created: Mon Feb 20 11:47:30 2012 +// File: NMTTools_MapIteratorOfMapOfPaveBlock.hxx +// Created: Mon Feb 20 11:47:30 2012 // Author: -// +// #ifndef NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx index e65feb38a..e1911a92e 100644 --- a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx +++ b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: NMTTools_MapOfPaveBlock.hxx -// Created: Mon Feb 20 08:19:07 2012 +// File: NMTTools_MapOfPaveBlock.hxx +// Created: Mon Feb 20 08:19:07 2012 // Author: -// +// #ifndef NMTTools_MapOfPaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_PaveFiller.hxx b/src/NMTTools/NMTTools_PaveFiller.hxx index d768dd545..933c77b77 100644 --- a/src/NMTTools/NMTTools_PaveFiller.hxx +++ b/src/NMTTools/NMTTools_PaveFiller.hxx @@ -160,157 +160,157 @@ class NMTTools_PaveFiller { Standard_EXPORT Standard_Integer SplitsInFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - TColStd_ListOfInteger& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer SplitsInFace(const Standard_Integer nE1, - const Standard_Integer nF2, - TColStd_ListOfInteger& aLs) ; + const Standard_Integer nF2, + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer SplitsOnEdge(const Standard_Integer nE1, - const Standard_Integer nE2, - TColStd_ListOfInteger& aLs) ; + const Standard_Integer nE2, + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer SplitsOnFace(const Standard_Integer nE1, - const Standard_Integer nF2, - TColStd_ListOfInteger& aLs) ; + const Standard_Integer nF2, + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer SplitsOnFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - TColStd_ListOfInteger& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer SplitsInFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsInFace(const Standard_Integer nE1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsOnEdge(const Standard_Integer nE1, - const Standard_Integer nE2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nE2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsOnFace(const Standard_Integer nE1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsOnFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsFace(const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Integer SplitsFace(const Standard_Integer nF2, - TColStd_ListOfInteger& aLs) ; + TColStd_ListOfInteger& aLs) ; Standard_EXPORT Standard_Integer CommonBlocksFace(const Standard_Integer nF, - NMTTools_ListOfCommonBlock& aLCB) ; + NMTTools_ListOfCommonBlock& aLCB) ; Standard_EXPORT void PrepareFace(const Standard_Integer nF, - TopoDS_Face& aF) ; + TopoDS_Face& aF) ; Standard_EXPORT const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB) ; Standard_EXPORT const BOPTools_PaveBlock& RealPaveBlock(const BOPTools_PaveBlock& aPB, - TColStd_ListOfInteger& aLB, - Standard_Integer& aIsCommonBlock) ; + TColStd_ListOfInteger& aLB, + Standard_Integer& aIsCommonBlock) ; Standard_EXPORT void RealSplitsFace(const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT Standard_Boolean HasRealSplitsInOnFace(const Standard_Integer nF1, - const Standard_Integer nF2) ; + const Standard_Integer nF2) ; Standard_EXPORT void RealSplitsInFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT void RealSplitsInFace(const Standard_Integer nE1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT void RealSplitsInFace(const Standard_Integer nF1, - BOPTools_ListOfPaveBlock& aLPB) ; + BOPTools_ListOfPaveBlock& aLPB) ; Standard_EXPORT void RealSplitsOnEdge(const Standard_Integer nE1, - const Standard_Integer nE2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nE2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT void RealSplitsOnFace(const Standard_Integer nE1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT void RealSplitsOnFace(const Standard_Integer aBid, - const Standard_Integer nF1, - const Standard_Integer nF2, - BOPTools_ListOfPaveBlock& aLs) ; + const Standard_Integer nF1, + const Standard_Integer nF2, + BOPTools_ListOfPaveBlock& aLs) ; Standard_EXPORT void PrepareSetForFace(const Standard_Integer nF1, - const Standard_Integer nF2, - const BOPTools_ListOfPaveBlock& aLPB, - BOPTools_PaveSet& aPSF) ; + const Standard_Integer nF2, + const BOPTools_ListOfPaveBlock& aLPB, + BOPTools_PaveSet& aPSF) ; Standard_EXPORT void PutPaveOnCurve(const BOPTools_PaveSet& aPSF, - const Standard_Real aTol, - BOPTools_Curve& aBC) ; + const Standard_Real aTol, + BOPTools_Curve& aBC) ; Standard_EXPORT void PutBoundPaveOnCurve(BOPTools_Curve& aBC, - BOPTools_SSInterference& aFF) ; + BOPTools_SSInterference& aFF) ; Standard_EXPORT void PutBoundPaveOnCurve(const gp_Pnt& aP, - const Standard_Real aT, - BOPTools_Curve& aBC, - BOPTools_SSInterference& aFF) ; + const Standard_Real aT, + BOPTools_Curve& aBC, + BOPTools_SSInterference& aFF) ; Standard_EXPORT Standard_Boolean FindPave(const gp_Pnt& aP, - const Standard_Real aTpV, - const BOPTools_PaveSet& aPS, - BOPTools_Pave& aPV) ; + const Standard_Real aTpV, + const BOPTools_PaveSet& aPS, + BOPTools_Pave& aPV) ; Standard_EXPORT Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB, - const BOPTools_PaveBlock& aPBR, - const Standard_Real aTol) ; + const BOPTools_PaveBlock& aPBR, + const Standard_Real aTol) ; Standard_EXPORT Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB, - const BOPTools_ListOfPaveBlock& aLPB, - const Standard_Real aTol) ; + const BOPTools_ListOfPaveBlock& aLPB, + const Standard_Real aTol) ; Standard_EXPORT void MakePCurves() ; @@ -320,27 +320,27 @@ class NMTTools_PaveFiller { Standard_EXPORT Standard_Boolean IsExistingPaveBlock(const BOPTools_PaveBlock& aPB, - const TopTools_ListOfShape& aLPB, - const Standard_Real aTol) ; + const TopTools_ListOfShape& aLPB, + const Standard_Real aTol) ; Standard_EXPORT Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB, - const BOPTools_ListOfPaveBlock& aLPB) ; + const BOPTools_ListOfPaveBlock& aLPB) ; Standard_EXPORT Standard_Integer CheckIntermediatePoint(const BOPTools_PaveBlock& aPB, - const TopoDS_Edge& aE, - const Standard_Real aTol) ; + const TopoDS_Edge& aE, + const Standard_Real aTol) ; Standard_EXPORT void SharedEdges(const Standard_Integer nF1, - const Standard_Integer nF2, - TColStd_ListOfInteger& aLNE, - TopTools_ListOfShape& aLSE) ; + const Standard_Integer nF2, + TColStd_ListOfInteger& aLNE, + TopTools_ListOfShape& aLSE) ; Standard_EXPORT void FuseVertices(const TopoDS_Shape& aC, - TopTools_DataMapOfShapeShape& aDMVV) const; + TopTools_DataMapOfShapeShape& aDMVV) const; Standard_EXPORT void TreatPaveBlocks(NMTTools_ListOfCommonBlock& theLCB) ; @@ -350,11 +350,11 @@ class NMTTools_PaveFiller { Standard_EXPORT Standard_Boolean CheckCoincidence(const BOPTools_PaveBlock& aPB1, - const BOPTools_PaveBlock& aPB2) ; + const BOPTools_PaveBlock& aPB2) ; Standard_EXPORT void PutClosingPaveOnCurve(BOPTools_Curve& aBC, - BOPTools_SSInterference& aFF) ; + BOPTools_SSInterference& aFF) ; protected: Standard_EXPORT @@ -386,12 +386,12 @@ class NMTTools_PaveFiller { Standard_EXPORT virtual void PreparePaveBlocks(const TopAbs_ShapeEnum aType1, - const TopAbs_ShapeEnum aType2) ; + const TopAbs_ShapeEnum aType2) ; Standard_EXPORT void CorrectShrunkRanges(const Standard_Integer aSide, - const BOPTools_Pave& aPave, - IntTools_ShrunkRange& aSR) ; + const BOPTools_Pave& aPave, + IntTools_ShrunkRange& aSR) ; Standard_EXPORT virtual void PreparePaveBlocks(const Standard_Integer anE) ; @@ -401,18 +401,18 @@ class NMTTools_PaveFiller { Standard_EXPORT Standard_Boolean IsSuccessorsComputed(const Standard_Integer iF1, - const Standard_Integer iF2) const; + const Standard_Integer iF2) const; Standard_EXPORT Standard_Boolean IsBlocksCoinside(const BOPTools_PaveBlock& aPB1, - const BOPTools_PaveBlock& aPB2) const; + const BOPTools_PaveBlock& aPB2) const; Standard_EXPORT void RefinePavePool() ; Standard_EXPORT Standard_Integer CheckFacePaves(const TopoDS_Vertex& aV, - const Standard_Integer nF) ; + const Standard_Integer nF) ; Standard_EXPORT void ReplaceCommonBlocks(const NMTTools_ListOfCommonBlock& aLCB) ; @@ -437,14 +437,14 @@ class NMTTools_PaveFiller { Standard_EXPORT void EENewVertices(const TopoDS_Vertex& aV, - const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ; + const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ; Standard_EXPORT void EFNewVertices(const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ; Standard_EXPORT void EFNewVertices(const TopoDS_Vertex& aV, - const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ; + const BooleanOperations_IndexedDataMapOfShapeInteger& aM) ; Standard_EXPORT void UpdateCommonBlocks() ; @@ -472,8 +472,8 @@ class NMTTools_PaveFiller { Standard_EXPORT void CorrectTolR3D(const BOPTools_SSInterference& aFF, - const TColStd_MapOfInteger& aMVStick, - Standard_Real& aTolR3D) ; + const TColStd_MapOfInteger& aMVStick, + Standard_Real& aTolR3D) ; NMTDS_PShapesDataStructure myDS; diff --git a/src/NMTTools/NMTTools_PaveFiller_4.cxx b/src/NMTTools/NMTTools_PaveFiller_4.cxx index ef774277e..83e2b36af 100644 --- a/src/NMTTools/NMTTools_PaveFiller_4.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_4.cxx @@ -1374,15 +1374,15 @@ void NMTTools_PaveFiller::SplitCommonBlock(const NMTTools_CommonBlock& aCB, n21=aPB2.Pave1().Index(); n22=aPB2.Pave2().Index(); if ((n21==n11 && n22==n12) || (n21==n12 && n22==n11)) { - //modified by NIZNHY-PKV Thu Nov 11 08:13:24 2010f - bIsCoincided=CheckCoincidence(aPB2, aPB1); - if (bIsCoincided) { - aCBx.AddPaveBlock(aPB2); - break; - } - //aCBx.AddPaveBlock(aPB2); - //break; - //modified by NIZNHY-PKV Thu Nov 11 08:13:31 2010t + //modified by NIZNHY-PKV Thu Nov 11 08:13:24 2010f + bIsCoincided=CheckCoincidence(aPB2, aPB1); + if (bIsCoincided) { + aCBx.AddPaveBlock(aPB2); + break; + } + //aCBx.AddPaveBlock(aPB2); + //break; + //modified by NIZNHY-PKV Thu Nov 11 08:13:31 2010t } } } @@ -1574,7 +1574,7 @@ void ProcessBlock(const BOPTools_PaveBlock& aPB, // purpose: //======================================================================= Standard_Boolean NMTTools_PaveFiller::CheckCoincidence(const BOPTools_PaveBlock& aPB1, - const BOPTools_PaveBlock& aPB2) + const BOPTools_PaveBlock& aPB2) { Standard_Boolean bRet; Standard_Integer nE1, nE2, aNbPoints; @@ -1606,7 +1606,7 @@ Standard_Boolean NMTTools_PaveFiller::CheckCoincidence(const BOPTools_PaveBlock& if (aDaT21 && aT2x1) { - aFFi.AppendBlock(aPB); - } - } - // + const BOPTools_PaveBlock& aPB=aItMPB.Key(); + if (aMPBX.Add(aPB)) { + aLPB.Append(aPB); + } + // + else { + if (j>1) { + aFFi.AppendBlock(aPB); + } + } + // } } // @@ -412,7 +412,7 @@ void NMTTools_PaveFiller::MakeBlocks() if (bIsExistingPaveBlock) { continue; } - // + // // Checking of validity in 2D // bIsValidIn2D=myContext->IsValidBlockForFaces(aT1, aT2, aIC, aF1, aF2, aTol2D); @@ -1331,34 +1331,34 @@ void NMTTools_PaveFiller::FillFaceInfo() const NMTTools_ListOfCommonBlock& aLCB=myCommonBlockPool(myDS->RefEdge(i)); aItCB.Initialize(aLCB); for (; aItCB.More(); aItCB.Next()) { - const NMTTools_CommonBlock& aCB=aItCB.Value(); - const BOPTools_PaveBlock &aPB1=aCB.PaveBlock1(); - const TColStd_ListOfInteger& aLF=aCB.Faces(); - aNbF=aLF.Extent(); - if (!aNbF) { - continue; - } - // - aItF.Initialize(aLF); - for (; aItF.More(); aItF.Next()) { - nF=aItF.Value(); - if (!myFaceInfo.IsBound(nF)) { - continue; - } - // - NMTTools_FaceInfo& aFI=myFaceInfo.ChangeFind(nF); - aFI.ChangePaveBlocksIn().Add(aPB1); - // - n1=aPB1.Pave1().Index(); - n2=aPB1.Pave2().Index(); - aFI.ChangeVerticesIn().Add(n1); - aFI.ChangeVerticesIn().Add(n2); - } + const NMTTools_CommonBlock& aCB=aItCB.Value(); + const BOPTools_PaveBlock &aPB1=aCB.PaveBlock1(); + const TColStd_ListOfInteger& aLF=aCB.Faces(); + aNbF=aLF.Extent(); + if (!aNbF) { + continue; + } + // + aItF.Initialize(aLF); + for (; aItF.More(); aItF.Next()) { + nF=aItF.Value(); + if (!myFaceInfo.IsBound(nF)) { + continue; + } + // + NMTTools_FaceInfo& aFI=myFaceInfo.ChangeFind(nF); + aFI.ChangePaveBlocksIn().Add(aPB1); + // + n1=aPB1.Pave1().Index(); + n2=aPB1.Pave2().Index(); + aFI.ChangeVerticesIn().Add(n1); + aFI.ChangeVerticesIn().Add(n2); + } } }// if (aType==TopAbs_EDGE) { else if (aType==TopAbs_FACE) { if (!myFaceInfo.IsBound(i)) { - continue; + continue; } // BOPTools_ListOfPaveBlock aLPBOn; @@ -1370,13 +1370,13 @@ void NMTTools_PaveFiller::FillFaceInfo() // anItPB.Initialize(aLPBOn); for (; anItPB.More(); anItPB.Next()) { - const BOPTools_PaveBlock &aPB=anItPB.Value(); - aFI.ChangePaveBlocksOn().Add(aPB); - // - n1=aPB.Pave1().Index(); - n2=aPB.Pave2().Index(); - aFI.ChangeVerticesOn().Add(n1); - aFI.ChangeVerticesOn().Add(n2); + const BOPTools_PaveBlock &aPB=anItPB.Value(); + aFI.ChangePaveBlocksOn().Add(aPB); + // + n1=aPB.Pave1().Index(); + n2=aPB.Pave2().Index(); + aFI.ChangeVerticesOn().Add(n1); + aFI.ChangeVerticesOn().Add(n2); } // }// else if (aType==TopAbs_FACE) { @@ -1397,10 +1397,10 @@ void NMTTools_PaveFiller::FillFaceInfo() BOPTools_VSInterference& aVFj=aVFs(j); aVFj.Indices(n1, n2); if (nF==n1) { - aFI.ChangeVerticesIn().Add(n2); + aFI.ChangeVerticesIn().Add(n2); } else if (nF==n2){ - aFI.ChangeVerticesIn().Add(n1); + aFI.ChangeVerticesIn().Add(n1); } }// for (j=1; j<=aNbVFs; ++j) { // @@ -1410,18 +1410,18 @@ void NMTTools_PaveFiller::FillFaceInfo() BOPTools_ESInterference& aEFj=aEFs(j); aEFj.Indices(n1, n2); if (!(nF==n1 || nF==n2)) { - continue; + continue; } // nX=aEFj.NewShape(); if (nX<1) { - continue; + continue; } // aS=myDS->Shape(nX); aType=aS.ShapeType(); if (aType!=TopAbs_VERTEX) { - continue; + continue; } // aFI.ChangeVerticesIn().Add(nX); @@ -1447,8 +1447,8 @@ void NMTTools_PaveFiller::FillFaceInfo() // //======================================================================= void NMTTools_PaveFiller::CorrectTolR3D(const BOPTools_SSInterference& aFF, - const TColStd_MapOfInteger& aMVStick, - Standard_Real& aTolR3D) + const TColStd_MapOfInteger& aMVStick, + Standard_Real& aTolR3D) { Standard_Boolean bHasBounds; @@ -1545,7 +1545,7 @@ void NMTTools_PaveFiller::CorrectTolR3D(const BOPTools_SSInterference& aFF, // purpose: //======================================================================= void NMTTools_PaveFiller::PutClosingPaveOnCurve(BOPTools_Curve& aBC, - BOPTools_SSInterference& aFFi) + BOPTools_SSInterference& aFFi) { Standard_Boolean bIsClosed, bHasBounds, bAdded; Standard_Integer nVC, j; @@ -1588,15 +1588,15 @@ void NMTTools_PaveFiller::PutClosingPaveOnCurve(BOPTools_Curve& aBC, // for (j=0; j<2; ++j) { if (fabs(aTC-aT[j]) < dT) { - aTx=(!j) ? aT[1] : aT[0]; - aPVx.SetIndex(nVC); - aPVx.SetParam(aTx); - // - aCPS.Append(aPVx); - aFFiPS.Append(aPVx); - // - bAdded=Standard_True; - break; + aTx=(!j) ? aT[1] : aT[0]; + aPVx.SetIndex(nVC); + aPVx.SetParam(aTx); + // + aCPS.Append(aPVx); + aFFiPS.Append(aPVx); + // + bAdded=Standard_True; + break; } } } diff --git a/src/NMTTools/NMTTools_PaveFiller_8.cxx b/src/NMTTools/NMTTools_PaveFiller_8.cxx index 35bd67988..f21cfd288 100644 --- a/src/NMTTools/NMTTools_PaveFiller_8.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_8.cxx @@ -694,10 +694,10 @@ static void SortPaveBlocks(BOPTools_ListOfPaveBlock &); static void SortShell(const Standard_Integer, - BOPTools_PaveBlock *); + BOPTools_PaveBlock *); static Standard_Boolean Less(const BOPTools_PaveBlock &, - const BOPTools_PaveBlock &); + const BOPTools_PaveBlock &); //======================================================================= // function: RealSplitsInFace @@ -721,11 +721,11 @@ static for (; aItCB.More(); aItCB.Next()) { NMTTools_CommonBlock& aCB=aItCB.ChangeValue(); if (aCB.IsPaveBlockOnFace(nF)) { - const BOPTools_PaveBlock& aPB1=aCB.PaveBlock1(); - nSpIn=aPB1.Edge(); - if (aMFence.Add(nSpIn)){ - aLPB.Append(aPB1); - } + const BOPTools_PaveBlock& aPB1=aCB.PaveBlock1(); + nSpIn=aPB1.Edge(); + if (aMFence.Add(nSpIn)){ + aLPB.Append(aPB1); + } } } } @@ -775,7 +775,7 @@ void SortPaveBlocks(BOPTools_ListOfPaveBlock &aLPBIn) //purpose : //======================================================================= void SortShell(const Standard_Integer n, - BOPTools_PaveBlock *a) + BOPTools_PaveBlock *a) { Standard_Integer nd, i, j, l, d=1; BOPTools_PaveBlock x; @@ -794,11 +794,11 @@ void SortShell(const Standard_Integer n, l=j+d; if (Less(a[l], a[j])) { //if (a[l] < a[j]){ - x=a[j]; - a[j]=a[l]; - a[l]=x; - j-=d; - if (j > -1) goto m30; + x=a[j]; + a[j]=a[l]; + a[l]=x; + j-=d; + if (j > -1) goto m30; }//if (a[l] < a[j]){ }//for (i=0; iShadingAspect()->Aspect()->SetFrontMaterial(aMatAspect); - myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(aMatAspect); + aMatAspect.SetAmbient( 0.5 ); + aMatAspect.SetDiffuse( 0.5 ); + aMatAspect.SetEmissive( 0.5 ); + aMatAspect.SetShininess(0.5 ); + aMatAspect.SetSpecular( 0.5 ); + + myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(aMatAspect); + myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(aMatAspect); } } @@ -213,10 +213,10 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent // Restore wireframe edges colors restoreBoundaryColors(); if(isTopLev) { - SetColor(topLevelColor()); - Handle(Prs3d_LineAspect) anAspect = Attributes()->WireAspect(); - anAspect->SetColor( topLevelColor() ); - Attributes()->SetWireAspect( anAspect ); + SetColor(topLevelColor()); + Handle(Prs3d_LineAspect) anAspect = Attributes()->WireAspect(); + anAspect->SetColor( topLevelColor() ); + Attributes()->SetWireAspect( anAspect ); } StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); break; @@ -232,9 +232,9 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent case 3: //StdSelect_DM_HLR: { if(!isTopLev) - AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); + AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); else - shadingMode(aPresentationManager, aPrs, AIS_Shaded); + shadingMode(aPresentationManager, aPrs, AIS_Shaded); break; } } @@ -362,8 +362,8 @@ void GEOM_AISShape::SetDisplayVectors(bool isDisplayed) } void GEOM_AISShape::shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, - const Handle(Prs3d_Presentation)& aPrs, - const Standard_Integer aMode) + const Handle(Prs3d_Presentation)& aPrs, + const Standard_Integer aMode) { myDrawer->ShadingAspect()->Aspect()->SetDistinguishOn(); @@ -486,9 +486,9 @@ void GEOM_AISShape::setTopLevelDisplayMode(const GEOM_AISShape::TopLevelDispMode } Standard_Boolean GEOM_AISShape::switchTopLevel() { - return myTopLevelDm != TopShowAdditionalWActor; + return myTopLevelDm != TopShowAdditionalWActor; } Standard_Boolean GEOM_AISShape::toActivate() { - return Standard_True; + return Standard_True; } diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 128095ce1..db0fe6176 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -125,8 +125,8 @@ public: const Standard_Integer aMode = 0) ; virtual bool isShowVectors () { return myDisplayVectors; } - virtual Standard_Boolean switchTopLevel(); - virtual Standard_Boolean toActivate(); + virtual Standard_Boolean switchTopLevel(); + virtual Standard_Boolean toActivate(); // Type management // @@ -140,7 +140,7 @@ public: void storeBoundaryColors(); - static Quantity_Color topLevelColor(); + static Quantity_Color topLevelColor(); static void setTopLevelColor(const Quantity_Color c); static TopLevelDispMode topLevelDisplayMode(); @@ -152,8 +152,8 @@ public: protected: void shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, - const Handle(Prs3d_Presentation)& aPrs, - const Standard_Integer aMode); + const Handle(Prs3d_Presentation)& aPrs, + const Standard_Integer aMode); void restoreBoundaryColors(); diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 40200dc19..ac3d53d45 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -310,14 +310,14 @@ setDisplayMode(int theMode) if ( theMode == (int)eShadingWithEdges ) { // Coloring edges myIsolatedEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0], - myEdgesInShadingColor[1], - myEdgesInShadingColor[2]); + myEdgesInShadingColor[1], + myEdgesInShadingColor[2]); myOneFaceEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0], - myEdgesInShadingColor[1], - myEdgesInShadingColor[2]); + myEdgesInShadingColor[1], + myEdgesInShadingColor[2]); mySharedEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0], - myEdgesInShadingColor[1], - myEdgesInShadingColor[2]); + myEdgesInShadingColor[1], + myEdgesInShadingColor[2]); } else { // Restore number of iso-lines @@ -325,14 +325,14 @@ setDisplayMode(int theMode) // Coloring edges myIsolatedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0], - myIsolatedEdgeColor[1], - myIsolatedEdgeColor[2]); + myIsolatedEdgeColor[1], + myIsolatedEdgeColor[2]); mySharedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0], - myIsolatedEdgeColor[1], - myIsolatedEdgeColor[2]); + myIsolatedEdgeColor[1], + myIsolatedEdgeColor[2]); myOneFaceEdgeActor->GetProperty()->SetColor(myOneFaceEdgeColor[0], - myOneFaceEdgeColor[1], - myOneFaceEdgeColor[2]); + myOneFaceEdgeColor[1], + myOneFaceEdgeColor[2]); } VTKViewer_Actor::setDisplayMode(theMode); @@ -423,7 +423,7 @@ SetDeflection(float theDeflection) void GEOM_Actor::SetShape (const TopoDS_Shape& theShape, float theDeflection, - bool theIsVector) + bool theIsVector) { myShape = theShape; diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index 2b9707ade..de7ab52da 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -62,8 +62,8 @@ public: static GEOM_Actor* New(); void SetShape(const TopoDS_Shape& theShape, - float theDeflection, - bool theIsVector = false); + float theDeflection, + bool theIsVector = false); void SetDeflection(float theDeflection); float GetDeflection() const{ return myDeflection;} diff --git a/src/OBJECT/GEOM_TopWireframeShape.cxx b/src/OBJECT/GEOM_TopWireframeShape.cxx index 92f9aefaa..9c11e65e0 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.cxx +++ b/src/OBJECT/GEOM_TopWireframeShape.cxx @@ -46,13 +46,13 @@ GEOM_TopWireframeShape::GEOM_TopWireframeShape(const TopoDS_Shape& shape) : SALOME_AISShape(shape) { - SetDisplayMode(AIS_WireFrame); - Handle(Prs3d_IsoAspect) anAspect = Attributes()->UIsoAspect(); - anAspect->SetNumber( 0 ); - Attributes()->SetUIsoAspect( anAspect ); - anAspect = Attributes()->VIsoAspect(); - anAspect->SetNumber( 0 ); - Attributes()->SetVIsoAspect( anAspect ); + SetDisplayMode(AIS_WireFrame); + Handle(Prs3d_IsoAspect) anAspect = Attributes()->UIsoAspect(); + anAspect->SetNumber( 0 ); + Attributes()->SetUIsoAspect( anAspect ); + anAspect = Attributes()->VIsoAspect(); + anAspect->SetNumber( 0 ); + Attributes()->SetVIsoAspect( anAspect ); SetColor(GEOM_AISShape::topLevelColor()); } @@ -94,11 +94,11 @@ void GEOM_TopWireframeShape::setTopLevel(Standard_Boolean /*f*/) { } Standard_Boolean GEOM_TopWireframeShape::toActivate() { - return Standard_False; + return Standard_False; } Standard_Boolean GEOM_TopWireframeShape::switchTopLevel() { - return Standard_True; + return Standard_True; } void GEOM_TopWireframeShape::setIO(const Handle(SALOME_InteractiveObject)& io){ diff --git a/src/OBJECT/GEOM_TopWireframeShape.hxx b/src/OBJECT/GEOM_TopWireframeShape.hxx index fb049b550..0717eb500 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.hxx +++ b/src/OBJECT/GEOM_TopWireframeShape.hxx @@ -85,7 +85,7 @@ public: Standard_Boolean IsKind(const Handle(Standard_Type)&) const; - void setIO(const Handle(SALOME_InteractiveObject)& io); + void setIO(const Handle(SALOME_InteractiveObject)& io); protected: diff --git a/src/OBJECT/GEOM_VTKPropertyMaterial.hxx b/src/OBJECT/GEOM_VTKPropertyMaterial.hxx index 9f54251c7..25cdfc0fb 100755 --- a/src/OBJECT/GEOM_VTKPropertyMaterial.hxx +++ b/src/OBJECT/GEOM_VTKPropertyMaterial.hxx @@ -46,7 +46,7 @@ public: static GEOM_VTKPropertyMaterial* New(); protected: - bool Physical; + bool Physical; }; #endif diff --git a/src/OCC2VTK/OCC2VTK_Tools.cxx b/src/OCC2VTK/OCC2VTK_Tools.cxx index d681e6ff0..3614b390b 100755 --- a/src/OCC2VTK/OCC2VTK_Tools.cxx +++ b/src/OCC2VTK/OCC2VTK_Tools.cxx @@ -61,8 +61,8 @@ namespace GEOM const TopoDS_Face& aFace = TopoDS::Face(ex.Current()); Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc); if(aPoly.IsNull()) { - alreadymeshed = Standard_False; - break; + alreadymeshed = Standard_False; + break; } } @@ -70,7 +70,7 @@ namespace GEOM Bnd_Box B; BRepBndLib::Add(theShape, B); if ( B.IsVoid() ) - return; // NPAL15983 (Bug when displaying empty groups) + return; // NPAL15983 (Bug when displaying empty groups) Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; B.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); diff --git a/src/OCC2VTK/OCC2VTK_Tools.h b/src/OCC2VTK/OCC2VTK_Tools.h index 9d873051e..0d9295a28 100755 --- a/src/OCC2VTK/OCC2VTK_Tools.h +++ b/src/OCC2VTK/OCC2VTK_Tools.h @@ -34,7 +34,7 @@ namespace GEOM // moved from GEOM_AssemblyBuilder OCC2VTK_EXPORT void MeshShape(const TopoDS_Shape theShape, float& theDeflection, - bool theForced = true); + bool theForced = true); // moved from GEOM_Actor OCC2VTK_EXPORT void SetShape(const TopoDS_Shape& theShape, diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index 1ed537eeb..a7bca8c4e 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -535,7 +535,7 @@ void OperationGUI_ChamferDlg::SelectionIntoArgument() if (aSelList.Extent() == 0 && !myShape->_is_nil()) { disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); ObjectList list; - list.push_back(myShape); + list.push_back(myShape); selectObjects(list); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx index 5d09063bb..1cb2591e7 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.cxx +++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx @@ -431,7 +431,7 @@ void OperationGUI_FilletDlg::SelectionIntoArgument() if (aSelList.Extent() == 0 && !myShape->_is_nil()) { disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); ObjectList list; - list.push_back(myShape); + list.push_back(myShape); selectObjects(list); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index b2576b701..b4734af12 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -285,7 +285,7 @@ void PrimitiveGUI_ConeDlg::SelectionIntoArgument() disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); } } diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index b7aa64094..8acd5e87d 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -278,7 +278,7 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument() disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); } } diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx index 22ae5e2f0..7672d82a1 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx @@ -317,32 +317,32 @@ void PrimitiveGUI_DiskDlg::SelectionIntoArgument() disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); if (myEditCurrentArgument == GroupPntVecR->LineEdit1) { myPoint = aSelectedObject; if (myPoint && !myDir) - GroupPntVecR->PushButton2->click(); + GroupPntVecR->PushButton2->click(); } else if (myEditCurrentArgument == GroupPntVecR->LineEdit2) { myDir = aSelectedObject; if (myDir && !myPoint) - GroupPntVecR->PushButton1->click(); + GroupPntVecR->PushButton1->click(); } else if (myEditCurrentArgument == Group3Pnts->LineEdit1) { myPoint1 = aSelectedObject; if (myPoint1 && !myPoint2) - Group3Pnts->PushButton2->click(); + Group3Pnts->PushButton2->click(); } else if (myEditCurrentArgument == Group3Pnts->LineEdit2) { myPoint2 = aSelectedObject; if (myPoint2 && !myPoint3) - Group3Pnts->PushButton3->click(); + Group3Pnts->PushButton3->click(); } else if (myEditCurrentArgument == Group3Pnts->LineEdit3) { myPoint3 = aSelectedObject; if (myPoint3 && !myPoint1) - Group3Pnts->PushButton1->click(); + Group3Pnts->PushButton1->click(); } } diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index ff08dc235..10783693b 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -263,17 +263,17 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument() disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); if (myEditCurrentArgument == GroupPoints->LineEdit1) { myPoint = aSelectedObject; if (myPoint && !myDir) - GroupPoints->PushButton2->click(); + GroupPoints->PushButton2->click(); } else if (myEditCurrentArgument == GroupPoints->LineEdit2) { myDir = aSelectedObject; if (myDir && !myPoint) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); } } diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 6ea89dfd4..f309e8691 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -491,9 +491,10 @@ void RepairGUI_ShapeProcessDlg::loadDefaults() } // Retrieve default parameters for ALL operators - for ( int i = 0; i < myOpList->count(); i++ ) { - CORBA::String_var anOperator = CORBA::string_dup( myOpList->item( i )->text().toLatin1().constData() ); - anOp->GetOperatorParameters( anOperator.in(), aParams, aValues ); + for ( int i = 0; i < myOpList->count(); i++ ) + { + QString anOperator = myOpList->item( i )->text(); + anOp->GetOperatorParameters( anOperator.toLatin1().constData(), aParams, aValues ); // set default values of parameters if ( aParams->length() != aValues->length() ) @@ -680,8 +681,8 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getActiveOperators() anOperators->length( aCheckedList.count() ); for ( int i = 0; i < aCheckedList.count(); i++ ) - anOperators[i] = CORBA::string_dup( aCheckedList[i].toLatin1().constData() ); - + anOperators[i] = aCheckedList[i].toLatin1().constData(); + return anOperators._retn(); } diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx index 3fa50263e..c9d161d38 100644 --- a/src/SKETCHER/Sketcher_Profile.cxx +++ b/src/SKETCHER/Sketcher_Profile.cxx @@ -59,77 +59,77 @@ public: virtual void initCommand() = 0; virtual void addPoint( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) = 0; + const TCollection_AsciiString& y ) = 0; virtual void addAngle( const TCollection_AsciiString& angle ) = 0; virtual void addSegmentParalX( const TCollection_AsciiString& x ) = 0; virtual void addSegmentParalXToZero() = 0; virtual void addSegmentParalY( const TCollection_AsciiString& y ) = 0; virtual void addSegmentParalYToZero() = 0; virtual void addSegmentAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) = 0; + const TCollection_AsciiString& y ) = 0; virtual void addSegmentRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) = 0; + const TCollection_AsciiString& dy ) = 0; virtual void addSegmentLength( const TCollection_AsciiString& length ) = 0; virtual void addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ) = 0; + int CurrentIndex ) = 0; virtual void addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ) = 0; + int CurrentIndex ) = 0; virtual void addSegmentAngleLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& length, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& length, + int& CurrentIndex ) = 0; virtual void addSegmentAngleX( const TCollection_AsciiString& angle, - const TCollection_AsciiString& x, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& x, + int& CurrentIndex ) = 0; virtual void addSegmentAngleY( const TCollection_AsciiString& angle, - const TCollection_AsciiString& y, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& y, + int& CurrentIndex ) = 0; virtual void addSegmentDirectionLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& length, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& length, + int& CurrentIndex ) = 0; virtual void addSegmentDirectionX( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& x, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& x, + int& CurrentIndex ) = 0; virtual void addSegmentDirectionY( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& y, - int& CurrentIndex ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& y, + int& CurrentIndex ) = 0; virtual void addArcAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) = 0; + const TCollection_AsciiString& y ) = 0; virtual void addArcRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) = 0; + const TCollection_AsciiString& dy ) = 0; virtual void addArcRadiusAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) = 0; + const TCollection_AsciiString& y, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) = 0; virtual void addArcRadiusRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) = 0; virtual void addArcCenterAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) = 0; + const TCollection_AsciiString& y, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) = 0; virtual void addArcCenterRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) = 0; virtual void addArcRadiusLength( const TCollection_AsciiString& radius, - const TCollection_AsciiString& length ) = 0; + const TCollection_AsciiString& length ) = 0; virtual void addArcAngleRadiusLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) = 0; + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) = 0; virtual void addArcDirectionRadiusLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) = 0; + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) = 0; virtual void closeWire() = 0; virtual void closeWireAndBuildFace() = 0; @@ -159,7 +159,7 @@ public: virtual void initCommand(); virtual void addPoint( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addAngle( const TCollection_AsciiString& angle ); virtual void addSegmentParalX( const TCollection_AsciiString& x ); virtual void addSegmentParalXToZero(); @@ -167,72 +167,72 @@ public: virtual void addSegmentParalYToZero(); virtual void setAngle( const TCollection_AsciiString& angle ); virtual void setDirection( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ); + const TCollection_AsciiString& dy ); virtual void addSegmentAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addSegmentRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ); + const TCollection_AsciiString& dy ); virtual void addSegmentLength( const TCollection_AsciiString& length ); virtual void addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ); + int CurrentIndex ); virtual void addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ); + int CurrentIndex ); virtual void addSegmentAngleLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& length, - int& CurrentIndex ); + const TCollection_AsciiString& length, + int& CurrentIndex ); virtual void addSegmentAngleX( const TCollection_AsciiString& angle, - const TCollection_AsciiString& x, - int& CurrentIndex ); + const TCollection_AsciiString& x, + int& CurrentIndex ); virtual void addSegmentAngleY( const TCollection_AsciiString& angle, - const TCollection_AsciiString& y, - int& CurrentIndex ); + const TCollection_AsciiString& y, + int& CurrentIndex ); virtual void addSegmentDirectionLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& length, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& length, + int& CurrentIndex ); virtual void addSegmentDirectionX( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& x, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& x, + int& CurrentIndex ); virtual void addSegmentDirectionY( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& y, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& y, + int& CurrentIndex ); virtual void addArcAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addArcRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ); + const TCollection_AsciiString& dy ); virtual void addArcRadiusAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ); + const TCollection_AsciiString& y, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ); virtual void addArcRadiusRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ); virtual void addArcCenterAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ); + const TCollection_AsciiString& y, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ); virtual void addArcCenterRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ); virtual void addArcRadiusLength( const TCollection_AsciiString& radius, - const TCollection_AsciiString& length ); + const TCollection_AsciiString& length ); virtual void addArcAngleRadiusLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ); + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ); virtual void addArcDirectionRadiusLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ); virtual void closeWire(); virtual void closeWireAndBuildFace(); @@ -274,77 +274,77 @@ public: virtual void initCommand(); virtual void addPoint( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addAngle( const TCollection_AsciiString& angle ); virtual void addSegmentParalX( const TCollection_AsciiString& x ); virtual void addSegmentParalXToZero(); virtual void addSegmentParalY( const TCollection_AsciiString& y ); virtual void addSegmentParalYToZero(); virtual void addSegmentAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addSegmentRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ); + const TCollection_AsciiString& dy ); virtual void addSegmentLength( const TCollection_AsciiString& length ); virtual void addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ); + int CurrentIndex ); virtual void addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ); + int CurrentIndex ); virtual void addSegmentAngleLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& length, - int& CurrentIndex ); + const TCollection_AsciiString& length, + int& CurrentIndex ); virtual void addSegmentAngleX( const TCollection_AsciiString& angle, - const TCollection_AsciiString& x, - int& CurrentIndex ); + const TCollection_AsciiString& x, + int& CurrentIndex ); virtual void addSegmentAngleY( const TCollection_AsciiString& angle, - const TCollection_AsciiString& y, - int& CurrentIndex ); + const TCollection_AsciiString& y, + int& CurrentIndex ); virtual void addSegmentDirectionLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& length, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& length, + int& CurrentIndex ); virtual void addSegmentDirectionX( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& x, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& x, + int& CurrentIndex ); virtual void addSegmentDirectionY( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& y, - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& y, + int& CurrentIndex ); virtual void addArcAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ); + const TCollection_AsciiString& y ); virtual void addArcRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ); + const TCollection_AsciiString& dy ); virtual void addArcRadiusAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ); + const TCollection_AsciiString& y, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ); virtual void addArcRadiusRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ); virtual void addArcCenterAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ); + const TCollection_AsciiString& y, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ); virtual void addArcCenterRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ); virtual void addArcRadiusLength( const TCollection_AsciiString& radius, - const TCollection_AsciiString& length ); + const TCollection_AsciiString& length ); virtual void addArcAngleRadiusLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ); + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ); virtual void addArcDirectionRadiusLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ); + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ); virtual void closeWire(); virtual void closeWireAndBuildFace(); @@ -462,7 +462,7 @@ void Sketcher_Profile::ShapeFunctor::initCommand() \internal */ void Sketcher_Profile::ShapeFunctor::addPoint( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { if ( !myFirst ) { MESSAGE("profile : The addPoint instruction must precede all moves"); @@ -558,7 +558,7 @@ void Sketcher_Profile::ShapeFunctor::setAngle( const TCollection_AsciiString& an \internal */ void Sketcher_Profile::ShapeFunctor::setDirection( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) + const TCollection_AsciiString& dy ) { Standard_Real vx = dx.RealValue(); Standard_Real vy = dy.RealValue(); @@ -578,7 +578,7 @@ void Sketcher_Profile::ShapeFunctor::setDirection( const TCollection_AsciiString \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { Standard_Real vx = x.RealValue() - myX; Standard_Real vy = y.RealValue() - myY; @@ -599,7 +599,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAbsolute( const TCollection_Ascii \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) + const TCollection_AsciiString& dy ) { Standard_Real vx = dx.RealValue(); Standard_Real vy = dy.RealValue(); @@ -634,7 +634,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentLength( const TCollection_AsciiSt \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ) + int CurrentIndex ) { myLength = x.RealValue(); if ( Abs( myDx ) < Precision::Confusion() ) { @@ -655,7 +655,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ) + int CurrentIndex ) { myLength = y.RealValue(); if ( Abs( myDy ) < Precision::Confusion() ) { @@ -677,8 +677,8 @@ void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentAngleLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& length, - int& CurrentIndex ) + const TCollection_AsciiString& length, + int& CurrentIndex ) { setAngle( angle ); setMove( CurrentIndex ); @@ -693,8 +693,8 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAngleLength( const TCollection_As \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentAngleX( const TCollection_AsciiString& angle, - const TCollection_AsciiString& x, - int& CurrentIndex ) + const TCollection_AsciiString& x, + int& CurrentIndex ) { setAngle( angle ); setMove( CurrentIndex ); @@ -709,8 +709,8 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAngleX( const TCollection_AsciiSt \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentAngleY( const TCollection_AsciiString& angle, - const TCollection_AsciiString& y, - int& CurrentIndex ) + const TCollection_AsciiString& y, + int& CurrentIndex ) { setAngle( angle ); setMove( CurrentIndex ); @@ -726,9 +726,9 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAngleY( const TCollection_AsciiSt \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& length, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& length, + int& CurrentIndex ) { setDirection( dx, dy ); setMove( CurrentIndex ); @@ -744,9 +744,9 @@ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionLength( const TCollectio \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionX( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& x, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& x, + int& CurrentIndex ) { setDirection( dx, dy ); setMove( CurrentIndex ); @@ -762,9 +762,9 @@ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionX( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionY( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& y, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& y, + int& CurrentIndex ) { setDirection( dx, dy ); setMove( CurrentIndex ); @@ -778,7 +778,7 @@ void Sketcher_Profile::ShapeFunctor::addSegmentDirectionY( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addArcAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { Standard_Real vx = x.RealValue() - myX; Standard_Real vy = y.RealValue() - myY; @@ -808,7 +808,7 @@ void Sketcher_Profile::ShapeFunctor::addArcAbsolute( const TCollection_AsciiStri \internal */ void Sketcher_Profile::ShapeFunctor::addArcRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) + const TCollection_AsciiString& dy ) { Standard_Real vx = dx.RealValue(); Standard_Real vy = dy.RealValue(); @@ -840,9 +840,9 @@ void Sketcher_Profile::ShapeFunctor::addArcRelative( const TCollection_AsciiStri \internal */ void Sketcher_Profile::ShapeFunctor::addArcRadiusAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) + const TCollection_AsciiString& y, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) { Standard_Real vx = x.RealValue() - myX; Standard_Real vy = y.RealValue() - myY; @@ -857,9 +857,9 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusAbsolute( const TCollection_Asc if ( reversed == 2 ) myAngle = myAngle - 2 * M_PI; myDx = 0.5 * ( vy * 1.0 / myRadius - + vx * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); + + vx * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); myDy = -0.5 * ( vx * 1.0 / myRadius - - vy * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); + - vy * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); myMove = circle; } else { @@ -876,9 +876,9 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusAbsolute( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addArcRadiusRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) { Standard_Real vx = dx.RealValue(); Standard_Real vy = dy.RealValue(); @@ -893,9 +893,9 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusRelative( const TCollection_Asc if ( reversed == 2 ) myAngle = myAngle - 2 * M_PI; myDx = 0.5 * ( vy * 1.0 / myRadius - + vx * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); + + vx * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); myDy = -0.5 * ( vx * 1.0 / myRadius - - vy * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); + - vy * Sqrt( 4.0 / ( vx * vx + vy * vy ) - 1.0 / ( myRadius * myRadius ) ) ); myMove = circle; } else { @@ -914,11 +914,11 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusRelative( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addArcCenterAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) + const TCollection_AsciiString& y, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) { Standard_Real vx = x.RealValue() - myX; Standard_Real vy = y.RealValue() - myY; @@ -940,8 +940,8 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterAbsolute( const TCollection_Asc if ( error > Precision::Confusion() && control_Tolerance == 1 ) // Don't create the arc if the end point myMove = none; // is too far from it else if ( ( length > Precision::Confusion() ) && - ( length2 > Precision::Confusion() ) && - ( length3 > Precision::Confusion() ) ) { + ( length2 > Precision::Confusion() ) && + ( length3 > Precision::Confusion() ) ) { Standard_Real c = ( myRadius * myRadius - ( vx * vxc + vy * vyc ) ) / ( myRadius * Sqrt( ( vx - vxc ) * ( vx - vxc ) + ( vy - vyc ) * ( vy - vyc ) ) ) ; // Cosine of arc angle myAngle = acos(c); // angle in [0,Pi] @@ -969,11 +969,11 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterAbsolute( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addArcCenterRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) { Standard_Real vx = dx.RealValue(); Standard_Real vy = dy.RealValue(); @@ -994,8 +994,8 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterRelative( const TCollection_Asc if ( error > Precision::Confusion() && control_Tolerance == 1 ) // Don't create the arc if the end point myMove = none; // is too far from it else if ( ( length > Precision::Confusion() ) && - ( length2 > Precision::Confusion() ) && - ( length3 > Precision::Confusion() ) ) { + ( length2 > Precision::Confusion() ) && + ( length3 > Precision::Confusion() ) ) { Standard_Real c = ( myRadius * myRadius - ( vx * vxc + vy * vyc ) ) / ( myRadius * Sqrt( ( vx - vxc ) * ( vx - vxc ) + ( vy - vyc ) * ( vy - vyc ) ) ) ; // Cosine of arc angle myAngle = acos( c ); // angle in [0,Pi] @@ -1019,7 +1019,7 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterRelative( const TCollection_Asc \internal */ void Sketcher_Profile::ShapeFunctor::addArcRadiusLength( const TCollection_AsciiString& radius, - const TCollection_AsciiString& length ) + const TCollection_AsciiString& length ) { myRadius = radius.RealValue(); if ( Abs( myRadius ) > Precision::Confusion() ) { @@ -1039,9 +1039,9 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusLength( const TCollection_Ascii \internal */ void Sketcher_Profile::ShapeFunctor::addArcAngleRadiusLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) { setAngle( angle ); setMove( CurrentIndex ); @@ -1058,10 +1058,10 @@ void Sketcher_Profile::ShapeFunctor::addArcAngleRadiusLength( const TCollection_ \internal */ void Sketcher_Profile::ShapeFunctor::addArcDirectionRadiusLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) { setDirection( dx, dy ); setMove( CurrentIndex ); @@ -1099,14 +1099,14 @@ void Sketcher_Profile::ShapeFunctor::setMove( int& CurrentIndex ) case line : { if ( myLength < 0 ) { - myLength = -myLength; - myDx = -myDx; - myDy = -myDy; + myLength = -myLength; + myDx = -myDx; + myDy = -myDy; } Handle(Geom2d_Line) l = new Geom2d_Line( gp_Pnt2d( myX, myY ),gp_Dir2d( myDx, myDy ) ); BRepBuilderAPI_MakeEdge ME( GeomAPI::To3d( l, myPlane ), 0, myLength ); if ( !ME.IsDone() ) - return; + return; myMakeWire.Add( ME ); myX += myLength * myDx; myY += myLength * myDy; @@ -1116,20 +1116,20 @@ void Sketcher_Profile::ShapeFunctor::setMove( int& CurrentIndex ) { Standard_Boolean sense = Standard_True; if ( myRadius < 0 ) { - myRadius = -myRadius; - sense = !sense; - myDx = -myDx; - myDy = -myDy; + myRadius = -myRadius; + sense = !sense; + myDx = -myDx; + myDy = -myDy; } gp_Ax2d ax( gp_Pnt2d( myX - myRadius * myDy, myY + myRadius * myDx ), gp_Dir2d( myDy, -myDx ) ); if ( myAngle < 0 ) { - myAngle = -myAngle; - sense = !sense; + myAngle = -myAngle; + sense = !sense; } Handle(Geom2d_Circle) c = new Geom2d_Circle( ax, myRadius, sense ); BRepBuilderAPI_MakeEdge ME( GeomAPI::To3d( c, myPlane ), 0, myAngle ); if ( !ME.IsDone() ) - return; + return; myMakeWire.Add( ME ); gp_Pnt2d p; gp_Vec2d v; @@ -1281,7 +1281,7 @@ void Sketcher_Profile::DumpFunctor::initCommand() \internal */ void Sketcher_Profile::DumpFunctor::addPoint( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { myDescr += "sk.addPoint("; myDescr += x + ", " + y + ")"; @@ -1345,7 +1345,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentParalYToZero() \internal */ void Sketcher_Profile::DumpFunctor::addSegmentAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { myDescr += "sk.addSegmentAbsolute("; myDescr += x + ", " + y + ")"; @@ -1358,7 +1358,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentAbsolute( const TCollection_AsciiS \internal */ void Sketcher_Profile::DumpFunctor::addSegmentRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) + const TCollection_AsciiString& dy ) { myDescr += "sk.addSegmentRelative("; myDescr += dx + ", " + dy + ")"; @@ -1382,7 +1382,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentLength( const TCollection_AsciiStr \internal */ void Sketcher_Profile::DumpFunctor::addSegmentX( const TCollection_AsciiString& x, - int CurrentIndex ) + int CurrentIndex ) { myDescr += "sk.addSegmentX("; myDescr += x + ")"; @@ -1395,7 +1395,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentX( const TCollection_AsciiString& \internal */ void Sketcher_Profile::DumpFunctor::addSegmentY( const TCollection_AsciiString& y, - int CurrentIndex ) + int CurrentIndex ) { myDescr += "sk.addSegmentY("; myDescr += y + ")"; @@ -1409,8 +1409,8 @@ void Sketcher_Profile::DumpFunctor::addSegmentY( const TCollection_AsciiString& \internal */ void Sketcher_Profile::DumpFunctor::addSegmentAngleLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& length, - int& CurrentIndex ) + const TCollection_AsciiString& length, + int& CurrentIndex ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1431,8 +1431,8 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleLength( const TCollection_Asc \internal */ void Sketcher_Profile::DumpFunctor::addSegmentAngleX( const TCollection_AsciiString& angle, - const TCollection_AsciiString& x, - int& CurrentIndex ) + const TCollection_AsciiString& x, + int& CurrentIndex ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1453,8 +1453,8 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleX( const TCollection_AsciiStr \internal */ void Sketcher_Profile::DumpFunctor::addSegmentAngleY( const TCollection_AsciiString& angle, - const TCollection_AsciiString& y, - int& CurrentIndex ) + const TCollection_AsciiString& y, + int& CurrentIndex ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1476,9 +1476,9 @@ void Sketcher_Profile::DumpFunctor::addSegmentAngleY( const TCollection_AsciiStr \internal */ void Sketcher_Profile::DumpFunctor::addSegmentDirectionLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& length, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& length, + int& CurrentIndex ) { myDescr += "sk.addSegmentDirectionLength("; myDescr += dx + ", " + dy + ", " + length + ")"; @@ -1493,9 +1493,9 @@ void Sketcher_Profile::DumpFunctor::addSegmentDirectionLength( const TCollection \internal */ void Sketcher_Profile::DumpFunctor::addSegmentDirectionX( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& x, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& x, + int& CurrentIndex ) { myDescr += "sk.addSegmentDirectionX("; myDescr += dx + ", " + dy + ", " + x + ")"; @@ -1510,9 +1510,9 @@ void Sketcher_Profile::DumpFunctor::addSegmentDirectionX( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addSegmentDirectionY( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& y, - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& y, + int& CurrentIndex ) { myDescr += "sk.addSegmentDirectionY("; myDescr += dx + ", " + dy + ", " + y + ")"; @@ -1525,7 +1525,7 @@ void Sketcher_Profile::DumpFunctor::addSegmentDirectionY( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addArcAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y ) + const TCollection_AsciiString& y ) { myDescr += "sk.addArcAbsolute("; myDescr += x + ", " + y + ")"; @@ -1538,7 +1538,7 @@ void Sketcher_Profile::DumpFunctor::addArcAbsolute( const TCollection_AsciiStrin \internal */ void Sketcher_Profile::DumpFunctor::addArcRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy ) + const TCollection_AsciiString& dy ) { myDescr += "sk.addArcRelative("; myDescr += dx + ", " + dy + ")"; @@ -1553,9 +1553,9 @@ void Sketcher_Profile::DumpFunctor::addArcRelative( const TCollection_AsciiStrin \internal */ void Sketcher_Profile::DumpFunctor::addArcRadiusAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) + const TCollection_AsciiString& y, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) { myDescr += "sk.addArcRadiusAbsolute("; myDescr += x + ", " + y + ", " + radius + ", " + flag + ")"; @@ -1570,9 +1570,9 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusAbsolute( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addArcRadiusRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& flag ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& flag ) { myDescr += "sk.addArcRadiusRelative("; myDescr += dx + ", " + dy + ", " + radius + ", " + flag + ")"; @@ -1589,11 +1589,11 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusRelative( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addArcCenterAbsolute( const TCollection_AsciiString& x, - const TCollection_AsciiString& y, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) + const TCollection_AsciiString& y, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) { myDescr += "sk.addArcCenterAbsolute("; myDescr += xc + ", " + yc + ", " + x + ", " + y + ", " + flag1 + ", " + flag2 + ")"; @@ -1610,11 +1610,11 @@ void Sketcher_Profile::DumpFunctor::addArcCenterAbsolute( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addArcCenterRelative( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& xc, - const TCollection_AsciiString& yc, - const TCollection_AsciiString& flag1, - const TCollection_AsciiString& flag2 ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& xc, + const TCollection_AsciiString& yc, + const TCollection_AsciiString& flag1, + const TCollection_AsciiString& flag2 ) { myDescr += "sk.addArcCenterRelative("; myDescr += xc + ", " + yc + ", " + dx + ", " + dy + ", " + flag1 + ", " + flag2 + ")"; @@ -1627,7 +1627,7 @@ void Sketcher_Profile::DumpFunctor::addArcCenterRelative( const TCollection_Asci \internal */ void Sketcher_Profile::DumpFunctor::addArcRadiusLength( const TCollection_AsciiString& radius, - const TCollection_AsciiString& length ) + const TCollection_AsciiString& length ) { myDescr += "sk.addArcRadiusLength("; myDescr += radius + ", " + length + ")"; @@ -1642,9 +1642,9 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusLength( const TCollection_AsciiS \internal */ void Sketcher_Profile::DumpFunctor::addArcAngleRadiusLength( const TCollection_AsciiString& angle, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) { double aAngle = angle.RealValue(); if ( aAngle == 90 ) { @@ -1667,10 +1667,10 @@ void Sketcher_Profile::DumpFunctor::addArcAngleRadiusLength( const TCollection_A \internal */ void Sketcher_Profile::DumpFunctor::addArcDirectionRadiusLength( const TCollection_AsciiString& dx, - const TCollection_AsciiString& dy, - const TCollection_AsciiString& radius, - const TCollection_AsciiString& length , - int& CurrentIndex ) + const TCollection_AsciiString& dy, + const TCollection_AsciiString& radius, + const TCollection_AsciiString& length , + int& CurrentIndex ) { myDescr += "sk.addArcDirectionRadiusLength("; myDescr += dx + ", " + dy + ", " + radius + ", " + length + ")"; @@ -1817,7 +1817,7 @@ void Sketcher_Profile::parse( const TCollection_AsciiString& cmd, Functor* funct while ( aToken.Length() != 0 ) { TCollection_AsciiString aNewToken = command.Token( ":", NumberOfCommand + 1 ); if ( aNewToken.Length() > 0 ) - aTab( NumberOfCommand ) = aNewToken; + aTab( NumberOfCommand ) = aNewToken; aToken = command.Token( ":", ++NumberOfCommand ); } --NumberOfCommand; @@ -1830,132 +1830,132 @@ void Sketcher_Profile::parse( const TCollection_AsciiString& cmd, Functor* funct TColStd_Array1OfAsciiString a( 0, aTab( 0 ).Length() ); findNextCommand( aTab, a, CurrentIndex, NumberOfArg ); if ( a( 0 ) == "F" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addPoint( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addPoint( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "X" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentParalX( a.Value( 1 ) ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentParalX( a.Value( 1 ) ); } else if ( a( 0 ) == "XX" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentParalXToZero(); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentParalXToZero(); } else if ( a( 0 ) == "Y" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentParalY( a.Value( 1 ) ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentParalY( a.Value( 1 ) ); } else if ( a( 0 ) == "YY" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentParalYToZero(); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentParalYToZero(); } else if ( a( 0 ) == "RR" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addAngle( a.Value( 1 ) ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addAngle( a.Value( 1 ) ); } else if ( a( 0 ) == "TT" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addSegmentAbsolute( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addSegmentAbsolute( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "T" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addSegmentRelative( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addSegmentRelative( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "L" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentLength( a.Value( 1 ) ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentLength( a.Value( 1 ) ); } else if ( a( 0 ) == "IX" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentX( a.Value( 1 ), CurrentIndex ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentX( a.Value( 1 ), CurrentIndex ); } else if ( a( 0 ) == "IY" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentY( a.Value( 1 ), CurrentIndex ); + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentY( a.Value( 1 ), CurrentIndex ); } - else if ( a( 0 ) == "R" ) { - if ( NumberOfArg != 2) badArgs(); - CurrentIndex++; - TColStd_Array1OfAsciiString aNew( 0, aTab( 0 ).Length() ); - findNextCommand( aTab, aNew, CurrentIndex, NumberOfArg ); - if ( aNew( 0 ) == "L" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentAngleLength( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "IX" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentAngleX( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "IY" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentAngleY( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "C" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addArcAngleRadiusLength( a.Value( 1 ), aNew.Value( 1 ), aNew.Value( 2 ), CurrentIndex ); - } + else if ( a( 0 ) == "R" ) { + if ( NumberOfArg != 2) badArgs(); + CurrentIndex++; + TColStd_Array1OfAsciiString aNew( 0, aTab( 0 ).Length() ); + findNextCommand( aTab, aNew, CurrentIndex, NumberOfArg ); + if ( aNew( 0 ) == "L" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentAngleLength( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "IX" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentAngleX( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "IY" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentAngleY( a.Value( 1 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "C" ) { + if ( NumberOfArg != 3 ) badArgs(); + functor->addArcAngleRadiusLength( a.Value( 1 ), aNew.Value( 1 ), aNew.Value( 2 ), CurrentIndex ); + } } - else if ( a( 0 ) == "D" ) { - if ( NumberOfArg != 3 ) badArgs(); - CurrentIndex++; - TColStd_Array1OfAsciiString aNew ( 0, aTab( 0 ).Length() ); - findNextCommand( aTab, aNew, CurrentIndex, NumberOfArg ); - if ( aNew( 0 ) == "L" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentDirectionLength( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "IX" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentDirectionX( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "IY" ) { - if ( NumberOfArg != 2 ) badArgs(); - functor->addSegmentDirectionY( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); - } - else if ( aNew( 0 ) == "C" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addArcDirectionRadiusLength( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), aNew.Value( 2 ), CurrentIndex ); - } + else if ( a( 0 ) == "D" ) { + if ( NumberOfArg != 3 ) badArgs(); + CurrentIndex++; + TColStd_Array1OfAsciiString aNew ( 0, aTab( 0 ).Length() ); + findNextCommand( aTab, aNew, CurrentIndex, NumberOfArg ); + if ( aNew( 0 ) == "L" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentDirectionLength( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "IX" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentDirectionX( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "IY" ) { + if ( NumberOfArg != 2 ) badArgs(); + functor->addSegmentDirectionY( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), CurrentIndex ); + } + else if ( aNew( 0 ) == "C" ) { + if ( NumberOfArg != 3 ) badArgs(); + functor->addArcDirectionRadiusLength( a.Value( 1 ), a.Value( 2 ), aNew.Value( 1 ), aNew.Value( 2 ), CurrentIndex ); + } } else if ( a( 0 ) == "AA" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addArcAbsolute( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addArcAbsolute( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "A" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addArcRelative( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addArcRelative( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "UU" ) { - if ( NumberOfArg != 5 ) badArgs(); - functor->addArcRadiusAbsolute( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ) ); + if ( NumberOfArg != 5 ) badArgs(); + functor->addArcRadiusAbsolute( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ) ); } else if ( a( 0 ) == "U" ) { - if ( NumberOfArg != 5 ) badArgs(); - functor->addArcRadiusRelative( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ) ); + if ( NumberOfArg != 5 ) badArgs(); + functor->addArcRadiusRelative( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ) ); } else if ( a( 0 ) == "EE" ) { - if ( NumberOfArg != 7 ) badArgs(); - functor->addArcCenterAbsolute( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ), a.Value( 5 ), a.Value( 6 ) ); + if ( NumberOfArg != 7 ) badArgs(); + functor->addArcCenterAbsolute( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ), a.Value( 5 ), a.Value( 6 ) ); } else if ( a( 0 ) == "E" ) { - if ( NumberOfArg != 7 ) badArgs(); - functor->addArcCenterRelative( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ), a.Value( 5 ), a.Value( 6 ) ); + if ( NumberOfArg != 7 ) badArgs(); + functor->addArcCenterRelative( a.Value( 1 ), a.Value( 2 ), a.Value( 3 ), a.Value( 4 ), a.Value( 5 ), a.Value( 6 ) ); } else if ( a( 0 ) == "C" ) { - if ( NumberOfArg != 3 ) badArgs(); - functor->addArcRadiusLength( a.Value( 1 ), a.Value( 2 ) ); + if ( NumberOfArg != 3 ) badArgs(); + functor->addArcRadiusLength( a.Value( 1 ), a.Value( 2 ) ); } else if ( a( 0 ) == "WW" ) { - functor->closeWire(); - CurrentIndex = NumberOfCommand - 1; + functor->closeWire(); + CurrentIndex = NumberOfCommand - 1; } else if ( a( 0 ) == "WF" ) { - functor->closeWireAndBuildFace(); - CurrentIndex = NumberOfCommand - 1; + functor->closeWireAndBuildFace(); + CurrentIndex = NumberOfCommand - 1; } else { - MESSAGE("profile : unknown code " << a(CurrentIndex)); - return; + MESSAGE("profile : unknown code " << a(CurrentIndex)); + return; } functor->nextCommand( CurrentIndex ); } @@ -1995,8 +1995,8 @@ void Sketcher_Profile::badArgs() \internal */ void Sketcher_Profile::findNextCommand( const TColStd_Array1OfAsciiString& aTab, - TColStd_Array1OfAsciiString& a, int CurrentIndex, - int& NumberOfArg) + TColStd_Array1OfAsciiString& a, int CurrentIndex, + int& NumberOfArg) { int n1 = 0; TCollection_AsciiString aToken = aTab(CurrentIndex).Token(" ", 1); diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx index 592373868..04d5d72db 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -123,8 +123,8 @@ extern "C" TColStd_SequenceOfAsciiString anUnitSolidAngleNames; aReader.FileUnits(anUnitLengthNames, anUnitAngleNames, anUnitSolidAngleNames); if (anUnitLengthNames.Length() > 0) { - aValue = new TCollection_HAsciiString( anUnitLengthNames.First() ); - /* + aValue = new TCollection_HAsciiString( anUnitLengthNames.First() ); + /* TCollection_AsciiString aLenUnits = anUnitLengthNames.First(); if (aLenUnits == "millimetre") aValue = new TCollection_HAsciiString ("MM"); @@ -144,7 +144,7 @@ extern "C" // std::cout << ", " << anUnitLengthNames.Value(ii); //std::cout << std::endl; // tmp end - */ + */ } } else { diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx index ba8b0d5b9..e4e4071b6 100644 --- a/src/TransformationGUI/TransformationGUI.cxx +++ b/src/TransformationGUI/TransformationGUI.cxx @@ -139,7 +139,7 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) if (SALOME_View* view = dynamic_cast(vmodel)) { if (view->isVisible(io)) { aDisp.Erase(io, true, false, view); - getGeometryGUI()->GetShapeReader().RemoveShapeFromBuffer( getGeometryGUI()->getApp()->orb()->object_to_string( aGeomObj.in() ) ); + getGeometryGUI()->GetShapeReader().RemoveShapeFromBuffer( getGeometryGUI()->getApp()->orb()->object_to_string( aGeomObj.in() ) ); aDisp.Display(io, true, view); } // ? Redisplay subshapes ? diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index 3b633929b..ba4d79899 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -232,11 +232,11 @@ void TransformationGUI_MirrorDlg::SelectionIntoArgument() myEditCurrentArgument->setText( aName ); myArgument = aSelectedObject; if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); } else { if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) - myArgument.nullify(); + myArgument.nullify(); myEditCurrentArgument->setText(""); } } diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx index 6ac1ca923..8c8e3cbe4 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx @@ -284,19 +284,19 @@ void TransformationGUI_MultiRotationDlg::SelectionIntoArgument() } if ( !myVector ) - GroupArgs->PushButton2->click(); + GroupArgs->PushButton2->click(); } else if ( myEditCurrentArgument == GroupArgs->LineEdit2 ) { myVector = aSelectedObject; if ( !myBase ) - GroupArgs->PushButton1->click(); + GroupArgs->PushButton1->click(); } // clear selection disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); } else { if ( myEditCurrentArgument == GroupArgs->LineEdit1 ) diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index f03968be1..286e2dc00 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -320,8 +320,8 @@ void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument() erasePreview(); TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupPoints->LineEdit2 || - myEditCurrentArgument == GroupDimensions->LineEdit2 || - myEditCurrentArgument == GroupDimensions->LineEdit3 ) ? + myEditCurrentArgument == GroupDimensions->LineEdit2 || + myEditCurrentArgument == GroupDimensions->LineEdit3 ) ? TopAbs_EDGE : TopAbs_SHAPE; GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); TopoDS_Shape aShape; @@ -342,12 +342,12 @@ void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument() } if (!myVectorU) - GroupPoints->PushButton2->click(); + GroupPoints->PushButton2->click(); } else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { myVectorU = aSelectedObject; if ( !myBase ) - GroupPoints->PushButton1->click(); + GroupPoints->PushButton1->click(); } else if ( myEditCurrentArgument == GroupDimensions->LineEdit1 ) { myBase = aSelectedObject; @@ -364,37 +364,37 @@ void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument() } if ( !myVectorU ) - GroupDimensions->PushButton2->click(); + GroupDimensions->PushButton2->click(); else if ( !myVectorV ) - GroupDimensions->PushButton3->click(); + GroupDimensions->PushButton3->click(); } else if ( myEditCurrentArgument == GroupDimensions->LineEdit2 ) { myVectorU = aSelectedObject; if ( !myVectorV ) - GroupDimensions->PushButton3->click(); + GroupDimensions->PushButton3->click(); else if ( !myBase ) - GroupDimensions->PushButton1->click(); + GroupDimensions->PushButton1->click(); } else if ( myEditCurrentArgument == GroupDimensions->LineEdit3 ) { myVectorV = aSelectedObject; if ( !myBase ) - GroupDimensions->PushButton1->click(); + GroupDimensions->PushButton1->click(); else if ( !myVectorU ) - GroupDimensions->PushButton2->click(); + GroupDimensions->PushButton2->click(); } // clear selection disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->getApp()->selectionMgr()->clearSelected(); connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), - this, SLOT(SelectionIntoArgument())); + this, SLOT(SelectionIntoArgument())); } else { if ( myEditCurrentArgument == GroupPoints->LineEdit1 || - myEditCurrentArgument == GroupDimensions->LineEdit1 ) + myEditCurrentArgument == GroupDimensions->LineEdit1 ) myBase.nullify(); else if ( myEditCurrentArgument == GroupPoints->LineEdit2 || - myEditCurrentArgument == GroupDimensions->LineEdit2 ) + myEditCurrentArgument == GroupDimensions->LineEdit2 ) myVectorU.nullify(); else if ( myEditCurrentArgument == GroupDimensions->LineEdit3 ) myVectorV.nullify(); diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index dea597245..d10062ed4 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -332,7 +332,7 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument() myEditCurrentArgument->setText( aName ); myPath = aSelectedObject; if ( myObjects.isEmpty() ) - Group1->PushButton1->click(); + Group1->PushButton1->click(); } else { myPath.nullify(); @@ -345,25 +345,25 @@ void TransformationGUI_PositionDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( aSelectedObject.get() ); myEditCurrentArgument->setText( aName ); if ( myEditCurrentArgument == Group1->LineEdit2 ) { - myStartLCS = aSelectedObject; - if ( !myEndLCS ) - Group1->PushButton4->click(); - else if ( myObjects.isEmpty() ) - Group1->PushButton1->click(); + myStartLCS = aSelectedObject; + if ( !myEndLCS ) + Group1->PushButton4->click(); + else if ( myObjects.isEmpty() ) + Group1->PushButton1->click(); } else if ( myEditCurrentArgument == Group1->LineEdit4 ) { - myEndLCS = aSelectedObject; - if ( myObjects.isEmpty() ) - Group1->PushButton1->click(); - else if ( getConstructorId() == 1 && !myStartLCS ) - Group1->PushButton2->click(); + myEndLCS = aSelectedObject; + if ( myObjects.isEmpty() ) + Group1->PushButton1->click(); + else if ( getConstructorId() == 1 && !myStartLCS ) + Group1->PushButton2->click(); } } else { if ( myEditCurrentArgument == Group1->LineEdit2 ) - myStartLCS.nullify(); + myStartLCS.nullify(); else if ( myEditCurrentArgument == Group1->LineEdit4 ) - myEndLCS.nullify(); + myEndLCS.nullify(); } } diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index 6373aff8a..443f18c15 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -275,52 +275,52 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( aSelectedObject.get() ); myEditCurrentArgument->setText( aName ); if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { - if ( getConstructorId() == 0 ) { - myAxis = aSelectedObject; - if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - } - else if ( getConstructorId() == 1 ) { - myCentPoint = aSelectedObject; - if ( !myPoint1 ) - GroupPoints->PushButton4->click(); - else if ( !myPoint2 ) - GroupPoints->PushButton5->click(); - else if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - } + if ( getConstructorId() == 0 ) { + myAxis = aSelectedObject; + if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + } + else if ( getConstructorId() == 1 ) { + myCentPoint = aSelectedObject; + if ( !myPoint1 ) + GroupPoints->PushButton4->click(); + else if ( !myPoint2 ) + GroupPoints->PushButton5->click(); + else if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + } } else if ( myEditCurrentArgument == GroupPoints->LineEdit4 ) { - myPoint1 = aSelectedObject; - if ( !myPoint2 ) - GroupPoints->PushButton5->click(); - else if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - else if ( !myCentPoint ) - GroupPoints->PushButton2->click(); + myPoint1 = aSelectedObject; + if ( !myPoint2 ) + GroupPoints->PushButton5->click(); + else if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + else if ( !myCentPoint ) + GroupPoints->PushButton2->click(); } else if ( myEditCurrentArgument == GroupPoints->LineEdit5 ) { - myPoint2 = aSelectedObject; - if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - else if ( !myCentPoint ) - GroupPoints->PushButton2->click(); - else if ( !myPoint1 ) - GroupPoints->PushButton4->click(); + myPoint2 = aSelectedObject; + if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + else if ( !myCentPoint ) + GroupPoints->PushButton2->click(); + else if ( !myPoint1 ) + GroupPoints->PushButton4->click(); } } else { if (myEditCurrentArgument == GroupPoints->LineEdit2 ) { - if ( getConstructorId() == 0 ) - myAxis.nullify(); - else if ( getConstructorId() == 1 ) - myCentPoint.nullify(); + if ( getConstructorId() == 0 ) + myAxis.nullify(); + else if ( getConstructorId() == 1 ) + myCentPoint.nullify(); } else if ( myEditCurrentArgument == GroupPoints->LineEdit4 ) { - myPoint1.nullify(); + myPoint1.nullify(); } else if ( myEditCurrentArgument == GroupPoints->LineEdit5 ) { - myPoint2.nullify(); + myPoint2.nullify(); } myEditCurrentArgument->setText(""); } diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index a7babcb4f..c71eb1271 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -294,7 +294,7 @@ void TransformationGUI_ScaleDlg::SelectionIntoArgument() myEditCurrentArgument->setText( aName ); myPoint = aSelectedObject; if ( myObjects.isEmpty() ) - PushButton1->click(); + PushButton1->click(); } else { myPoint.nullify(); diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index 14f5a49c6..0c8018ed5 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -321,34 +321,34 @@ void TransformationGUI_TranslationDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( aSelectedObject.get() ); myEditCurrentArgument->setText( aName ); if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { - if ( getConstructorId() == 1 ) { - myPoint1 = aSelectedObject; - if ( !myPoint2 ) - GroupPoints->PushButton3->click(); - else if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - } - else if ( getConstructorId() == 2 ) { - myVector = aSelectedObject; - if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - } + if ( getConstructorId() == 1 ) { + myPoint1 = aSelectedObject; + if ( !myPoint2 ) + GroupPoints->PushButton3->click(); + else if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + } + else if ( getConstructorId() == 2 ) { + myVector = aSelectedObject; + if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + } } else if ( myEditCurrentArgument == GroupPoints->LineEdit3 ) { - myPoint2 = aSelectedObject; - if ( myObjects.isEmpty() ) - GroupPoints->PushButton1->click(); - else if ( !myPoint1 ) - GroupPoints->PushButton2->click(); + myPoint2 = aSelectedObject; + if ( myObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + else if ( !myPoint1 ) + GroupPoints->PushButton2->click(); } } else { if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { - if ( getConstructorId() == 1 ) myPoint1.nullify(); - else myVector.nullify(); + if ( getConstructorId() == 1 ) myPoint1.nullify(); + else myVector.nullify(); } else if ( myEditCurrentArgument == GroupPoints->LineEdit3 ) { - myPoint2.nullify(); + myPoint2.nullify(); } myEditCurrentArgument->setText(""); } @@ -472,7 +472,7 @@ bool TransformationGUI_TranslationDlg::isValid (QString& msg) break; case 2: ok = GroupPoints->SpinBox3->isValid( msg, !IsPreview() ) && - myVector && !myObjects.isEmpty(); + myVector && !myObjects.isEmpty(); break; default: break; diff --git a/src/VTKExport/VTKExport.cxx b/src/VTKExport/VTKExport.cxx index dffd08ebc..64e2c1b6e 100644 --- a/src/VTKExport/VTKExport.cxx +++ b/src/VTKExport/VTKExport.cxx @@ -96,12 +96,12 @@ extern "C" TopExp_Explorer ex; TopLoc_Location aLoc; for (ex.Init(theShape, TopAbs_FACE); ex.More(); ex.Next()) { - const TopoDS_Face& aFace = TopoDS::Face(ex.Current()); - Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc); - if(aPoly.IsNull()) { - wasMeshed = false; - break; - } + const TopoDS_Face& aFace = TopoDS::Face(ex.Current()); + Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc); + if(aPoly.IsNull()) { + wasMeshed = false; + break; + } } GEOM::MeshShape( theShape, aDeflection ); @@ -146,7 +146,7 @@ extern "C" myAppendFilter->Delete(); if(!wasMeshed) - BRepTools::Clean(theShape); + BRepTools::Clean(theShape); return 1; } -- 2.30.2