]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
untabify
authoreap <eap@opencascade.com>
Mon, 17 Jun 2013 12:15:50 +0000 (12:15 +0000)
committereap <eap@opencascade.com>
Mon, 17 Jun 2013 12:15:50 +0000 (12:15 +0000)
176 files changed:
src/BasicGUI/BasicGUI_EllipseDlg.cxx
src/BasicGUI/BasicGUI_LineDlg.cxx
src/BasicGUI/BasicGUI_MarkerDlg.cxx
src/BasicGUI/BasicGUI_PlaneDlg.cxx
src/BlockFix/BlockFix_SphereSpaceModifier.cxx
src/DlgRef/DlgRef.cxx
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
src/GEOM/GEOM_Engine.cxx
src/GEOMAlgo/GEOMAlgo_Builder.hxx
src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx
src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx
src/GEOMAlgo/GEOMAlgo_Builder_1.cxx
src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx
src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx
src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx
src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
src/GEOMAlgo/GEOMAlgo_Gluer.hxx
src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx
src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
src/GEOMAlgo/GEOMAlgo_PassKey.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx
src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx
src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx
src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
src/GEOMAlgo/GEOMAlgo_Tools.hxx
src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
src/GEOMAlgo/GEOMAlgo_Tools3D.hxx
src/GEOMAlgo/GEOMAlgo_WESScaler.cxx
src/GEOMAlgo/GEOMAlgo_WESScaler.hxx
src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx
src/GEOMBase/GEOMBase.cxx
src/GEOMBase/GEOMBase.h
src/GEOMGUI/GEOMGUI_Selection.cxx
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
src/GenerationGUI/GenerationGUI_PipePathDlg.cxx
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
src/Material/Material_Model.cxx
src/Material/Material_ResourceMgr.cxx
src/MeasureGUI/MeasureGUI_AngleDlg.cxx
src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
src/NMTDS/NMTDS_BndSphere.cxx
src/NMTDS/NMTDS_BndSphere.hxx
src/NMTDS/NMTDS_BndSphere.lxx
src/NMTDS/NMTDS_BndSphereTree.cxx
src/NMTDS/NMTDS_BndSphereTree.hxx
src/NMTDS/NMTDS_CArray1OfIndexRange.cxx
src/NMTDS/NMTDS_CArray1OfIndexRange.hxx
src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
src/NMTDS/NMTDS_InterfPool.cxx
src/NMTDS/NMTDS_InterfPool.hxx
src/NMTDS/NMTDS_InterfType.hxx
src/NMTDS/NMTDS_Iterator.cxx
src/NMTDS/NMTDS_Iterator.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPairBoolean.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/NMTDS_ListOfPair.hxx
src/NMTDS/NMTDS_ListOfPairBoolean.hxx
src/NMTDS/NMTDS_ListOfPassKey.hxx
src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPairBoolean.hxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_MapOfPairBoolean.hxx
src/NMTDS/NMTDS_MapOfPassKey.hxx
src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_Pair.cxx
src/NMTDS/NMTDS_Pair.hxx
src/NMTDS/NMTDS_PairMapHasher.cxx
src/NMTDS/NMTDS_PairMapHasher.hxx
src/NMTDS/NMTDS_PassKey.hxx
src/NMTDS/NMTDS_PassKeyMapHasher.hxx
src/NMTDS/NMTDS_PassKeyShape.hxx
src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx
src/NMTDS/NMTDS_ShapesDataStructure.cxx
src/NMTDS/NMTDS_ShapesDataStructure.hxx
src/NMTDS/NMTDS_Tools.hxx
src/NMTTools/NMTTools_CheckerSI.hxx
src/NMTTools/NMTTools_DEProcessor.cxx
src/NMTTools/NMTTools_DEProcessor.hxx
src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx
src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx
src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
src/NMTTools/NMTTools_ListOfCommonBlock.hxx
src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
src/NMTTools/NMTTools_MapOfPaveBlock.hxx
src/NMTTools/NMTTools_PaveFiller.hxx
src/NMTTools/NMTTools_PaveFiller_4.cxx
src/NMTTools/NMTTools_PaveFiller_6.cxx
src/NMTTools/NMTTools_PaveFiller_8.cxx
src/NMTTools/NMTTools_Tools.hxx
src/OBJECT/GEOM_AISShape.cxx
src/OBJECT/GEOM_AISShape.hxx
src/OBJECT/GEOM_Actor.cxx
src/OBJECT/GEOM_Actor.h
src/OBJECT/GEOM_TopWireframeShape.cxx
src/OBJECT/GEOM_TopWireframeShape.hxx
src/OBJECT/GEOM_VTKPropertyMaterial.hxx
src/OCC2VTK/OCC2VTK_Tools.cxx
src/OCC2VTK/OCC2VTK_Tools.h
src/OperationGUI/OperationGUI_ChamferDlg.cxx
src/OperationGUI/OperationGUI_FilletDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
src/SKETCHER/Sketcher_Profile.cxx
src/STEPImport/STEPImport.cxx
src/TransformationGUI/TransformationGUI.cxx
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
src/VTKExport/VTKExport.cxx

index 39ec531fe60f55990dc2b1cc9595b98dfe80a5ad..99c32c2c862dc3d33d7271731b838866779ed815 100644 (file)
@@ -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 );
index 6afb9bdd479c2d99501c76f4bc94be3a4bbd7cab..1bac86e6ed782e1b1cac3bbdee3638da9315e784 100644 (file)
@@ -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 );
index bf010fcf8df7ddb2773f6123ed3115664a6aeafc..57c925b16c10b7258c2dd7647b3fc6c6ae35f282 100644 (file)
@@ -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;
index deb308e03051ae38590e905478a0f447be2e59c4..b652fe240f9c46cd4b19eee8bb578fb8a793650d 100644 (file)
@@ -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() );
index 3d50660bdaf6dc8662ad3252d2024559243efdee..7be8f8212532901e747cd1af83861ac7c46bdf93 100644 (file)
@@ -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) {
index eada5f0f2b6d9bd85ee5889807ca7ab11c47a746..b5043a2158bb4f29aa41de612e8b1638a01e97e1 100644 (file)
@@ -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 = "";
index 9ca190195005236bb2c25772342fbf476d0e5ef4..bd2ddf62c0829c143cd05e3cd0d1e7e7c791072f 100644 (file)
@@ -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 {
index 6e1b0cefd4ad4b7bf30c7b0bfa9c93da568d62af..682dec2728befbf7073affbe6b75edb3cce22d7b 100644 (file)
@@ -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) {
index 993b0f10a83b20afc0005814e9a140dae88fdbd9..6f0addd83b4a6f94fd1cefeb1f1cac7721276cb8 100644 (file)
@@ -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: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<endl;
 
-           if ( aStartParamPos == aEndParamPos)
-             continue;
+            if ( aStartParamPos == aEndParamPos)
+              continue;
 
             aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
             if(MYDEBUG)
index dd9e6c3c4be7a5f58f86e80f36a8a7ee3013b878..4ce798d9c75aedfb72ce207ac09b760fd88b7b52 100644 (file)
@@ -204,8 +204,8 @@ protected:
   //!           theSolid are in the list: theInternalFaces <br>
   Standard_EXPORT
     void BuildDraftSolid(const TopoDS_Shape& theSolid,
-                        TopoDS_Shape& theDraftSolid,
-                        TopTools_ListOfShape& theInternalFaces) ;
+                         TopoDS_Shape& theDraftSolid,
+                         TopTools_ListOfShape& theInternalFaces) ;
 
 
   NMTTools_PPaveFiller myPaveFiller;
index fce765fc8088fa670907033841559dd9b98bf2f8..deb1d9973dd0c1dfc73384860e65ae62a2b99d19 100755 (executable)
@@ -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);
       }
     }
   }
index 7a19831d4e453d930309c2d74e9aa9f8e61593b0..8494ea7aab375724dfda3ff7d411257f572b8ed3 100644 (file)
@@ -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) ;
index 65f6929a0c0d1d8553b663ceb35b154a35e8e729..1d8d5b6343d8fcc4f322749b2b0dd6c78162082d 100755 (executable)
@@ -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
       //
index d699f1dc85b48f1d6f3d145fe9f9ec845e284fd1..4e1a8c6e7c5f82db49322678c70a5bd78e7251cd 100755 (executable)
@@ -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<aIxMin) {
-         aIxMin=aIx;
-         aFSDmin=aFSD;
-       }
+        if (aIx<aIxMin) {
+          aIxMin=aIx;
+          aFSDmin=aFSD;
+        }
       }
     }
     //
@@ -948,8 +948,8 @@ void UpdateCandidates(const Standard_Integer theNF,
 //purpose  :
 //=======================================================================
 Standard_Boolean IsClosed(const TopoDS_Edge& aE,
-                         const TopoDS_Face& aF,
-                         Standard_Boolean& bFlag)
+                          const TopoDS_Face& aF,
+                          Standard_Boolean& bFlag)
 {
   Standard_Boolean bRet;
   //
@@ -966,15 +966,15 @@ Standard_Boolean IsClosed(const TopoDS_Edge& aE,
       const TopoDS_Shape& aEx=aExp.Current();
       //
       if (aEx.IsSame(aE)) {
-       ++iCnt;
-       if (iCnt==1) {
-         aE1=aEx;
-       }
-       else if (iCnt==2){
-         aE1.Reverse();
-         bRet=(aE1==aEx);
-         break;
-       }
+        ++iCnt;
+        if (iCnt==1) {
+          aE1=aEx;
+        }
+        else if (iCnt==2){
+          aE1.Reverse();
+          bRet=(aE1==aEx);
+          break;
+        }
       }
     }
   }
index 0ad7153ecadcc8a5c89547aa562a7586fee421d8..024fa6681e73bfb71c08ac35e9856a366d0c959c 100755 (executable)
@@ -691,12 +691,12 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
       const TopTools_ListOfShape &aLSx=aMSx.FindFromKey(aSI);
       aNbSx=aLSx.Extent();
       if (aNbSx) {
-       //modified by NIZNHY-PKV Wed Mar 27 11:39:15 2013f
-       //aMSI.Remove(aSI);
+        //modified by NIZNHY-PKV Wed Mar 27 11:39:15 2013f
+        //aMSI.Remove(aSI);
         if (aMSI.Remove(aSI)) {
-         aItM.Initialize(aMSI);
-       }
-       //modified by NIZNHY-PKV Wed Mar 27 11:39:18 2013t
+          aItM.Initialize(aMSI);
+        }
+        //modified by NIZNHY-PKV Wed Mar 27 11:39:18 2013t
       }
     }
   }
index 61497898b5c3de8d553a9a125fb1af6871410983..0b14e92106905b8419e94ecae8772d4783980201 100644 (file)
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
-// Created:    Wed Feb 22 11:05:01 2012
+// File:        GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx
+// Created:     Wed Feb 22 11:05:01 2012
 // Author:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
index bf9628d8cd3cd154b96c49262962d9e699dda068..9618091c57b975653a181713f3e0d9e274a3b609 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
index ef00b3ed9f557051a9b28d081aa96783027e2bf1..b83deb06be94aeb719dfc43a518441fb9da9c89e 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
index c572630b185a8c790bdeccbba398f63c852e4a70..b8108d12f2bf7cfb51e8c071e3a74d34904462da 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
index f51e2c7ffda457f30c547496c831900c90dd8475..a8fcb2f0d62cd8783613f0fc797ddf9dae1f08a1 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape_HeaderFile
index ce6ffea080943138832a3e01854ea81aaeb002ea..c463540efea5d018ff9e8ca25055515ca2f31f3a 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt_HeaderFile
index aaf0d6bb1be05be256fb4c6933fb0e45aed1e363..35c07d9044cec8c079c8a98cf59f709df79bb67a 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
index 413056ac9970ecd575071b28443a512d3b89bfee..17452053e8de57a0740367153ac178e4af499034 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
index aea60012f39a5bde661c4feec83c02c0cac8950d..a5884db1cefef465a208cf05c7b65b137b8f6f0e 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
index 76edfb3a1065f37075155e029784ba3fdf14519d..36c21ad03ff6171c4e7735882b95e1cdee7f9412 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
index d410d2ae770dfaf493d345b5c1c46048a3ce19fb..e3285b84639e4f52a99af3db1082b94bb7f5cda0 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
index 757dab3cce99017f96abe72bf8bb6a6273b608f7..d3ac847560afae6d3b10ba48c2fee2f5756cdaea 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
index 66d99621ea1314174d98a76cc93d7351b20b6c6c..50836be36084e0608eceacad5acc5280dc471953 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfShapeMapOfShape_HeaderFile
index 204dcf708e34d01373127f88e72db80c239efe6b..73d6536727e2a1520ad45b4cd618b1e5fac9fcc7 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfShapePnt_HeaderFile
index 34d9f7baa6eefbe2c8f8b0a3c56d1f2bfc315874..538b6c54cb7218a61066f9bac8366d9287f97c33 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfShapeReal_HeaderFile
index 3498b1c99dc33a1635960d78688d19fe9ab8a3c4..179a4d78c34c8bb0892874164eb4e82347f6d661 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
index 09caf37e2f857c7f144ad7b86fb894dd5ae87ff1..2e010b6b026b346f2211c927b9370b635de05d12 100644 (file)
@@ -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) ;
index 721d1c29f184ff64e8b81ec0b643248b6e33b53e..23ed9c3549f1fdecd28abf3c105451acf915d6c5 100644 (file)
@@ -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<aNb; ++i) {
   }// if (!aNb && myNbPntsMin) {
@@ -877,7 +877,7 @@ if (!aNb && myNbPntsMin) {
           //
           aN1=(Standard_Integer)aPK.Id(1);
           aN2=(Standard_Integer)aPK.Id(2);
-         //
+          //
           aP1=aNodes(aN1).Transformed(aTrsf);
           aP2=aNodes(aN2).Transformed(aTrsf);
           //
index 60291c365d713dd6dc12a7bf087a98760fa29d99..2fc6ea3c80c4f6d0a7c47cf6eb764477326b8f84 100644 (file)
@@ -112,16 +112,16 @@ protected:
 
   Standard_EXPORT
     void InnerPoints(const TopoDS_Face& aF,
-                    GEOMAlgo_ListOfPnt& aLP) ;
+                     GEOMAlgo_ListOfPnt& aLP) ;
 
   Standard_EXPORT
     void InnerPoints(const TopoDS_Edge& aE,
-                    GEOMAlgo_ListOfPnt& aLP) ;
+                     GEOMAlgo_ListOfPnt& aLP) ;
 
   Standard_EXPORT
     void InnerPoints(const TopoDS_Edge& aE,
-                    const Standard_Integer aNbPnts,
-                    GEOMAlgo_ListOfPnt& aLP) ;
+                     const Standard_Integer aNbPnts,
+                     GEOMAlgo_ListOfPnt& aLP) ;
 
 
   TopAbs_ShapeEnum myShapeType;
index e0f763a822c90a2c946aed86ca074f5677dc558f..0399266edc599d6c35c69f0d86cd81614b66f799 100644 (file)
@@ -92,7 +92,7 @@ class GEOMAlgo_GetInPlaceIterator  {
    */
   //Standard_EXPORT
     void Initialize(const TopAbs_ShapeEnum theT1,
-                   const TopAbs_ShapeEnum theT2) ;
+                    const TopAbs_ShapeEnum theT2) ;
   /**
    * Check the existence of pairs to iterare.
    * @return
@@ -296,15 +296,15 @@ protected:
 
   Standard_EXPORT
     void FillShapesIn(const TopoDS_Shape& theS1,
-                     const TopoDS_Shape& theS2) ;
+                      const TopoDS_Shape& theS2) ;
 
   Standard_EXPORT
     void FillShapesOn(const TopoDS_Shape& theS1,
-                     const TopoDS_Shape& theS2) ;
+                      const TopoDS_Shape& theS2) ;
 
   Standard_EXPORT
     Standard_Boolean CheckCoincidence(const TopoDS_Shape& theS1,
-                                     const TopoDS_Shape& theS2);
+                                      const TopoDS_Shape& theS2);
 
 
   TopoDS_Shape myShapeWhere;
index 914a1bccc3e8710e904c59dbb9dd8fae79472aa6..ad30fedab38333c6d90e03255245577371bd2f37 100644 (file)
@@ -20,8 +20,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       GEOMAlgo_GetInPlace_1.cxx
-// Author:     Peter KURNEV
+// File:        GEOMAlgo_GetInPlace_1.cxx
+// Author:      Peter KURNEV
 
 #include <GEOMAlgo_GetInPlace.hxx>
 
 
 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;
index a4f4d2aa57d73b051b1a6d45e738bbd866f8a556..f21ba165b8f2130619fa75ba0d0ff52491e6cf66 100644 (file)
@@ -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 <GEOMAlgo_GetInPlace.hxx>
 
@@ -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;
       }
     }
   }
index 793cb306f39e50ded714e411b5f86a5cc718f452..1dcf1021b6132a151dc807a814b00ec2b88d47c0 100644 (file)
@@ -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 <GEOMAlgo_GetInPlace.hxx>
 
@@ -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;
   //
index fbb560ab90251e71d7b6c168c2f76575d0e5e4ae..88f1c6d8ff96aadd7fcfd97b86f07907846cca83 100755 (executable)
 // 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
-//             <peter@PREFEX>
+// File:        GEOMAlgo_Gluer.cxx
+// Created:     Sat Dec 04 12:45:53 2004
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
 //
 #include <GEOMAlgo_Gluer.hxx>
 
@@ -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);
       }
     }
   }
index f8d74f7ff39954b5cbcc6afc80ad1b1cef02e03f..a8390d1e5bfde8ebd1eb199218b2b13385ea2e55 100644 (file)
 // 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
-//             <peter@PREFEX>
+// File:        GEOMAlgo_Gluer.hxx
+// Created:     Sat Dec 04 12:45:53 2004
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
 //
 #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;
index 8a218d4d13146c00e1731ea3db7ba980b7064a89..1fc5687d6e2c44a96146f12d6c53c89571044732 100644 (file)
 //
 // 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
-//             <peter@PREFEX>
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
 //
 #include <GEOMAlgo_Gluer2.hxx>
 
@@ -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;
   //
index 24b680085b182ffe2b3a2da767a550d22a2e2540..e0b8473b77a1279a627d30fcc5ae4bfa4794facb 100644 (file)
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       GEOMAlgo_GluerAlgo.cxx
+// File:        GEOMAlgo_GluerAlgo.cxx
 // Created:
-// Author:     Peter KURNEV
-//             <peter@PREFEX>
+// Author:      Peter KURNEV
+//              <peter@PREFEX>
 //
 #include <GEOMAlgo_GluerAlgo.hxx>
 #include <IntTools_Context.hxx>
index b480d646400281e76abdf57349efcf720f63a9f3..f532d52b62a39192efb40dbea1e8c881f390efef 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
index 3b5076b12800e024a3ee71e344f8f58b9227c797..4499b3be305cbc851992f6d398f612ca2bb5ee0d 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
index ac7ca64847da41e6db1b0b358f09fb80461ebea8..8f333dc091ef5938a48afa0c4ca0e681d538a1a5 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
index 33581c1df699ffab085cf2b114db71c179e35113..4496dccf2afa4726d8dd85960cdd6989252a2555 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
index b11597b5b171ce523ad7b74888512b768adbf6e1..4907611f8aa0f41d2177ea8927d599a570ab5c7c 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
index 1d945d314de10b72d1791f7a4b59dae28c393a58..28c12168420e00b26dd03ca97dd5d423de293b57 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
 #define GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
index dafb123b2191ffa1189812788e3850c873dfe88b..65d878e9106f02633eada38b12a344dea028f8b9 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
index d2bca1b0d30f4315b221717b0499c265c2eef298..ffa570c531c2d32fc3f485363b6cd0f2222e6b06 100644 (file)
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
 #define GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
index d584df0c6ebc9628055210379a662c6cb1f7e6ef..8da50de23976ac048647cb5fd40bfe3fc93d8b27 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef GEOMAlgo_ListOfPnt_HeaderFile
index 888540471d14dd2daeaf5add6052505fc0e57b68..87fba9a405c48c10ccc9bdea83e2a2e0e0fb35ef 100644 (file)
@@ -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) ;
index 8bcb31efe5e6c0da3c85121519ed558a84174f2a..22f3a9bf03e6e3d860cd35f9670b4e7e23bb449e 100644 (file)
@@ -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
index fecb08417eb68a055d3fda28c6dfd68f89f14c61..8ea6cb84a6de3b688e9f304d7ac0e838a12d08e4 100644 (file)
@@ -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) ;
index 7cb5d41e95e1b813825e180b4a42f4bd7acadd86..8b3ad711b2709d8eb5282e56667840f56b1f66f5 100644 (file)
@@ -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
index b8603b056abbe7d6a7225ced45ccea699c085fdd..077af539c38a0b31425f2f86bc255fff2f1d4063 100644 (file)
@@ -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);
       }
     }
   }
index 575a5fdcf71e0185efaa205b0da049f00ae3f6a0..57e1d904c038d7e0d34d771da682e87a9c2a5cf4 100644 (file)
@@ -68,7 +68,7 @@ protected:
 
   Standard_EXPORT
     static void AddInternalShapes(const TopTools_ListOfShape& ,
-                                 const TopTools_IndexedMapOfShape& );
+                                  const TopTools_IndexedMapOfShape& );
   //
 };
 
index 0d88c9fce3ad51612a2ea3b8d1833d19d72d191d..d8b1e5aef3a52ba7d454a558f61b668be60c6910 100644 (file)
@@ -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) ;
index 8ed8d2471a5702b242e4832044e546ae2d4e606f..cc9742b4be335d853b98d76a62bc40dcaef913a2 100644 (file)
@@ -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
index 664f59dfa28a215f53e23ddd0fa4763cc8e9d183..c49ebdda32e7777979cf4ba99f0346f84c391bbb 100755 (executable)
@@ -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;
index 6dd63c8d079bb9daa7196664fdfb1d8fd7761d4e..f5fcd32cdc138f47431947110b9fe69de911704f 100644 (file)
@@ -60,8 +60,8 @@ class GEOMAlgo_Tools3D  {
   //!          theContext - cashed geometrical tools <br>
   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 <br>
   //!          theShape is not the same as for the face <br>
@@ -69,8 +69,8 @@ class GEOMAlgo_Tools3D  {
   //!          theContext - cashed geometrical tools <br>
   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 <br>
   //!          theEdge is not the same as for the edge <br>
@@ -78,8 +78,8 @@ class GEOMAlgo_Tools3D  {
   //!          theContext - cashed geometrical tools <br>
   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 <br>
   //!          computes sense value <br>
@@ -88,18 +88,18 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 2 if the faces have opposite sense <br>
   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 <br>
   //!          of the face theF1 <br>
   Standard_EXPORT
     static  void CopyFace(const TopoDS_Face& theF1,
-                         TopoDS_Face& theF2) ;
+                          TopoDS_Face& theF2) ;
 
   //! Makes empty shape theShape of the type theType <br>
   Standard_EXPORT
     static  void MakeContainer(const TopAbs_ShapeEnum theType,
-                              TopoDS_Shape& theShape) ;
+                               TopoDS_Shape& theShape) ;
 
   //! For the list of faces theLS build block <br>
   //!          theLSCB in terms of connexity by edges <br>
@@ -107,8 +107,8 @@ class GEOMAlgo_Tools3D  {
   //!          the treatment <br>
   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 <br>
   //!          toward solid theSolid. <br>
@@ -117,9 +117,9 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 3-D state. <br>
   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 <br>
   //!          toward solid theSolid. <br>
@@ -128,9 +128,9 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 3-D state. <br>
   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 <br>
   //!          toward solid theSolid. <br>
@@ -139,9 +139,9 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 3-D state. <br>
   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 <br>
   //!          toward solid theSolid. <br>
@@ -150,9 +150,9 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 3-D state. <br>
   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 <br>
   //!          toward solid theSolid. <br>
@@ -162,10 +162,10 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 3-D state. <br>
   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 <br>
   //!          couple of faces theFace1, theFace2. <br>
@@ -173,10 +173,10 @@ class GEOMAlgo_Tools3D  {
   //!          share the edge theEdge <br>
   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 <br>
   //!          appropriate couple of faces (from the set theLF)    . <br>
@@ -184,9 +184,9 @@ class GEOMAlgo_Tools3D  {
   //!          share the edge theEdge <br>
   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 <br>
   //!          solid theSolid. <br>
@@ -195,10 +195,10 @@ class GEOMAlgo_Tools3D  {
   //!          theContext- cahed geometrical tools <br>
   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 <br>
   //!           finds the face suitable to produce shell. <br>
@@ -206,9 +206,9 @@ class GEOMAlgo_Tools3D  {
   //!           from theLCEF must share edge theEdge <br>
   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 <br>
   //!          that is the same as theEdge <br>
@@ -216,8 +216,8 @@ class GEOMAlgo_Tools3D  {
   //!          Returns False if there is no such edge <br>
   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 <br>
   //!          the edge theEdge but with opposite orientation. <br>
@@ -225,8 +225,8 @@ class GEOMAlgo_Tools3D  {
   //!          edge founded <br>
   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 <theP> inside the face <theF>. <br>
   //!          <theP2D> -  2D  representation of <theP> <br>
@@ -234,7 +234,7 @@ class GEOMAlgo_Tools3D  {
   //!          Returns 0 in case of success. <br>
   Standard_EXPORT
     static  Standard_Integer PntInFace(const TopoDS_Face& theF,
-                                      gp_Pnt& theP,
-                                      gp_Pnt2d& theP2D) ;
+                                       gp_Pnt& theP,
+                                       gp_Pnt2d& theP2D) ;
 };
 #endif
index 622288d653ab491372fa066e04905343a6dd1c45..9f43ac2e3b4a50df18ba96c87f6c5bbd9bb0755f 100644 (file)
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       GEOMAlgo_WESScaler.cxx
+// File:        GEOMAlgo_WESScaler.cxx
 // Created:
 // Author:
-//             <pkv@VORTEX>
+//              <pkv@VORTEX>
 
 
 #include <GEOMAlgo_WESScaler.hxx>
index 7048a303f28ad23b125eff75b3ed4fb8aa2daabd..77788c4471b78ccc6d2ed4ef5010b3ff16d0476c 100644 (file)
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       GEOMAlgo_WESScaler.hxx
+// File:        GEOMAlgo_WESScaler.hxx
 // Created:
 // Author:
-//             <pkv@VORTEX>
+//              <pkv@VORTEX>
 
 #ifndef _GEOMAlgo_WESScaler_HeaderFile
 #define _GEOMAlgo_WESScaler_HeaderFile
index c0ca486e178e230cff0b94d1ceee3e0ab55b73af..37248cc4dc3a11b5b34dfbbca2d7de2d2eb4b251 100755 (executable)
@@ -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++;
       }
     }
   }
index 2d0cd2bd7e7994914ea197f006dd23ea43452943..26b11e36ef8fe257058e193980fa3fa6d7fd4834 100644 (file)
@@ -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<SalomeApp_Study*>( 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<SUIT_ViewWindow*> 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<SUIT_ViewWindow*> 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<SVTK_ViewWindow*>( 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<SVTK_ViewWindow*>( 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() );
     }
   }
 }
index f771609b773de6c2ce75ddda9cf2022b5c7262c1..f52c3c178b26d1b4b1d2bff92c8d81bbee6e0520 100644 (file)
@@ -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 );
 
index 100b5270e12d21c0f68463d7fd88a96cf3b86400..dd19cf2ba4abde08ffb791ded07f2cd2cf4282e5 100644 (file)
@@ -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<SVTK_Prs*>( prs );
-       vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0;
-       if ( lst ) {
-         lst->InitTraversal();
-         vtkActor* actor = lst->GetNextActor();
-         if ( actor ) {
-           SALOME_Actor* salActor = dynamic_cast<SALOME_Actor*>( 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<SVTK_Prs*>( prs );
+        vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0;
+        if ( lst ) {
+          lst->InitTraversal();
+          vtkActor* actor = lst->GetNextActor();
+          if ( actor ) {
+            SALOME_Actor* salActor = dynamic_cast<SALOME_Actor*>( 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<SVTK_Prs*>( 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<SVTK_Prs*>( 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<SVTK_Prs*>( 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<SVTK_Prs*>( 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() )
       }
     }
   }
index d4b40cb5c6f73715b38b4810e85401b7428342ad..95b50621ccd42f5adb0958bd2b801d84d6420c7d 100644 (file)
@@ -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<QColor>() ) );
+                      SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>() ) );
   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<QColor>() ) );
+                      SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>() ) );
   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<QColor>() ) );
+                      SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value<QColor>() ) );
   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<QColor>() ) );
+                      SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::LineColor ) ).value<QColor>() ) );
   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<QColor>() ) );
+                          // 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<QColor>() ) );
       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<QColor>() ),
-                                ++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<QColor>() ),
+                                 ++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<SALOMEDS::Color>& 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<SALOMEDS::Color> 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<SALOMEDS::Color> 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
-         }
-       }
+          }
+        }
       }
     }
   }
index cb177d7360a6488dd21e76703d442647272a09f7..4f0c137f4994aea24594bdd03b710e0f82e9bac7 100644 (file)
@@ -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 */
 
index 2b8a4abcb354a31550b0729b62402d9c3486a607..31e2fca51a60d6b50621a6b26a5a0eb6031cfc89 100644 (file)
@@ -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
index 61a9883f86854a3811038f7503f9974fe635caf2..f2ede26792947a88385f3c86328b2e656c7f638d 100644 (file)
@@ -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();
 }
 
index 6423f3e1ce495ae7c83e0777432f10bfeeb6554a..f737b37613182ecb6ae84e49accd3764333af094 100644 (file)
@@ -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<QColor>();
@@ -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 );
 }
index 9423e5de87548bbc3e3cdae5312de397ef6c7106..2885d15830a457cfb420817ad8f073a6d4be6946 100644 (file)
@@ -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();
index a41be594954776ae3739849f9bbc9aa28057e55b..a8a70fc3f57e7f77ee5c9cce4e841116b17076b0 100644 (file)
@@ -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());
+        }
       }
     }
   }
index e2f9f60fe0537c6dc300e8956fa8325f9bfd956f..bf304cba6d38a719319eec998bf4ef12a8ebf6da 100644 (file)
@@ -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();
index ceda0060a272f6751480ec8a986f4cd632d11356..efbee01cb6a01d4d50e045730096097a3d860fb6 100644 (file)
@@ -100,7 +100,7 @@ void GEOM_Swig::init()
 
       // update Object browser
       if ( dynamic_cast<SalomeApp_Application*>( app ) )
-       dynamic_cast<SalomeApp_Application*>( app )->updateObjectBrowser( true );
+        dynamic_cast<SalomeApp_Application*>( 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<SVTK_ViewWindow*>( window ) )
-         dynamic_cast<SVTK_ViewWindow*>( window )->onFitAll();
+        SUIT_ViewWindow* window = app->desktop()->activeWindow();
+        if ( dynamic_cast<SVTK_ViewWindow*>( window ) )
+          dynamic_cast<SVTK_ViewWindow*>( window )->onFitAll();
         else if ( dynamic_cast<OCCViewer_ViewFrame*>( window ) )
-         dynamic_cast<OCCViewer_ViewFrame*>( window )->onViewFitAll();
+          dynamic_cast<OCCViewer_ViewFrame*>( 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
index 9054ce7a6961f98a82aafa578a2c354c57820488..a5f81be42160f834399353208733374096621796 100644 (file)
@@ -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();
     }
   }
 
index 5da059ad2af9982b3b233943d5212766a37218b7..905428c0f7f3a3981a59c42ecf52ac3c07f23cd3 100644 (file)
@@ -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) {
index a2f26301322dc037dddd0433c3afa0aa687d8e23..d5046707afdff69879e2e012d003903eb9036a35 100644 (file)
@@ -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();
index 467e12874b14bac6bec6f231768a965620627378..3f95c135a7630b6dab2eb0e71be3670d4dbcf458 100644 (file)
@@ -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;
+  }
 }
 
 /*!
index 9b38b3cb2e9ac63485f2f65a8113e67b66efde0a..12cb467905eb5339a7e08070f210946e9df659a1 100644 (file)
@@ -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() ) );
     }
index a133fd3b666d692b4c473c73df2373a5dd2239d1..eb026c9c4317c57a72d9de94f50be5eeae337dcc 100644 (file)
@@ -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_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
index 04ccf5785b002728a1167be5075430f20b490642..7b1d13987f8caad8ea288988e59377be2c260d02 100644 (file)
@@ -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();
index 43afc8c97cdf1ab0858258c327fb97566fd50ad9..b3c674b9130c3d30222278d366b87fea7af5a0f9 100644 (file)
@@ -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:
index b418c3a12557c91243f8e51ee704be802bcd8dd6..a022f365cfb11d09f7f9db3a34e9e80e8bb02cc4 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphere.cxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphere.cxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 //
 #include <NMTDS_BndSphere.hxx>
 
index 18261095dd192a93d75169be6de50fa9fe1dafd7..ce1de2873aa721c93458582e449dd2a5446a87bb 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphere.hxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphere.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 
 #ifndef _NMTDS_BndSphere_HeaderFile
 #define _NMTDS_BndSphere_HeaderFile
index c1d11f9aadce990e4f3358d6adc3793d524a7e93..5af4b70da42745eecd16d37c45819e7994042b72 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphere.lxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphere.lxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 //=======================================================================
 //function : SetCenter
 //purpose  : 
index 575e6e78cee26b9ffb4cb87f2a024d5948382f21..71099cd6838206ada5391335fc72761e81c8421e 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphereTree.cxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphereTree.cxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 //
 #include <NMTDS_BndSphereTree.hxx>
 //=======================================================================
index 35e3251b001ace63473e974c5870f11d47a89585..076bc8adbcdb2d31e3fa55dd68ae80e5b63ea888 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphereTree.hxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphereTree.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 //
 #ifndef NMTDS_BndSphereTree_HeaderFile
 #define NMTDS_BndSphereTree_HeaderFile
index d0e2450780d55a1f38cb13f51a8cef3e64cac45d..afba06c295f2519bb1c7c78d7b2c6b21ca8ec3ef 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_CArray1OfIndexRange.hxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_CArray1OfIndexRange.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 
 #include <NMTDS_CArray1OfIndexRange.hxx>
 
index c79bd32ae3e2e16ec6c8eccbcf472737b78dbd9e..dc57adbc255d62e3603a6dcff6a6631e99111ea7 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_BndSphere.hxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_BndSphere.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 
 #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) ;
index 5fc2d4d4e168f2c6a0a983a019c195121cf0dee8..f4c477c65765e8193807238c4adb566610b2f392 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
+// Created:     Mon Feb 20 09:31:43 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
index d745ce6b7b348fd5a04218557921b27cdd5967ac..4c959f14420d02ca0bb12c622e8cb347a253fc86 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_DataMapOfIntegerMapOfInteger.hxx
+// Created:     Mon Feb 20 09:27:40 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
index 0686ecb5bf46e5d93e9c8f3898ac62e1a0e2f843..c1010d2551c7870233d5e1c8b03eb93591d78a11 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_IndexedDataMapOfIntegerShape.hxx
+// Created:     Mon Feb 20 09:20:07 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
index f553ca52ad9a1b9410a8256cb59a1e7974a30f94..fbc0fbfe9daf0de26789a5c6110feb3c0b6cb1e1 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_IndexedDataMapOfShapeBndSphere.hxx
+// Created:     Mon Feb 20 09:17:01 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
index bac339a727ae6a3b9d0086088f4a3255a1c0444d..9c79b380e482fad961f3c46877773b6f9c13ba06 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_IndexedDataMapOfShapeBox.hxx
+// Created:     Mon Feb 20 09:17:01 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_IndexedDataMapOfShapeBox_HeaderFile
index 6a857500621fd0bbc8027b0e11869a0414b21b85..c416edc24db71467b714b680f294dffa45242b2b 100644 (file)
@@ -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;
   //
index 6699df3fd26306ba9e47b30caa6bd10e6d7859a8..d5e71892b41d41be6e5e2b0a3b92e2192b2ef5b2 100644 (file)
@@ -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 <br>
   Standard_EXPORT     BOPTools_CArray1OfSSInterference& SSInterferences() ;
index 034b0ee594f0e70b745849ef933cbb49a596dc99..21627d5880829244b5e0a4c115e6b51145e0578e 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// File:       NMTDS_InterfType.hxx
-// Created:    
-// Author:     Peter KURNEV
-//             <pkv@irinox>
+// File:        NMTDS_InterfType.hxx
+// Created:     
+// Author:      Peter KURNEV
+//              <pkv@irinox>
 
 
 #ifndef _NMTDS_InterfType_HeaderFile
index e364d6fa2e36737b64a8471b9c6eea6871ef85e6..8efe54cd3e5f2e13fb4ceff4dfd7acc86e29ade8 100755 (executable)
@@ -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<aNbR; ++iR) {
@@ -348,7 +348,7 @@ void NMTDS_Iterator::Intersect()
 //purpose  : 
 //=======================================================================
 void NMTDS_Iterator::FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD,
-                             TColStd_DataMapOfIntegerListOfInteger& bMVSD)
+                              TColStd_DataMapOfIntegerListOfInteger& bMVSD)
 {
   Standard_Boolean bFound;
   Standard_Integer aNbVSD, iCnt, i, j, k;
index cccca3de9627ebcf2645649be60d96d1871bfb0f..47bc547e3fdd503e932855915a3f00fd9e72c85b 100644 (file)
@@ -58,7 +58,7 @@ class NMTDS_Iterator  {
   
   Standard_EXPORT 
     void Initialize(const TopAbs_ShapeEnum aType1,
-                   const TopAbs_ShapeEnum aType2) ;
+                    const TopAbs_ShapeEnum aType2) ;
   
   Standard_EXPORT 
     Standard_Boolean More() const;
@@ -68,8 +68,8 @@ class NMTDS_Iterator  {
   
   Standard_EXPORT
     void Current(Standard_Integer& aIndex1,
-                Standard_Integer& aIndex2,
-                Standard_Boolean& aWithSubShape) const;
+                 Standard_Integer& aIndex2,
+                 Standard_Boolean& aWithSubShape) const;
   
   Standard_EXPORT
     virtual  void Prepare() ;
@@ -85,7 +85,7 @@ class NMTDS_Iterator  {
   
   Standard_EXPORT 
     static  void FillMVSD(const TColStd_DataMapOfIntegerListOfInteger& aMVSD1,
-                         TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
+                          TColStd_DataMapOfIntegerListOfInteger& aMVSD2) ;
 
 protected:
   Standard_EXPORT  
index d30263451cb2d4a503272df7eeaa4029bfe89813..240485a93162919b73ae66bba3caf33592808211 100644 (file)
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
-// Created:    Mon Feb 20 07:27:34 2012
-// Author:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
index bbd73ed8daf0b829155f9f84900861a3f63c7b3f..0efd0bed73cf0f3a13144f460eff0590dba5c756 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListIteratorOfListOfPair.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListIteratorOfListOfPair_HeaderFile
index 72eb3ad4b20165351fc109e1662c2718b72057f8..b7b43c1aedd485fc5401c2de9686ff0acee826c7 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListIteratorOfListOfPairBoolean.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListIteratorOfListOfPairBoolean_HeaderFile
index 6986a134918b46d86169e5858f3f3fa6f40c398f..e7d2a14f252746965ad1fbac9ab24f99d35e5b7a 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListIteratorOfListOfPassKey.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListIteratorOfListOfPassKey_HeaderFile
index 896b09d3ee876913fa8afb20d89dcde5333bd9f1..b73ae36f762e1c545b04bbe0905a25ccdeaf17a8 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
index 6b4d67657dee6e1899a52e9de81b564c8bfddbc4..9ebb31e80cf2b39f20695cedb10d9881e3b9b7a1 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
index fae2d9345690c41f960358646ce916fe63f5d05d..77249fce05f44366f129d99554bcddbb4a424e4d 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListOfPair.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListOfPair_HeaderFile
index eefb86dbd8fad3a25fb69dbe0e6e43f9ccd42026..af5928083dd4166f27fea308cd31c7c71b8e6327 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListOfPairBoolean.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListOfPairBoolean_HeaderFile
index 2de573f4efe7bc36c84e74c67982d96e1565ae02..18664f2735e951d6881c2772ad818d5a81eb8768 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListOfPassKey.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListOfPassKey_HeaderFile
index 444aa570845f140fd576fb1d305d4c6ff9331f03..05c1c065f14b5830a0af9abbe608dbb6dfc06b2a 100644 (file)
 //
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_ListOfPassKeyBoolean.hxx
+// Created:     Mon Feb 20 07:27:34 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_ListOfPassKeyBoolean_HeaderFile
index 9bee8f67f2a3515fcdbf4769d8c3d62e15870e05..0d1cd35f38360ec80f4795c51914e30cfbbc9de8 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_MapIteratorOfMapOfPairBoolean.hxx
+// Created:     Mon Feb 20 08:22:39 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_MapIteratorOfMapOfPairBoolean_HeaderFile
index 7875cbd54d6d1c711caf9150519f8f4efb61a46a..571c62fd70dcce704a973319ee8f2db85c487357 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMRCol_MapIteratorOfMapOfPassKey.hxx
+// Created:     Mon Feb 20 08:22:39 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMRCol_MapIteratorOfMapOfPassKey_HeaderFile
index 97f43748c039aeacb02948ea59bcc10fb5ce83fb..b2568ff91750fdbb142fed1c5008594297e798f5 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMRCol_MapIteratorOfMapOfPassKeyBoolean.hxx
+// Created:     Mon Feb 20 08:22:39 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMRCol_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
index b420d2b6991e63972b148f49ba1b8c414dad5f0d..89dbcc2bdeee0783296ba4089a70fa13608a2533 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_MapOfPairBoolean.hxx
+// Created:     Mon Feb 20 08:19:07 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_MapOfPairBoolean_HeaderFile
index f3374f94d8277407819ed3b6901eda6560a5f6eb..ee65b2fe68082297b68c6014346723b7a8cf8c2d 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_MapOfPassKey.hxx
+// Created:     Mon Feb 20 08:19:07 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_MapOfPassKey_HeaderFile
index f6ba5385b67c7baa65b1408c692f9bbde26921eb..7e3e28fd938867e89231baf4dfc1a935dc5b7042 100644 (file)
 // 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:     
-//             <pkv@BDEURI37616>
+// File:        NMTDS_MapOfPassKeyBoolean.hxx
+// Created:     Mon Feb 20 08:19:07 2012
+// Author:      
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTDS_MapOfPassKeyBoolean_HeaderFile
index 2e8d6b883b29ad5e22ded425ff8dd73e9527c247..1a728eda66cfd3eda70fa4b0027b071b3125d3e2 100644 (file)
@@ -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;
index c0e5758c1e8a6c4a343d6fc21888f860d96fb65d..61fb74fce76ea486f110021e107f4aac789fca75 100644 (file)
@@ -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;
index 7f87e39cbdf9d87508a230af1a76b3f663de0784..7cf3f98a5f6b7794e311efc75254d90e82d72208 100644 (file)
@@ -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);
 }
index 6ec9efe827a38c8056ce5fb05b30912c8d838129..1809ddf0304ce3a02cc75464118f896b53d975a8 100644 (file)
@@ -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
index a4e147b4a2fc38ae82ce3a6beef823e004a43166..4f9870731880d132eb10e8f975f3624f968e7c02 100644 (file)
@@ -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) ;
index ac314ab29cfa6e9f7b033f3fa5adc100796384b0..1b879d31d386a031901adecfe87ccde744fa8db2 100644 (file)
@@ -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
index d5183642d71520350685a3d46d6ded8f9c8f2d24..7db9cf408698de38abc9f4e02ef2b5b2c44f1265 100644 (file)
@@ -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) ;
index f4af7b028afdbbcf4c079f9ec2c6366d45c3578a..a6970255c98caf38b0f3f3a86711597677730875 100644 (file)
@@ -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
index 90187b105f059c15592c9e3c4ba4266cfa93041e..a693f97dd401f3296e3ee6860b2e8a7fb4aec1b5 100644 (file)
@@ -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;
   //
index d173f7df257d066b096dfb6c66cbfceb8ad93981..745e0e81b053770212a10ed2a3662b27ff087396 100644 (file)
@@ -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:
index 73fd3ad81e4581b9ccf457e1e3b497a18b408941..77ea0692a6c641b108190263a1d303528387c0c8 100644 (file)
@@ -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
index 375dadd1798e61836a3d043b447067e605312d54..4def33d31d23582d45cc4ff436507360d1785450 100644 (file)
@@ -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;
index f349776a90a5ee773868f36a987fd40b3e35c051..fd7885cae5864f83e244ba503faf005ddcc60b95 100644 (file)
       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(dT1<aDT && dT2<aDT) {
-       BOPTools_ListOfPaveBlock* pLPB=(BOPTools_ListOfPaveBlock*)&aSplitEdges;
-       pLPB->Clear();
-       return;
+        BOPTools_ListOfPaveBlock* pLPB=(BOPTools_ListOfPaveBlock*)&aSplitEdges;
+        pLPB->Clear();
+        return;
       }
     }
   }
index c8e35d53a1e32a8d042abe998d09e01e7ff49283..c48d956c751339c0af42ee53b278034a76f1042c 100644 (file)
@@ -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;
index d506cd7994c880777510a52609bf9fb1b16a8b4c..75142deb0b86fabb7bfadfa119448dcd9674356d 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo_HeaderFile
index 7f6855db6365e6a3e3fe4f6d5fc50c6c6d33921f..1dc64a8ef2e11c2a317545e685109435f278738b 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
index 34827ca12f81c4ae5f006670203c72b7daa53070..0300f5ae827de97fdbc1b462cc7e00e2dbe0a690 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
index 9a3b28289bae0ff854cdec9bf96ed083cf54895d..4f50b85e732e2844931bf21f66be1342573d4b51 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
index 57f83af4789de632e714cdffceaa907068b95335..827972dde897e6149adf0b1db14156fcbce61078 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
index ed9fb608ab420785391c2a59af0d545a3626acb2..402d5166b4a53bedacbb93126340b0b46f092ffb 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
-// File:       NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
-// Created:    Mon Feb 20 11:59:23 2012
+//              <pkv@BDEURI37616>
+// File:        NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+// Created:     Mon Feb 20 11:59:23 2012
 // Author:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
index bfc22d97511c124b6562d6da027fdac732ea1300..472c4034c115acb3c96ffc291b4c2bb0ac3bab1e 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
index 943d9032c373c1da983bc1019763c52e409af70f..0f75fefa5706a17d67eeb36dd034c62195143c0c 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
 #define NMTDS_ListIteratorOfListOfCommonBlock_HeaderFile
index e0ef6e95a423538e99e19abd49a1e9b2038f3661..5741b3566705799117d17989c9fb8e1c9ff32782 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
 #define NMTDS_ListIteratorOfListOfCoupleOfShape_HeaderFile
index 49d282e34a1fc1208dfeea7eac7c229bd00ca4bd..208eb93e7114a3851edd968e7183cff08fc0ad6b 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef NMTTools_ListOfCommonBlock_HeaderFile
 #define NMTTools_ListOfCommonBlock_HeaderFile
index 207f34df60f3d860265f1f8280972a68b4a0f767..c4e77d2b615791181f51d72f172fbaa3b88b721f 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 #ifndef NMTTools_ListOfCoupleOfShape_HeaderFile
 #define NMTTools_ListOfCoupleOfShape_HeaderFile
index 717fd3dad5f3ffce109eefd8928a46ffab1cf6f3..b01c87f95cac3414cb6215fff46d09530faac34f 100644 (file)
 //
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
index e65feb38a3610f5298476797aab1ffb6d4710de3..e1911a92e502714b1a43b3b610b07f039729060b 100644 (file)
 // 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:
-//             <pkv@BDEURI37616>
+//              <pkv@BDEURI37616>
 
 
 #ifndef NMTTools_MapOfPaveBlock_HeaderFile
index d768dd545a7f10e0c56450a5e3a75175df707a08..933c77b771f026d588723c101af9b0568910c264 100644 (file)
@@ -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;
index ef774277e0fdc5c63b4bd19998a07ef8f1b31f37..83e2b36afa6c67cf2f8acedc2c5cc661e969d1bd 100644 (file)
@@ -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 (aD<aTol) {
       aT2x=aPPC.LowerDistanceParameter();
       if (aT2x>aT21 && aT2x<aT22) {
-       return !bRet;
+        return !bRet;
       }
     }
   }
index 81df58ce89cb8d1709e0b4bb691dd45dcedb3186..2b49803f242cfa6cd6641dab2a90f03e83f71d77 100644 (file)
@@ -287,10 +287,10 @@ void NMTTools_PaveFiller::MakeBlocks()
       const TColStd_MapOfInteger& aMV1=(!j) ? aMVOn1 :aMVIn1;
       aItMI.Initialize(aMV1);
       for (; aItMI.More(); aItMI.Next()) {
-       nV1=aItMI.Key();
-       if (aMVOn2.Contains(nV1) || aMVIn2.Contains(nV1)) {
-         aMVStick.Add(nV1);
-       }
+        nV1=aItMI.Key();
+        if (aMVOn2.Contains(nV1) || aMVIn2.Contains(nV1)) {
+          aMVStick.Add(nV1);
+        }
       }
     }
     //
@@ -305,32 +305,32 @@ void NMTTools_PaveFiller::MakeBlocks()
       NMTTools_MapOfPaveBlock *pMPB;
       //
       if (!j) {
-       pMPB=((NMTTools_MapOfPaveBlock*)&aMPBIn1);
+        pMPB=((NMTTools_MapOfPaveBlock*)&aMPBIn1);
       }
       else if (j==1) {
-       pMPB=((NMTTools_MapOfPaveBlock*)&aMPBOn1);
+        pMPB=((NMTTools_MapOfPaveBlock*)&aMPBOn1);
       }
       else if (j==2) {
-       pMPB=((NMTTools_MapOfPaveBlock*)&aMPBIn2);
+        pMPB=((NMTTools_MapOfPaveBlock*)&aMPBIn2);
       }
       else if (j==3) {
-       pMPB=((NMTTools_MapOfPaveBlock*)&aMPBOn2);
+        pMPB=((NMTTools_MapOfPaveBlock*)&aMPBOn2);
       }
       //
       const NMTTools_MapOfPaveBlock& aMPB=*pMPB;
       aItMPB.Initialize(aMPB);
       for (; aItMPB.More(); aItMPB.Next()) {
-       const BOPTools_PaveBlock& aPB=aItMPB.Key();
-       if (aMPBX.Add(aPB)) {
-         aLPB.Append(aPB);
-       }
-       //
-       else {
-         if (j>1) {
-           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;
       }
     }
   }
index 35bd67988abc5fad9413f47fa2ec652e1796d54c..f21cfd2880f2af5816ac7a1d99e9bd16c6dba30d 100644 (file)
@@ -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; i<nd; ++i)
   }//while (1)
@@ -809,7 +809,7 @@ void SortShell(const Standard_Integer n,
 //purpose  :
 //=======================================================================
 Standard_Boolean Less(const BOPTools_PaveBlock &aPB1,
-                     const BOPTools_PaveBlock &aPB2)
+                      const BOPTools_PaveBlock &aPB2)
 {
   Standard_Boolean bRet;
   Standard_Integer iE1, iE2;
index 7bb2f87cbb5655688a84c6a8e73baffd8fc3c99e..17497b6ebb0f5922395bc7bad32bc6b26cafbdd8 100644 (file)
@@ -54,46 +54,46 @@ class NMTTools_Tools  {
  public:
   Standard_EXPORT
     static  void MakeNewVertex(const TopTools_ListOfShape& aLV,
-                              TopoDS_Vertex& aNewVertex) ;
+                               TopoDS_Vertex& aNewVertex) ;
 
   Standard_EXPORT
     static  void FindChains(const BOPTools_CArray1OfVVInterference& aVVs,
-                           BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+                            BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
 
   Standard_EXPORT
     static  void FindChains(const BOPTools_CArray1OfSSInterference& aVVs,
-                           BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+                            BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
 
   Standard_EXPORT
     static  void FindChains(const BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCV,
-                           BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
+                            BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMCX) ;
 
   Standard_EXPORT
     static  Standard_Boolean IsSplitInOnFace(const TopoDS_Edge& aE,
-                                            const TopoDS_Face& aF,
-                                            const Handle(IntTools_Context)& aCtx) ;
+                                             const TopoDS_Face& aF,
+                                             const Handle(IntTools_Context)& aCtx) ;
 
   Standard_EXPORT
     static  Standard_Boolean AreFacesSameDomain(const TopoDS_Face& aF1,
-                                               const TopoDS_Face& aF2,
-                                               const Handle(IntTools_Context)& aCtx) ;
+                                                const TopoDS_Face& aF2,
+                                                const Handle(IntTools_Context)& aCtx) ;
 
   Standard_EXPORT
     static  void FindChains(const NMTTools_ListOfCoupleOfShape& aLCS,
-                           NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM) ;
+                            NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM) ;
 
   Standard_EXPORT
     static  void FindChains(const NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM1,
-                           NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM2) ;
+                            NMTTools_IndexedDataMapOfShapeIndexedMapOfShape& aM2) ;
 
   Standard_EXPORT
     static  void MakePCurve(const TopoDS_Edge& aE,
-                           const TopoDS_Face& aF,
-                           const Handle(Geom2d_Curve)& aC2D) ;
+                            const TopoDS_Face& aF,
+                            const Handle(Geom2d_Curve)& aC2D) ;
 
   Standard_EXPORT
     static  void UpdateEdge(const TopoDS_Edge& aE,
-                           const Standard_Real aTol) ;
+                            const Standard_Real aTol) ;
 
   Standard_EXPORT
     static Standard_Boolean IsDegenerated(const TopoDS_Edge &theEdge);
index 8c143dde53ae1eeea157fa40634d748621c6c125..ed3d535e0e846bafd6f4806a74cc1043f1fa7217 100644 (file)
@@ -157,14 +157,14 @@ GEOM_AISShape::GEOM_AISShape(const TopoDS_Shape& shape,
   myTopLevel = Standard_False;
   Graphic3d_MaterialAspect aMatAspect;
   if ( !HasMaterial() ) {
-       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);
+        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;
 }
index 128095ce1ad450f2c98d3702196f3de0fa0d67f2..db0fe617684d39a4b7653b13def9a54a2dcbd3dc 100644 (file)
@@ -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();
 
index 40200dc19d3c16919accfd095be88ed036b62c34..ac3d53d4549a931375ee3e7d483cabde467502a9 100644 (file)
@@ -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;
 
index 2b9707adedca5751035136347f97e423acc8c2ac..de7ab52da3fb80c2fe3399c70031c743bd86b5c5 100644 (file)
@@ -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;}
index 92f9aefaa28cc995f5eac497fe2ed3767484dd90..9c11e65e003d903cbcd89c63583047f6e275fdd9 100755 (executable)
 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){
index fb049b55049373158c0dc93f58d72b590f7d849b..0717eb500179e68e9703e40840523eebde4ef797 100755 (executable)
@@ -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:
 
index 9f54251c75d26735588b4930ad30a69908b5bf36..25cdfc0fb5e850ed78fa2b4cf6fec53fcd8a40c6 100755 (executable)
@@ -46,7 +46,7 @@ public:
   static GEOM_VTKPropertyMaterial*  New();
 
 protected:
-  bool                             Physical;
+  bool                              Physical;
 };
 
 #endif
index d681e6ff0bd360f55ea0873dab2aeeacd383d028..3614b390b56143db73defd402855484a2e9976c4 100755 (executable)
@@ -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);
 
index 9d873051ed1cd850a8addb18b59022752cd41ff5..0d9295a2845f64eeb81826b15a409a430ab65728 100755 (executable)
@@ -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,
index 1ed537eeb72c31ce549de5003b923c9033f2d154..a7bca8c4e720e06e2f17a75d2e7d2c7dbffee00a 100644 (file)
@@ -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()));
index 5d09063bbea8b392b67beddba884bca3975cdf35..1cb2591e7e6c1271808277317cd2d5d58ae422b6 100644 (file)
@@ -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()));
index b2576b7012a71dcd56d51b9d4f3ce6eeea9f6a45..b4734af12712a14ab8a1560cdddf476c4aa83156 100644 (file)
@@ -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()));
     }
   }
 
index b7aa64094cc5ea77bdb712d31d8fb7aac5f8f68c..8acd5e87d89dbc615116b852a997b154fe6587d4 100644 (file)
@@ -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()));
     }
   }
 
index 22ae5e2f0ec22bff6495bd96d3fd6b8644fb01df..7672d82a17d179d81da4024fcbd32c0fb74c2e45 100755 (executable)
@@ -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();
     }
   }
 
index ff08dc23576b676084ed8e262206256d16fe7c94..10783693b037843a1ae831093c7126f6da771cf3 100644 (file)
@@ -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();
     }
   }
 
index 6ea89dfd4a768d3fb58216c9103811a8284954b6..f309e8691105df066abd0ed70b779f2cf444f5b0 100755 (executable)
@@ -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();
 }
 
index 3fa50263eea0815900d7b42e3ee05905273be611..c9d161d38de4ad76bbe05a71b64ec389eee31128 100644 (file)
@@ -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);
index 5923738684971f4ad238d5b087f9b29b025a385b..04d5d72db74af10593ab2c4c236820f87791e20b 100644 (file)
@@ -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 {
index ba8b0d5b9644d6088b275dc66dd5b3de9a4d3a41..e4e4071b645f17c6c0162bd0e2b701ecc6495d1a 100644 (file)
@@ -139,7 +139,7 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
                 if (SALOME_View* view = dynamic_cast<SALOME_View*>(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 ?
index 3b633929b720e4161fbd64aa27a1619ae8c956b2..ba4d798995838d1a69a8fbe085579d7644db6446 100644 (file)
@@ -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("");
     }
   }
index 6ac1ca9232ae1d232490b38d179604ea99a4e871..8c8e3cbe4fd3bf8f14343bd06e198c022e9e53ed 100644 (file)
@@ -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 )
index f03968be1ad09a517f466e04024385d044faae9e..286e2dc00b9b51b8734c2c33ab755a86d98bedd3 100644 (file)
@@ -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();
index dea5972458b155c360227261e812ecf2767f37f5..d10062ed4531a21da20400ddeb5a5d77018fa8fa 100644 (file)
@@ -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();
     }
   }
 
index 6373aff8a75c34da60af69743015b7d7633386aa..443f18c15e06b243657fed3b5cedc5b261a40aa2 100644 (file)
@@ -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("");
     }
index a7babcb4f120f6f5278b5b69e6fdbe582bdfddc5..c71eb127176bc5de096121c293e7478cd307a26c 100644 (file)
@@ -294,7 +294,7 @@ void TransformationGUI_ScaleDlg::SelectionIntoArgument()
       myEditCurrentArgument->setText( aName );
       myPoint = aSelectedObject;
       if ( myObjects.isEmpty() )
-       PushButton1->click();
+        PushButton1->click();
     }
     else {
       myPoint.nullify();
index 14f5a49c60a90e3553c2c7b0728e580f2b7fbd63..0c8018ed5febfa697c683cf97d27bd5b34aeb97d 100644 (file)
@@ -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;
index dffd08ebc34fcec713abc29211e47f5c1b6d960c..64e2c1b6ef837fb69427eec45a05f7cb3c2f7f55 100644 (file)
@@ -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;
     }