]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Issue #1834: Fix length of lines
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 9 Nov 2016 13:41:46 +0000 (16:41 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 9 Nov 2016 13:41:59 +0000 (16:41 +0300)
51 files changed:
src/FeaturesAPI/FeaturesAPI_Boolean.cpp
src/FeaturesAPI/FeaturesAPI_Boolean.h
src/FeaturesAPI/FeaturesAPI_Extrusion.cpp
src/FeaturesAPI/FeaturesAPI_Extrusion.h
src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.cpp
src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.h
src/FeaturesAPI/FeaturesAPI_Group.h
src/FeaturesAPI/FeaturesAPI_Intersection.cpp
src/FeaturesAPI/FeaturesAPI_Intersection.h
src/FeaturesAPI/FeaturesAPI_Partition.cpp
src/FeaturesAPI/FeaturesAPI_Partition.h
src/FeaturesAPI/FeaturesAPI_Pipe.cpp
src/FeaturesAPI/FeaturesAPI_Pipe.h
src/FeaturesAPI/FeaturesAPI_Placement.cpp
src/FeaturesAPI/FeaturesAPI_Placement.h
src/FeaturesAPI/FeaturesAPI_Recover.cpp
src/FeaturesAPI/FeaturesAPI_Recover.h
src/FeaturesAPI/FeaturesAPI_RemoveSubShapes.cpp
src/FeaturesAPI/FeaturesAPI_RemoveSubShapes.h
src/FeaturesAPI/FeaturesAPI_Revolution.cpp
src/FeaturesAPI/FeaturesAPI_Revolution.h
src/FeaturesAPI/FeaturesAPI_RevolutionBoolean.cpp
src/FeaturesAPI/FeaturesAPI_RevolutionBoolean.h
src/FeaturesAPI/FeaturesAPI_Rotation.cpp
src/FeaturesAPI/FeaturesAPI_Rotation.h
src/FeaturesAPI/FeaturesAPI_Translation.cpp
src/FeaturesAPI/FeaturesAPI_Translation.h
src/FeaturesAPI/FeaturesAPI_Union.cpp
src/FeaturesAPI/FeaturesAPI_Union.h
src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp
src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp
src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp
src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.h
src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp
src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.h
src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp
src/FeaturesPlugin/FeaturesPlugin_Intersection.h
src/FeaturesPlugin/FeaturesPlugin_Partition.cpp
src/FeaturesPlugin/FeaturesPlugin_Pipe.cpp
src/FeaturesPlugin/FeaturesPlugin_Pipe.h
src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp
src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.h
src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
src/FeaturesPlugin/FeaturesPlugin_Union.cpp
src/FeaturesPlugin/FeaturesPlugin_ValidatorTransform.cpp
src/FeaturesPlugin/FeaturesPlugin_Validators.cpp

index f47eab172fd41fbc0562b6ccca1785bb09c892da..e99beb77cf2bd64009bccfe66b3eebe9fa785268 100644 (file)
@@ -70,7 +70,8 @@ void FeaturesAPI_Boolean::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
 
   FeaturesPlugin_Boolean::OperationType aType =
-      (FeaturesPlugin_Boolean::OperationType)aBase->integer(FeaturesPlugin_Boolean::TYPE_ID())->value();
+      (FeaturesPlugin_Boolean::OperationType)aBase->integer(
+      FeaturesPlugin_Boolean::TYPE_ID())->value();
 
   theDumper << aBase << " = model.add";
 
@@ -83,7 +84,8 @@ void FeaturesAPI_Boolean::dump(ModelHighAPI_Dumper& theDumper) const
   }
 
   const std::string& aDocName = theDumper.name(aBase->document());
-  AttributeSelectionListPtr anObjects = aBase->selectionList(FeaturesPlugin_Boolean::OBJECT_LIST_ID());
+  AttributeSelectionListPtr anObjects = 
+    aBase->selectionList(FeaturesPlugin_Boolean::OBJECT_LIST_ID());
   AttributeSelectionListPtr aTools = aBase->selectionList(FeaturesPlugin_Boolean::TOOL_LIST_ID());
 
   theDumper << "(" << aDocName << ", " << anObjects << ", " << aTools << ")" << std::endl;
index f314158cd851905708017ebc6aa5d03d64f1032a..e8f423528d13e54abac6ab461447efd98dea24ed 100644 (file)
@@ -39,9 +39,12 @@ public:
   virtual ~FeaturesAPI_Boolean();
 
   INTERFACE_3(FeaturesPlugin_Boolean::ID(),
-              boolType, FeaturesPlugin_Boolean::TYPE_ID(), ModelAPI_AttributeInteger, /** Operation type */,
-              mainObjects, FeaturesPlugin_Boolean::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList, /** Main objects */,
-              toolObjects, FeaturesPlugin_Boolean::TOOL_LIST_ID(), ModelAPI_AttributeSelectionList, /** Tool objects*/)
+              boolType, FeaturesPlugin_Boolean::TYPE_ID(),
+              ModelAPI_AttributeInteger, /** Operation type */,
+              mainObjects, FeaturesPlugin_Boolean::OBJECT_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Main objects */,
+              toolObjects, FeaturesPlugin_Boolean::TOOL_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Tool objects*/)
 
   /// Set operation type.
   FEATURESAPI_EXPORT
index 62f0d047021bf1b7581619610c4ac3c952a2651f..341002dd6a3c3f1773f1723ea6bb0e0d01cd2599 100644 (file)
@@ -20,8 +20,8 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Double& theSize)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Double& theSize)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -32,9 +32,9 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Selection& theDirection,
-                                             const ModelHighAPI_Double& theSize)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Selection& theDirection,
+                                          const ModelHighAPI_Double& theSize)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -46,9 +46,9 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Double& theToSize,
-                                             const ModelHighAPI_Double& theFromSize)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Double& theToSize,
+                                          const ModelHighAPI_Double& theFromSize)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -59,10 +59,10 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Selection& theDirection,
-                                             const ModelHighAPI_Double& theToSize,
-                                             const ModelHighAPI_Double& theFromSize)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Selection& theDirection,
+                                          const ModelHighAPI_Double& theToSize,
+                                          const ModelHighAPI_Double& theFromSize)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -74,11 +74,11 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Selection& theToObject,
-                                             const ModelHighAPI_Double& theToOffset,
-                                             const ModelHighAPI_Selection& theFromObject,
-                                             const ModelHighAPI_Double& theFromOffset)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Selection& theToObject,
+                                          const ModelHighAPI_Double& theToOffset,
+                                          const ModelHighAPI_Selection& theFromObject,
+                                          const ModelHighAPI_Double& theFromOffset)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -89,12 +89,12 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Selection& theDirection,
-                                             const ModelHighAPI_Selection& theToObject,
-                                             const ModelHighAPI_Double& theToOffset,
-                                             const ModelHighAPI_Selection& theFromObject,
-                                             const ModelHighAPI_Double& theFromOffset)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects,
+                                          const ModelHighAPI_Selection& theDirection,
+                                          const ModelHighAPI_Selection& theToObject,
+                                          const ModelHighAPI_Double& theToOffset,
+                                          const ModelHighAPI_Selection& theFromObject,
+                                          const ModelHighAPI_Double& theFromOffset)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -190,14 +190,17 @@ void FeaturesAPI_Extrusion::dump(ModelHighAPI_Dumper& theDumper) const
   const std::string& aDocName = theDumper.name(aBase->document());
 
   AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Extrusion::SKETCH_ID());
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Extrusion::BASE_OBJECTS_ID());
-  AttributeSelectionPtr anAttrDirection = aBase->selection(FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Extrusion::BASE_OBJECTS_ID());
+  AttributeSelectionPtr anAttrDirection =
+    aBase->selection(FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID());
 
   theDumper << aBase << " = model.addExtrusion(" << aDocName << ", ";
   anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects;
   theDumper << ", " << anAttrDirection;
 
-  std::string aCreationMethod = aBase->string(FeaturesPlugin_Extrusion::CREATION_METHOD())->value();
+  std::string aCreationMethod =
+    aBase->string(FeaturesPlugin_Extrusion::CREATION_METHOD())->value();
 
   if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES()) {
     AttributeDoublePtr anAttrToSize = aBase->real(FeaturesPlugin_Extrusion::TO_SIZE_ID());
@@ -205,12 +208,15 @@ void FeaturesAPI_Extrusion::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrToSize << ", " << anAttrFromSize;
   } else if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_PLANES()) {
-    AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID());
+    AttributeSelectionPtr anAttrToObject =
+      aBase->selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID());
     AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Extrusion::TO_OFFSET_ID());
-    AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID());
+    AttributeSelectionPtr anAttrFromObject =
+      aBase->selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID());
     AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Extrusion::FROM_OFFSET_ID());
 
-    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset;
+    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset <<
+      ", " << anAttrFromObject << ", " << anAttrFromOffset;
   }
 
   theDumper << ")" << std::endl;
index 9350d981737791046d7e3943c3b9108a8afe538d..9f6261bd5dd644d9b90db8ab2221ce94dc757c0c 100644 (file)
@@ -79,16 +79,26 @@ public:
   virtual ~FeaturesAPI_Extrusion();
 
   INTERFACE_10(FeaturesPlugin_Extrusion::ID(),
-               sketch, FeaturesPlugin_Extrusion::SKETCH_ID(), ModelAPI_AttributeReference, /** Sketch launcher */,
-               baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */,
-               direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(), ModelAPI_AttributeSelection, /** Direction */,
-               creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */,
-               toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(), ModelAPI_AttributeDouble, /** To size */,
-               fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(), ModelAPI_AttributeDouble, /** From size */,
-               toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(), ModelAPI_AttributeSelection, /** To object */,
-               toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(), ModelAPI_AttributeDouble, /** To offset */,
-               fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(), ModelAPI_AttributeSelection, /** From object */,
-               fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(), ModelAPI_AttributeDouble, /** From offset */)
+               sketch, FeaturesPlugin_Extrusion::SKETCH_ID(),
+               ModelAPI_AttributeReference, /** Sketch launcher */,
+               baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Base objects */,
+               direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** Direction */,
+               creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(),
+               ModelAPI_AttributeString, /** Creation method */,
+               toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(),
+               ModelAPI_AttributeDouble, /** To size */,
+               fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(),
+               ModelAPI_AttributeDouble, /** From size */,
+               toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** To object */,
+               toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** To offset */,
+               fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** From object */,
+               fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** From offset */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
@@ -104,13 +114,15 @@ public:
 
   /// Modify CreationMethod, to_size, from_size attributes of the feature.
   FEATURESAPI_EXPORT
-  void setSizes(const ModelHighAPI_Double& theToSize, const ModelHighAPI_Double& theFromSize);
+  void setSizes(const ModelHighAPI_Double& theToSize, 
+                const ModelHighAPI_Double& theFromSize);
 
   /// Modify creation_method, to_size, from_size attributes of the feature.
   FEATURESAPI_EXPORT
   void setSize(const ModelHighAPI_Double& theSize);
 
-  /// Modify creation_method, to_object, to_offset, from_object, from_offset attributes of the feature.
+  /// Modify creation_method, to_object, to_offset,
+  /// from_object, from_offset attributes of the feature.
   FEATURESAPI_EXPORT
   void setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject,
                            const ModelHighAPI_Double& theToOffset,
index 974f076945f4c741e3ada9c5a8087dd99e3b9805..eb73b8ba21aa7288b216156f18d1426f185c96b8 100644 (file)
@@ -12,7 +12,8 @@
 #include <ModelHighAPI_Tools.h>
 
 //==================================================================================================
-FeaturesAPI_ExtrusionBoolean::FeaturesAPI_ExtrusionBoolean(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_ExtrusionBoolean::FeaturesAPI_ExtrusionBoolean(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
 }
@@ -97,7 +98,8 @@ void FeaturesAPI_ExtrusionBoolean::setPlanesAndOffsets(const ModelHighAPI_Select
 }
 
 //==================================================================================================
-void FeaturesAPI_ExtrusionBoolean::setBooleanObjects(const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+void FeaturesAPI_ExtrusionBoolean::setBooleanObjects(
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
   fillAttribute(theBooleanObjects, mybooleanObjects);
 
@@ -111,8 +113,10 @@ void FeaturesAPI_ExtrusionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
   const std::string& aDocName = theDumper.name(aBase->document());
 
   AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Extrusion::SKETCH_ID());
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Extrusion::BASE_OBJECTS_ID());
-  AttributeSelectionPtr anAttrDirection = aBase->selection(FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Extrusion::BASE_OBJECTS_ID());
+  AttributeSelectionPtr anAttrDirection = 
+    aBase->selection(FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID());
 
   theDumper << aBase << " = model.addExtrusion";
   if(aBase->getKind() == FeaturesPlugin_ExtrusionCut::ID()) {
@@ -124,7 +128,8 @@ void FeaturesAPI_ExtrusionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
   anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects;
   theDumper << ", " << anAttrDirection;
 
-  std::string aCreationMethod = aBase->string(FeaturesPlugin_Extrusion::CREATION_METHOD())->value();
+  std::string aCreationMethod =
+    aBase->string(FeaturesPlugin_Extrusion::CREATION_METHOD())->value();
 
   if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES()) {
     AttributeDoublePtr anAttrToSize = aBase->real(FeaturesPlugin_Extrusion::TO_SIZE_ID());
@@ -132,15 +137,19 @@ void FeaturesAPI_ExtrusionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrToSize << ", " << anAttrFromSize;
   } else if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_PLANES()) {
-    AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID());
+    AttributeSelectionPtr anAttrToObject = 
+      aBase->selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID());
     AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Extrusion::TO_OFFSET_ID());
-    AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID());
+    AttributeSelectionPtr anAttrFromObject = 
+      aBase->selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID());
     AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Extrusion::FROM_OFFSET_ID());
 
-    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset;
+    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset <<
+      ", " << anAttrFromObject << ", " << anAttrFromOffset;
   }
 
-  AttributeSelectionListPtr anAttrBoolObjects = aBase->selectionList(FeaturesPlugin_CompositeBoolean::OBJECTS_ID());
+  AttributeSelectionListPtr anAttrBoolObjects = 
+    aBase->selectionList(FeaturesPlugin_CompositeBoolean::OBJECTS_ID());
   theDumper << ", " << anAttrBoolObjects << ")" << std::endl;
 
   if(anAttrSketch->isInitialized()) {
@@ -158,17 +167,19 @@ void FeaturesAPI_ExtrusionBoolean::execIfBaseNotEmpty()
 
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Double& theSize,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -181,11 +192,12 @@ FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Selection& theDirection,
-                                                   const ModelHighAPI_Double& theSize,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -199,11 +211,12 @@ FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Double& theToSize,
-                                                   const ModelHighAPI_Double& theFromSize,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Double& theToSize,
+  const ModelHighAPI_Double& theFromSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -216,12 +229,13 @@ FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Selection& theDirection,
-                                                   const ModelHighAPI_Double& theToSize,
-                                                   const ModelHighAPI_Double& theFromSize,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Double& theToSize,
+  const ModelHighAPI_Double& theFromSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -235,13 +249,14 @@ FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Selection& theToObject,
-                                                   const ModelHighAPI_Double& theToOffset,
-                                                   const ModelHighAPI_Selection& theFromObject,
-                                                   const ModelHighAPI_Double& theFromOffset,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -256,14 +271,15 @@ FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                   const ModelHighAPI_Selection& theDirection,
-                                                   const ModelHighAPI_Selection& theToObject,
-                                                   const ModelHighAPI_Double& theToOffset,
-                                                   const ModelHighAPI_Selection& theFromObject,
-                                                   const ModelHighAPI_Double& theFromOffset,
-                                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -284,8 +300,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theSize,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
-  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, 
+                                                      theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -295,8 +313,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theSize,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
-  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection,
+                                                      theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -306,8 +326,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theFromSize,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
-  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theToSize, theFromSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, 
+                                                      theToSize, theFromSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -318,7 +340,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theFromSize,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
   return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature,
                                                       theBaseObjects,
                                                       theDirection,
@@ -336,7 +359,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theFromOffset,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
   return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature,
                                                       theBaseObjects,
                                                       theToObject,
@@ -356,7 +380,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
                                 const ModelHighAPI_Double& theFromOffset,
                                 const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID());
   return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature,
                                                       theBaseObjects,
                                                       theDirection,
@@ -369,17 +394,19 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr<ModelAPI_Document>& thePar
 
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Double& theSize,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -392,11 +419,12 @@ FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theDirection,
-                                                     const ModelHighAPI_Double& theSize,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -410,11 +438,12 @@ FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Double& theToSize,
-                                                     const ModelHighAPI_Double& theFromSize,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Double& theToSize,
+  const ModelHighAPI_Double& theFromSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -427,12 +456,13 @@ FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theDirection,
-                                                     const ModelHighAPI_Double& theToSize,
-                                                     const ModelHighAPI_Double& theFromSize,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Double& theToSize,
+  const ModelHighAPI_Double& theFromSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -446,13 +476,14 @@ FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theToObject,
-                                                     const ModelHighAPI_Double& theToOffset,
-                                                     const ModelHighAPI_Selection& theFromObject,
-                                                     const ModelHighAPI_Double& theFromOffset,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -467,14 +498,15 @@ FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theDirection,
-                                                     const ModelHighAPI_Selection& theToObject,
-                                                     const ModelHighAPI_Double& theToOffset,
-                                                     const ModelHighAPI_Selection& theFromObject,
-                                                     const ModelHighAPI_Double& theFromOffset,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theDirection,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_ExtrusionBoolean(theFeature)
 {
   if(initialize()) {
@@ -495,8 +527,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theSize,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
-  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, 
+                                                        theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -506,8 +540,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theSize,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
-  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theDirection, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, 
+                                                        theDirection, theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -517,8 +553,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromSize,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
-  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theToSize, theFromSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, 
+                                                        theToSize, theFromSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -529,7 +567,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromSize,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
   return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature,
                                                         theBaseObjects,
                                                         theDirection,
@@ -547,7 +586,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromOffset,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
   return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature,
                                                         theBaseObjects,
                                                         theToObject,
@@ -567,7 +607,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromOffset,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID());
   return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature,
                                                         theBaseObjects,
                                                         theDirection,
index 4894c5fc809258ec63d191f4683eeb1fc85bef10..67d4129df0fc00ee789d1c45a3ca883d91106d62 100644 (file)
@@ -30,17 +30,28 @@ public:
   virtual ~FeaturesAPI_ExtrusionBoolean();
 
   INTERFACE_11("",
-               sketch, FeaturesPlugin_Extrusion::SKETCH_ID(), ModelAPI_AttributeReference, /** Sketch launcher */,
-               baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */,
-               direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(), ModelAPI_AttributeSelection, /** Direction */,
-               creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */,
-               toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(), ModelAPI_AttributeDouble, /** To size */,
-               fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(), ModelAPI_AttributeDouble, /** From size */,
-               toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(), ModelAPI_AttributeSelection, /** To object */,
-               toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(), ModelAPI_AttributeDouble, /** To offset */,
-               fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(), ModelAPI_AttributeSelection, /** From object */,
-               fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(), ModelAPI_AttributeDouble, /** From offset */,
-               booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Boolean objects */)
+               sketch, FeaturesPlugin_Extrusion::SKETCH_ID(),
+               ModelAPI_AttributeReference, /** Sketch launcher */,
+               baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Base objects */,
+               direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** Direction */,
+               creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(),
+               ModelAPI_AttributeString, /** Creation method */,
+               toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(),
+               ModelAPI_AttributeDouble, /** To size */,
+               fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(),
+               ModelAPI_AttributeDouble, /** From size */,
+               toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** To object */,
+               toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** To offset */,
+               fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** From object */,
+               fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** From offset */,
+               booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Boolean objects */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
@@ -62,7 +73,8 @@ public:
   FEATURESAPI_EXPORT
   void setSize(const ModelHighAPI_Double& theSize);
 
-  /// Modify creation_method, to_object, to_offset, from_object, from_offset attributes of the feature.
+  /// Modify creation_method, to_object, to_offset, from_object,
+  /// from_offset attributes of the feature.
   FEATURESAPI_EXPORT
   void setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject,
                            const ModelHighAPI_Double& theToOffset,
index fece502f25f7320428279fd654780e709dcb9cc0..f4d2dd11b341ff200349c6f3742f8158d1b563c6 100644 (file)
@@ -37,7 +37,8 @@ public:
   virtual ~FeaturesAPI_Group();
 
   INTERFACE_1(FeaturesPlugin_Group::ID(),
-              groupList, FeaturesPlugin_Group::LIST_ID(), ModelAPI_AttributeSelectionList, /** Group list*/)
+              groupList, FeaturesPlugin_Group::LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Group list*/)
 
   /// Set main objects.
   FEATURESAPI_EXPORT
index 8cd80eb47e5985b86fdb0f3c1461099d9a8d9d33..803600f7dbab406e6ff6707338e36c456aab30d3 100644 (file)
 #include <ModelHighAPI_Tools.h>
 
 //==================================================================================================
-FeaturesAPI_Intersection::FeaturesAPI_Intersection(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_Intersection::FeaturesAPI_Intersection(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_Intersection::FeaturesAPI_Intersection(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                   const std::list<ModelHighAPI_Selection>& theObjects,
-                                                   const std::list<ModelHighAPI_Selection>& theTools)
+FeaturesAPI_Intersection::FeaturesAPI_Intersection(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theObjects,
+  const std::list<ModelHighAPI_Selection>& theTools)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -58,8 +60,10 @@ void FeaturesAPI_Intersection::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
-  AttributeSelectionListPtr anAttrTools = aBase->selectionList(FeaturesPlugin_Intersection::TOOL_LIST_ID());
+  AttributeSelectionListPtr anAttrObjects = 
+    aBase->selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
+  AttributeSelectionListPtr anAttrTools = 
+    aBase->selectionList(FeaturesPlugin_Intersection::TOOL_LIST_ID());
 
   theDumper << aBase << " = model.addIntersection(" << aDocName << ", "
             << anAttrObjects << ", " << anAttrTools << ")" << std::endl;
index 78a6d51562b2264f8add3e632ba46ee46c8f2227..2d86bc3ac2bed61e73d6ff470c1357fb4a1f0298 100644 (file)
@@ -38,8 +38,10 @@ public:
   virtual ~FeaturesAPI_Intersection();
 
   INTERFACE_2(FeaturesPlugin_Intersection::ID(),
-              objects, FeaturesPlugin_Intersection::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList, /** Objects */,
-              tools, FeaturesPlugin_Intersection::TOOL_LIST_ID(), ModelAPI_AttributeSelectionList, /** Tools */)
+              objects, FeaturesPlugin_Intersection::OBJECT_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Objects */,
+              tools, FeaturesPlugin_Intersection::TOOL_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Tools */)
 
   /// Modify objects attribute of the feature.
   FEATURESAPI_EXPORT
index 3580a0997f0aa06f83a1d53ddf13b52be7a7c1ce..ff4a4c35c721843b494f10b3fd6284940d414153 100644 (file)
@@ -18,7 +18,7 @@ FeaturesAPI_Partition::FeaturesAPI_Partition(const std::shared_ptr<ModelAPI_Feat
 
 //==================================================================================================
 FeaturesAPI_Partition::FeaturesAPI_Partition(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                             const std::list<ModelHighAPI_Selection>& theBaseObjects)
+                                          const std::list<ModelHighAPI_Selection>& theBaseObjects)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -46,9 +46,11 @@ void FeaturesAPI_Partition::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Partition::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Partition::BASE_OBJECTS_ID());
 
-  theDumper << aBase << " = model.addPartition(" << aDocName << ", " << anAttrObjects << ")" << std::endl;
+  theDumper << aBase << " = model.addPartition(" << aDocName <<
+    ", " << anAttrObjects << ")" << std::endl;
 }
 
 //==================================================================================================
index cc7831d8f1b5923c4886c692d25aaec3626ba436..c87fb1ccca27082a7dbee82048115368cf564103 100644 (file)
@@ -37,7 +37,8 @@ public:
   virtual ~FeaturesAPI_Partition();
 
   INTERFACE_1(FeaturesPlugin_Partition::ID(),
-              baseObjects, FeaturesPlugin_Partition::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */)
+              baseObjects, FeaturesPlugin_Partition::BASE_OBJECTS_ID(),
+              ModelAPI_AttributeSelectionList, /** Base objects */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
index 86c042a5210f48c73c540e9f0238dd3593e695f2..97ce2d8a2d4ff2d98a134d3ba35af78dc5c726ce 100644 (file)
@@ -85,9 +85,10 @@ void FeaturesAPI_Pipe::setByBasePath(const std::list<ModelHighAPI_Selection>& th
 }
 
 //==================================================================================================
-void FeaturesAPI_Pipe::setByBasePathBiNormal(const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                             const ModelHighAPI_Selection& thePath,
-                                             const ModelHighAPI_Selection& theBiNoramal)
+void FeaturesAPI_Pipe::setByBasePathBiNormal(
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& thePath,
+  const ModelHighAPI_Selection& theBiNoramal)
 {
   fillAttribute(FeaturesPlugin_Pipe::CREATION_METHOD_BINORMAL(), mycreationMethod);
   fillAttribute(theBaseObjects, mybaseObjects);
@@ -98,9 +99,10 @@ void FeaturesAPI_Pipe::setByBasePathBiNormal(const std::list<ModelHighAPI_Select
 }
 
 //==================================================================================================
-void FeaturesAPI_Pipe::setByBasePathLocations(const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                              const ModelHighAPI_Selection& thePath,
-                                              const std::list<ModelHighAPI_Selection>& theLocations)
+void FeaturesAPI_Pipe::setByBasePathLocations(
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& thePath,
+  const std::list<ModelHighAPI_Selection>& theLocations)
 {
   fillAttribute(FeaturesPlugin_Pipe::CREATION_METHOD_LOCATIONS(), mycreationMethod);
   fillAttribute(theBaseObjects, mybaseObjects);
@@ -116,7 +118,8 @@ void FeaturesAPI_Pipe::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Pipe::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anAttrObjects = 
+    aBase->selectionList(FeaturesPlugin_Pipe::BASE_OBJECTS_ID());
   AttributeSelectionPtr anAttrPath = aBase->selection(FeaturesPlugin_Pipe::PATH_OBJECT_ID());
 
   theDumper << aBase << " = model.addPipe(" << aDocName << ", "
@@ -131,7 +134,8 @@ void FeaturesAPI_Pipe::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrBiNormal;
   } else if(aCreationMethod == FeaturesPlugin_Pipe::CREATION_METHOD_LOCATIONS()) {
-    AttributeSelectionListPtr anAttrLocations = aBase->selectionList(FeaturesPlugin_Pipe::LOCATIONS_ID());
+    AttributeSelectionListPtr anAttrLocations =
+      aBase->selectionList(FeaturesPlugin_Pipe::LOCATIONS_ID());
 
     theDumper << ", " << anAttrLocations;
   }
index e45fd369f585c0acee352217d36884feffc1e5ad..7a90b817216366873973d56e790d1a494a76ec5d 100644 (file)
@@ -52,11 +52,16 @@ public:
   virtual ~FeaturesAPI_Pipe();
 
   INTERFACE_5(FeaturesPlugin_Pipe::ID(),
-              baseObjects, FeaturesPlugin_Pipe::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */,
-              path, FeaturesPlugin_Pipe::PATH_OBJECT_ID(), ModelAPI_AttributeSelection, /** Path */,
-              creationMethod, FeaturesPlugin_Pipe::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */,
-              biNormal, FeaturesPlugin_Pipe::BINORMAL_ID(), ModelAPI_AttributeSelection, /** Bi-Normal */,
-              locations, FeaturesPlugin_Pipe::LOCATIONS_ID(), ModelAPI_AttributeSelectionList, /** Locations */)
+              baseObjects, FeaturesPlugin_Pipe::BASE_OBJECTS_ID(),
+              ModelAPI_AttributeSelectionList, /** Base objects */,
+              path, FeaturesPlugin_Pipe::PATH_OBJECT_ID(),
+              ModelAPI_AttributeSelection, /** Path */,
+              creationMethod, FeaturesPlugin_Pipe::CREATION_METHOD(),
+              ModelAPI_AttributeString, /** Creation method */,
+              biNormal, FeaturesPlugin_Pipe::BINORMAL_ID(),
+              ModelAPI_AttributeSelection, /** Bi-Normal */,
+              locations, FeaturesPlugin_Pipe::LOCATIONS_ID(),
+              ModelAPI_AttributeSelectionList, /** Locations */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
index 5d3aff8b494772236e606a977c33f50076148300..9be8820ccc66cc2c256d7818dd670e0c74ac9e57 100644 (file)
@@ -86,8 +86,10 @@ void FeaturesAPI_Placement::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Placement::OBJECTS_LIST_ID());
-  AttributeSelectionPtr anAttrStartShape = aBase->selection(FeaturesPlugin_Placement::START_SHAPE_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Placement::OBJECTS_LIST_ID());
+  AttributeSelectionPtr anAttrStartShape =
+    aBase->selection(FeaturesPlugin_Placement::START_SHAPE_ID());
   AttributeSelectionPtr anAttrEndShape = aBase->selection(FeaturesPlugin_Placement::END_SHAPE_ID());
   AttributeBooleanPtr anAttrReverse = aBase->boolean(FeaturesPlugin_Placement::REVERSE_ID());
   AttributeBooleanPtr anAttrCentering = aBase->boolean(FeaturesPlugin_Placement::CENTERING_ID());
index 2b157611f2893da24dc7b8dbd6b3e187dab23695..b6068a7b9805ce7c869ff12adc5d0b61a480ca5e 100644 (file)
@@ -41,11 +41,16 @@ public:
   virtual ~FeaturesAPI_Placement();
 
   INTERFACE_5(FeaturesPlugin_Placement::ID(),
-              objects, FeaturesPlugin_Placement::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList, /** Main objects */,
-              startShape, FeaturesPlugin_Placement::START_SHAPE_ID(), ModelAPI_AttributeSelection, /** Start shape */,
-              endShape, FeaturesPlugin_Placement::END_SHAPE_ID(), ModelAPI_AttributeSelection, /** End shape */,
-              reverseDirection, FeaturesPlugin_Placement::REVERSE_ID(), ModelAPI_AttributeBoolean, /** Reverse direction flag */,
-              centering, FeaturesPlugin_Placement::CENTERING_ID(), ModelAPI_AttributeBoolean, /** Centering flag */)
+              objects, FeaturesPlugin_Placement::OBJECTS_LIST_ID(), 
+              ModelAPI_AttributeSelectionList, /** Main objects */,
+              startShape, FeaturesPlugin_Placement::START_SHAPE_ID(),
+              ModelAPI_AttributeSelection, /** Start shape */,
+              endShape, FeaturesPlugin_Placement::END_SHAPE_ID(), 
+              ModelAPI_AttributeSelection, /** End shape */,
+              reverseDirection, FeaturesPlugin_Placement::REVERSE_ID(),
+              ModelAPI_AttributeBoolean, /** Reverse direction flag */,
+              centering, FeaturesPlugin_Placement::CENTERING_ID(),
+              ModelAPI_AttributeBoolean, /** Centering flag */)
 
   /// Set objects.
   FEATURESAPI_EXPORT
index 368f54a4d82170b16530ccabd414f6e00e307500..7f86b7a5723f76df42795735ef3ed513465d94ab 100644 (file)
@@ -62,8 +62,10 @@ void FeaturesAPI_Recover::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeReferencePtr anAttrBaseFeature = aBase->reference(FeaturesPlugin_Recover::BASE_FEATURE());
-  AttributeRefListPtr anAttrRecoveredEntities = aBase->reflist(FeaturesPlugin_Recover::RECOVERED_ENTITIES());
+  AttributeReferencePtr anAttrBaseFeature =
+    aBase->reference(FeaturesPlugin_Recover::BASE_FEATURE());
+  AttributeRefListPtr anAttrRecoveredEntities =
+    aBase->reflist(FeaturesPlugin_Recover::RECOVERED_ENTITIES());
   AttributeBooleanPtr anAttrPersistent = aBase->boolean(FeaturesPlugin_Recover::PERSISTENT());
 
   FeaturePtr aFeature = ModelAPI_Feature::feature(anAttrBaseFeature->value());
index e7f57d4262cae2747e5555218ecae4a95185a382..862e018a27222eb8f46510052f32554c69d59c3d 100644 (file)
@@ -39,9 +39,12 @@ public:
   virtual ~FeaturesAPI_Recover();
 
   INTERFACE_3(FeaturesPlugin_Recover::ID(),
-              baseFeature, FeaturesPlugin_Recover::BASE_FEATURE(), ModelAPI_AttributeReference, /** Concealed feature */,
-              recoveredList, FeaturesPlugin_Recover::RECOVERED_ENTITIES(), ModelAPI_AttributeRefList, /** Recover list*/,
-              isPersistent, FeaturesPlugin_Recover::PERSISTENT(), ModelAPI_AttributeBoolean, /** Is persistent flag */)
+              baseFeature, FeaturesPlugin_Recover::BASE_FEATURE(), 
+              ModelAPI_AttributeReference, /** Concealed feature */,
+              recoveredList, FeaturesPlugin_Recover::RECOVERED_ENTITIES(), 
+              ModelAPI_AttributeRefList, /** Recover list*/,
+              isPersistent, FeaturesPlugin_Recover::PERSISTENT(),
+              ModelAPI_AttributeBoolean, /** Is persistent flag */)
 
   /// Set base feature.
   FEATURESAPI_EXPORT
index b5dd098c9be008baecb2bddc73c25b53e700a9ed..ab5841b5b3f21e1b155434fc50d9ba0432e32f9a 100644 (file)
 #include <ModelHighAPI_Tools.h>
 
 //==================================================================================================
-FeaturesAPI_RemoveSubShapes::FeaturesAPI_RemoveSubShapes(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_RemoveSubShapes::FeaturesAPI_RemoveSubShapes(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_RemoveSubShapes::FeaturesAPI_RemoveSubShapes(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                         const ModelHighAPI_Selection& theBase)
+FeaturesAPI_RemoveSubShapes::FeaturesAPI_RemoveSubShapes(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const ModelHighAPI_Selection& theBase)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -43,7 +45,8 @@ void FeaturesAPI_RemoveSubShapes::setBase(const ModelHighAPI_Selection& theBase)
 }
 
 //==================================================================================================
-void FeaturesAPI_RemoveSubShapes::setSubShapesToKeep(const std::list<ModelHighAPI_Selection>& theSubShapes)
+void FeaturesAPI_RemoveSubShapes::setSubShapesToKeep(
+  const std::list<ModelHighAPI_Selection>& theSubShapes)
 {
   fillAttribute(theSubShapes, mysubshapes);
 
@@ -56,10 +59,13 @@ void FeaturesAPI_RemoveSubShapes::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionPtr anAttrBaseShape = aBase->selection(FeaturesPlugin_RemoveSubShapes::BASE_SHAPE_ID());
-  AttributeSelectionListPtr anAttrSubShapes = aBase->selectionList(FeaturesPlugin_RemoveSubShapes::SUBSHAPES_ID());
+  AttributeSelectionPtr anAttrBaseShape = 
+    aBase->selection(FeaturesPlugin_RemoveSubShapes::BASE_SHAPE_ID());
+  AttributeSelectionListPtr anAttrSubShapes =
+    aBase->selectionList(FeaturesPlugin_RemoveSubShapes::SUBSHAPES_ID());
 
-  theDumper << aBase << " = model.addRemoveSubShapes(" << aDocName << ", " << anAttrBaseShape << ")" << std::endl;
+  theDumper << aBase << " = model.addRemoveSubShapes(" << aDocName <<
+    ", " << anAttrBaseShape << ")" << std::endl;
   theDumper << aBase << ".setSubShapesToKeep(" << anAttrSubShapes << ")" << std::endl;
 }
 
@@ -67,6 +73,7 @@ void FeaturesAPI_RemoveSubShapes::dump(ModelHighAPI_Dumper& theDumper) const
 RemoveSubShapesPtr addRemoveSubShapes(const std::shared_ptr<ModelAPI_Document>& thePart,
                                       const ModelHighAPI_Selection& theBase)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_RemoveSubShapes::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature =
+    thePart->addFeature(FeaturesAPI_RemoveSubShapes::ID());
   return RemoveSubShapesPtr(new FeaturesAPI_RemoveSubShapes(aFeature, theBase));
 }
index b6e4d587e51b388db813042e72a807ddc09282c7..86fe3e437e9568ff2de5d5226bb43ecfb2d46ef7 100644 (file)
@@ -37,8 +37,10 @@ public:
   virtual ~FeaturesAPI_RemoveSubShapes();
 
   INTERFACE_2(FeaturesPlugin_RemoveSubShapes::ID(),
-              base, FeaturesPlugin_RemoveSubShapes::BASE_SHAPE_ID(), ModelAPI_AttributeSelection, /** Base */,
-              subshapes, FeaturesPlugin_RemoveSubShapes::SUBSHAPES_ID(), ModelAPI_AttributeSelectionList, /** Subshapes */)
+              base, FeaturesPlugin_RemoveSubShapes::BASE_SHAPE_ID(), 
+              ModelAPI_AttributeSelection, /** Base */,
+              subshapes, FeaturesPlugin_RemoveSubShapes::SUBSHAPES_ID(), 
+              ModelAPI_AttributeSelectionList, /** Subshapes */)
 
   /// Modify objects attribute of the feature.
   FEATURESAPI_EXPORT
index 173a61594593bac2b2a29b518246a360cb1ee31e..a0dd09ed4a357616bca58809361b9e5489fd7490 100644 (file)
@@ -19,10 +19,11 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Double& theAngle)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theAngle)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -33,11 +34,12 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Double& theToAngle,
-                                               const ModelHighAPI_Double& theFromAngle)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theToAngle,
+  const ModelHighAPI_Double& theFromAngle)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -48,13 +50,14 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Selection& theToObject,
-                                               const ModelHighAPI_Double& theToOffset,
-                                               const ModelHighAPI_Selection& theFromObject,
-                                               const ModelHighAPI_Double& theFromOffset)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -151,14 +154,16 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const
   const std::string& aDocName = theDumper.name(aBase->document());
 
   AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Revolution::SKETCH_ID());
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
   AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID());
 
   theDumper << aBase << " = model.addRevolution(" << aDocName << ", ";
   anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects;
   theDumper << ", " << anAttrAxis;
 
-  std::string aCreationMethod = aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
+  std::string aCreationMethod = 
+    aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
 
   if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_ANGLES()) {
     AttributeDoublePtr anAttrToAngle = aBase->real(FeaturesPlugin_Revolution::TO_ANGLE_ID());
@@ -166,12 +171,15 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrToAngle << ", " << anAttrFromAngle;
   } else if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_PLANES()) {
-    AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
+    AttributeSelectionPtr anAttrToObject =
+      aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
     AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Revolution::TO_OFFSET_ID());
-    AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
+    AttributeSelectionPtr anAttrFromObject =
+      aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
     AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Revolution::FROM_OFFSET_ID());
 
-    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset;
+    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << 
+      ", " << anAttrFromObject << ", " << anAttrFromOffset;
   }
 
   theDumper << ")" << std::endl;
index e011ee403684e601be1f00cc152eccbd668edac9..fad2ce17b9b02b2360acd6ce3b970393b76db514 100644 (file)
@@ -58,16 +58,26 @@ public:
   virtual ~FeaturesAPI_Revolution();
 
   INTERFACE_10(FeaturesPlugin_Revolution::ID(),
-               sketch, FeaturesPlugin_Revolution::SKETCH_ID(), ModelAPI_AttributeReference, /** Sketch launcher */,
-               baseObjects, FeaturesPlugin_Revolution::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */,
-               axis, FeaturesPlugin_Revolution::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection, /** Axis */,
-               creationMethod, FeaturesPlugin_Revolution::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */,
-               toAngle, FeaturesPlugin_Revolution::TO_ANGLE_ID(), ModelAPI_AttributeDouble, /** To angle */,
-               fromAngle, FeaturesPlugin_Revolution::FROM_ANGLE_ID(), ModelAPI_AttributeDouble, /** From angle */,
-               toObject, FeaturesPlugin_Revolution::TO_OBJECT_ID(), ModelAPI_AttributeSelection, /** To object */,
-               toOffset, FeaturesPlugin_Revolution::TO_OFFSET_ID(), ModelAPI_AttributeDouble, /** To offset */,
-               fromObject, FeaturesPlugin_Revolution::FROM_OBJECT_ID(), ModelAPI_AttributeSelection, /** From object */,
-               fromOffset, FeaturesPlugin_Revolution::FROM_OFFSET_ID(), ModelAPI_AttributeDouble, /** From offset */)
+               sketch, FeaturesPlugin_Revolution::SKETCH_ID(), 
+               ModelAPI_AttributeReference, /** Sketch launcher */,
+               baseObjects, FeaturesPlugin_Revolution::BASE_OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Base objects */,
+               axis, FeaturesPlugin_Revolution::AXIS_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** Axis */,
+               creationMethod, FeaturesPlugin_Revolution::CREATION_METHOD(),
+               ModelAPI_AttributeString, /** Creation method */,
+               toAngle, FeaturesPlugin_Revolution::TO_ANGLE_ID(),
+               ModelAPI_AttributeDouble, /** To angle */,
+               fromAngle, FeaturesPlugin_Revolution::FROM_ANGLE_ID(),
+               ModelAPI_AttributeDouble, /** From angle */,
+               toObject, FeaturesPlugin_Revolution::TO_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** To object */,
+               toOffset, FeaturesPlugin_Revolution::TO_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** To offset */,
+               fromObject, FeaturesPlugin_Revolution::FROM_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** From object */,
+               fromOffset, FeaturesPlugin_Revolution::FROM_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** From offset */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
@@ -83,13 +93,15 @@ public:
 
   /// Modify CreationMethod, to_angle, from_angle attributes of the feature.
   FEATURESAPI_EXPORT
-  void setAngles(const ModelHighAPI_Double& theToAngle, const ModelHighAPI_Double& theFromAngle);
+  void setAngles(const ModelHighAPI_Double& theToAngle, 
+                 const ModelHighAPI_Double& theFromAngle);
 
   /// Modify CreationMethod, to_angle, from_angle attributes of the feature.
   FEATURESAPI_EXPORT
   void setAngle(const ModelHighAPI_Double& theAngle);
 
-  /// Modify CreationMethod, to_object, to_offset, from_object, from_offset attributes of the feature.
+  /// Modify CreationMethod, to_object, to_offset, 
+  /// from_object, from_offset attributes of the feature.
   FEATURESAPI_EXPORT
   void setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject,
                            const ModelHighAPI_Double& theToOffset,
index cf897c96065492103f420e92e7b30a65d5be198c..bfdca9b565b692577503294e9651520aa017ab5b 100644 (file)
@@ -12,7 +12,8 @@
 #include <ModelHighAPI_Tools.h>
 
 //==================================================================================================
-FeaturesAPI_RevolutionBoolean::FeaturesAPI_RevolutionBoolean(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_RevolutionBoolean::FeaturesAPI_RevolutionBoolean(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
 }
@@ -84,7 +85,7 @@ void FeaturesAPI_RevolutionBoolean::setAngle(const ModelHighAPI_Double& theAngle
 //==================================================================================================
 void FeaturesAPI_RevolutionBoolean::setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject,
                                                         const ModelHighAPI_Double& theToOffset,
-                                                        const ModelHighAPI_Selection& theFromObject,
+                                                      const ModelHighAPI_Selection& theFromObject,
                                                         const ModelHighAPI_Double& theFromOffset)
 {
   fillAttribute(FeaturesPlugin_Revolution::CREATION_METHOD_BY_PLANES(), mycreationMethod);
@@ -97,7 +98,8 @@ void FeaturesAPI_RevolutionBoolean::setPlanesAndOffsets(const ModelHighAPI_Selec
 }
 
 //==================================================================================================
-void FeaturesAPI_RevolutionBoolean::setBooleanObjects(const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+void FeaturesAPI_RevolutionBoolean::setBooleanObjects(
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
   fillAttribute(theBooleanObjects, mybooleanObjects);
 
@@ -110,9 +112,12 @@ void FeaturesAPI_RevolutionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Revolution::SKETCH_ID());
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
-  AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID());
+  AttributeReferencePtr anAttrSketch =
+    aBase->reference(FeaturesPlugin_Revolution::SKETCH_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
+  AttributeSelectionPtr anAttrAxis =
+    aBase->selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID());
 
   theDumper << aBase << " = model.addRevolution";
   if(aBase->getKind() == FeaturesPlugin_RevolutionCut::ID()) {
@@ -124,7 +129,8 @@ void FeaturesAPI_RevolutionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
   anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects;
   theDumper << ", " << anAttrAxis;
 
-  std::string aCreationMethod = aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
+  std::string aCreationMethod = 
+    aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
 
   if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_ANGLES()) {
     AttributeDoublePtr anAttrToAngle = aBase->real(FeaturesPlugin_Revolution::TO_ANGLE_ID());
@@ -132,15 +138,21 @@ void FeaturesAPI_RevolutionBoolean::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrToAngle << ", " << anAttrFromAngle;
   } else if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_PLANES()) {
-    AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
-    AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Revolution::TO_OFFSET_ID());
-    AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
-    AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Revolution::FROM_OFFSET_ID());
-
-    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset;
+    AttributeSelectionPtr anAttrToObject =
+      aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
+    AttributeDoublePtr anAttrToOffset =
+      aBase->real(FeaturesPlugin_Revolution::TO_OFFSET_ID());
+    AttributeSelectionPtr anAttrFromObject = 
+      aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
+    AttributeDoublePtr anAttrFromOffset = 
+      aBase->real(FeaturesPlugin_Revolution::FROM_OFFSET_ID());
+
+    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << 
+      ", " << anAttrFromObject << ", " << anAttrFromOffset;
   }
 
-  AttributeSelectionListPtr anAttrBoolObjects = aBase->selectionList(FeaturesPlugin_CompositeBoolean::OBJECTS_ID());
+  AttributeSelectionListPtr anAttrBoolObjects =
+    aBase->selectionList(FeaturesPlugin_CompositeBoolean::OBJECTS_ID());
   theDumper << ", " << anAttrBoolObjects << ")" << std::endl;
 
   if(anAttrSketch->isInitialized()) {
@@ -157,18 +169,20 @@ void FeaturesAPI_RevolutionBoolean::execIfBaseNotEmpty()
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theAxis,
-                                                     const ModelHighAPI_Double& theSize,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -182,12 +196,13 @@ FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theAxis,
-                                                     const ModelHighAPI_Double& theToAngle,
-                                                     const ModelHighAPI_Double& theFromAngle,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theToAngle,
+  const ModelHighAPI_Double& theFromAngle,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -201,14 +216,15 @@ FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<Model
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                     const ModelHighAPI_Selection& theAxis,
-                                                     const ModelHighAPI_Selection& theToObject,
-                                                     const ModelHighAPI_Double& theToOffset,
-                                                     const ModelHighAPI_Selection& theFromObject,
-                                                     const ModelHighAPI_Double& theFromOffset,
-                                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionCut::FeaturesAPI_RevolutionCut(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -230,8 +246,10 @@ RevolutionCutPtr addRevolutionCut(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theSize,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
-  return RevolutionCutPtr(new FeaturesAPI_RevolutionCut(aFeature, theBaseObjects, theAxis, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
+  return RevolutionCutPtr(new FeaturesAPI_RevolutionCut(aFeature, theBaseObjects, 
+                                                        theAxis, theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -242,7 +260,8 @@ RevolutionCutPtr addRevolutionCut(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromAngle,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
   return RevolutionCutPtr(new FeaturesAPI_RevolutionCut(aFeature,
                                                       theBaseObjects,
                                                       theAxis,
@@ -261,7 +280,8 @@ RevolutionCutPtr addRevolutionCut(const std::shared_ptr<ModelAPI_Document>& theP
                                   const ModelHighAPI_Double& theFromOffset,
                                   const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionCut::ID());
   return RevolutionCutPtr(new FeaturesAPI_RevolutionCut(aFeature,
                                                       theBaseObjects,
                                                       theAxis,
@@ -274,18 +294,20 @@ RevolutionCutPtr addRevolutionCut(const std::shared_ptr<ModelAPI_Document>& theP
 
 
 //==================================================================================================
-FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                       const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                       const ModelHighAPI_Selection& theAxis,
-                                                       const ModelHighAPI_Double& theSize,
-                                                       const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theSize,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -299,12 +321,13 @@ FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<Mod
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                       const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                       const ModelHighAPI_Selection& theAxis,
-                                                       const ModelHighAPI_Double& theToAngle,
-                                                       const ModelHighAPI_Double& theFromAngle,
-                                                       const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theToAngle,
+  const ModelHighAPI_Double& theFromAngle,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -318,14 +341,15 @@ FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<Mod
 }
 
 //==================================================================================================
-FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                       const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                                       const ModelHighAPI_Selection& theAxis,
-                                                       const ModelHighAPI_Selection& theToObject,
-                                                       const ModelHighAPI_Double& theToOffset,
-                                                       const ModelHighAPI_Selection& theFromObject,
-                                                       const ModelHighAPI_Double& theFromOffset,
-                                                       const std::list<ModelHighAPI_Selection>& theBooleanObjects)
+FeaturesAPI_RevolutionFuse::FeaturesAPI_RevolutionFuse(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset,
+  const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 : FeaturesAPI_RevolutionBoolean(theFeature)
 {
   if(initialize()) {
@@ -347,8 +371,10 @@ RevolutionFusePtr addRevolutionFuse(const std::shared_ptr<ModelAPI_Document>& th
                                     const ModelHighAPI_Double& theSize,
                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
-  return RevolutionFusePtr(new FeaturesAPI_RevolutionFuse(aFeature, theBaseObjects, theAxis, theSize, theBooleanObjects));
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
+  return RevolutionFusePtr(new FeaturesAPI_RevolutionFuse(aFeature, theBaseObjects, 
+                                                          theAxis, theSize, theBooleanObjects));
 }
 
 //==================================================================================================
@@ -359,7 +385,8 @@ RevolutionFusePtr addRevolutionFuse(const std::shared_ptr<ModelAPI_Document>& th
                                     const ModelHighAPI_Double& theFromAngle,
                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
   return RevolutionFusePtr(new FeaturesAPI_RevolutionFuse(aFeature,
                                                         theBaseObjects,
                                                         theAxis,
@@ -378,7 +405,8 @@ RevolutionFusePtr addRevolutionFuse(const std::shared_ptr<ModelAPI_Document>& th
                                     const ModelHighAPI_Double& theFromOffset,
                                     const std::list<ModelHighAPI_Selection>& theBooleanObjects)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
+  std::shared_ptr<ModelAPI_Feature> aFeature = 
+    thePart->addFeature(FeaturesPlugin_RevolutionFuse::ID());
   return RevolutionFusePtr(new FeaturesAPI_RevolutionFuse(aFeature,
                                                         theBaseObjects,
                                                         theAxis,
index f4986ffd3bb594b2dd4d5e66684dffd30dc944ea..10daa0d3d0c4792b6cc5699795d38fd904b02dac 100644 (file)
@@ -32,17 +32,28 @@ public:
   virtual ~FeaturesAPI_RevolutionBoolean();
 
   INTERFACE_11("",
-               sketch, FeaturesPlugin_Revolution::SKETCH_ID(), ModelAPI_AttributeReference, /** Sketch launcher */,
-               baseObjects, FeaturesPlugin_Revolution::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */,
-               axis, FeaturesPlugin_Revolution::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection, /** Axis */,
-               creationMethod, FeaturesPlugin_Revolution::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */,
-               toAngle, FeaturesPlugin_Revolution::TO_ANGLE_ID(), ModelAPI_AttributeDouble, /** To angle */,
-               fromAngle, FeaturesPlugin_Revolution::FROM_ANGLE_ID(), ModelAPI_AttributeDouble, /** From angle */,
-               toObject, FeaturesPlugin_Revolution::TO_OBJECT_ID(), ModelAPI_AttributeSelection, /** To object */,
-               toOffset, FeaturesPlugin_Revolution::TO_OFFSET_ID(), ModelAPI_AttributeDouble, /** To offset */,
-               fromObject, FeaturesPlugin_Revolution::FROM_OBJECT_ID(), ModelAPI_AttributeSelection, /** From object */,
-               fromOffset, FeaturesPlugin_Revolution::FROM_OFFSET_ID(), ModelAPI_AttributeDouble, /** From offset */,
-               booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Boolean objects */)
+               sketch, FeaturesPlugin_Revolution::SKETCH_ID(),
+               ModelAPI_AttributeReference, /** Sketch launcher */,
+               baseObjects, FeaturesPlugin_Revolution::BASE_OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Base objects */,
+               axis, FeaturesPlugin_Revolution::AXIS_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** Axis */,
+               creationMethod, FeaturesPlugin_Revolution::CREATION_METHOD(),
+               ModelAPI_AttributeString, /** Creation method */,
+               toAngle, FeaturesPlugin_Revolution::TO_ANGLE_ID(),
+               ModelAPI_AttributeDouble, /** To angle */,
+               fromAngle, FeaturesPlugin_Revolution::FROM_ANGLE_ID(),
+               ModelAPI_AttributeDouble, /** From angle */,
+               toObject, FeaturesPlugin_Revolution::TO_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** To object */,
+               toOffset, FeaturesPlugin_Revolution::TO_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** To offset */,
+               fromObject, FeaturesPlugin_Revolution::FROM_OBJECT_ID(),
+               ModelAPI_AttributeSelection, /** From object */,
+               fromOffset, FeaturesPlugin_Revolution::FROM_OFFSET_ID(),
+               ModelAPI_AttributeDouble, /** From offset */,
+               booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(),
+               ModelAPI_AttributeSelectionList, /** Boolean objects */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
@@ -64,7 +75,8 @@ public:
   FEATURESAPI_EXPORT
   void setAngle(const ModelHighAPI_Double& theAngle);
 
-  /// Modify creation_method, to_object, to_offset, from_object, from_offset attributes of the feature.
+  /// Modify creation_method, to_object, to_offset, from_object, 
+  /// from_offset attributes of the feature.
   FEATURESAPI_EXPORT
   void setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject,
                            const ModelHighAPI_Double& theToOffset,
index d24aa08900bdbda186b0807af194860cc38ac604..366a751b4da62eae4bee3729be6729c1140d77a2 100644 (file)
@@ -66,7 +66,8 @@ void FeaturesAPI_Rotation::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
   AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
   AttributeDoublePtr anAttrAngle = aBase->real(FeaturesPlugin_Rotation::ANGLE_ID());
 
index 03fd636ad780685298603699e60404eeae564405..243af921b2b4ee6b7139c18a20d6b5f6ff0f1f1d 100644 (file)
@@ -40,9 +40,12 @@ public:
   virtual ~FeaturesAPI_Rotation();
 
   INTERFACE_3(FeaturesPlugin_Rotation::ID(),
-              mainObjects, FeaturesPlugin_Rotation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList, /** Main objects */,
-              axisObject, FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection, /** Axis object */,
-              angle, FeaturesPlugin_Rotation::ANGLE_ID(), ModelAPI_AttributeDouble, /** Angle */)
+              mainObjects, FeaturesPlugin_Rotation::OBJECTS_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Main objects */,
+              axisObject, FeaturesPlugin_Rotation::AXIS_OBJECT_ID(),
+              ModelAPI_AttributeSelection, /** Axis object */,
+              angle, FeaturesPlugin_Rotation::ANGLE_ID(),
+              ModelAPI_AttributeDouble, /** Angle */)
 
   /// Set main objects.
   FEATURESAPI_EXPORT
index e70df5b8c24c0846ea519b6702a85201ba415e2e..07717134d49e5a262f9890d56db0f03e5aeed951 100644 (file)
 #include <ModelHighAPI_Tools.h>
 
 //==================================================================================================
-FeaturesAPI_Translation::FeaturesAPI_Translation(const std::shared_ptr<ModelAPI_Feature>& theFeature)
+FeaturesAPI_Translation::FeaturesAPI_Translation(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
   initialize();
 }
 
 //==================================================================================================
-FeaturesAPI_Translation::FeaturesAPI_Translation(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                 const std::list<ModelHighAPI_Selection>& theMainObjects,
-                                                 const ModelHighAPI_Selection& theAxisObject,
-                                                 const ModelHighAPI_Double& theDistance)
+FeaturesAPI_Translation::FeaturesAPI_Translation(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theMainObjects,
+  const ModelHighAPI_Selection& theAxisObject,
+  const ModelHighAPI_Double& theDistance)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -37,7 +39,8 @@ FeaturesAPI_Translation::~FeaturesAPI_Translation()
 }
 
 //==================================================================================================
-void FeaturesAPI_Translation::setMainObjects(const std::list<ModelHighAPI_Selection>& theMainObjects)
+void FeaturesAPI_Translation::setMainObjects(
+  const std::list<ModelHighAPI_Selection>& theMainObjects)
 {
   fillAttribute(theMainObjects, mymainObjects);
 
@@ -66,8 +69,10 @@ void FeaturesAPI_Translation::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Translation::OBJECTS_LIST_ID());
-  AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Translation::AXIS_OBJECT_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Translation::OBJECTS_LIST_ID());
+  AttributeSelectionPtr anAttrAxis =
+    aBase->selection(FeaturesPlugin_Translation::AXIS_OBJECT_ID());
   AttributeDoublePtr anAttrDistance = aBase->real(FeaturesPlugin_Translation::DISTANCE_ID());
 
   theDumper << aBase << " = model.addTranslation(" << aDocName << ", "
@@ -81,5 +86,6 @@ TranslationPtr addTranslation(const std::shared_ptr<ModelAPI_Document>& thePart,
                               const ModelHighAPI_Double& theDistance)
 {
   std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Translation::ID());
-  return TranslationPtr(new FeaturesAPI_Translation(aFeature, theMainObjects, theAxisObject, theDistance));
+  return TranslationPtr(new FeaturesAPI_Translation(aFeature, theMainObjects, 
+                                                    theAxisObject, theDistance));
 }
index 995b880a83af0b79aeb8d1bf3b921817c0c8cc29..8d44d857810f0276b48217195efc08a2084d8b05 100644 (file)
@@ -40,9 +40,12 @@ public:
   virtual ~FeaturesAPI_Translation();
 
   INTERFACE_3(FeaturesPlugin_Translation::ID(),
-              mainObjects, FeaturesPlugin_Translation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList, /** Main objects */,
-              axisObject, FeaturesPlugin_Translation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection, /** Axis object */,
-              distance, FeaturesPlugin_Translation::DISTANCE_ID(), ModelAPI_AttributeDouble, /** Distance */)
+              mainObjects, FeaturesPlugin_Translation::OBJECTS_LIST_ID(),
+              ModelAPI_AttributeSelectionList, /** Main objects */,
+              axisObject, FeaturesPlugin_Translation::AXIS_OBJECT_ID(),
+              ModelAPI_AttributeSelection, /** Axis object */,
+              distance, FeaturesPlugin_Translation::DISTANCE_ID(),
+              ModelAPI_AttributeDouble, /** Distance */)
 
   /// Set main objects.
   FEATURESAPI_EXPORT
index a3580a3034db5dd17a042d64809f1f468a1e289b..ca8f0d6fc9c60e07e3f1bbeaf33e981b9b966aaf 100644 (file)
@@ -9,14 +9,14 @@
 #include <ModelHighAPI_Dumper.h>
 #include <ModelHighAPI_Tools.h>
 
-//==================================================================================================
+//================================================================================================
 FeaturesAPI_Union::FeaturesAPI_Union(const std::shared_ptr<ModelAPI_Feature>& theFeature)
 : ModelHighAPI_Interface(theFeature)
 {
   initialize();
 }
 
-//==================================================================================================
+//================================================================================================
 FeaturesAPI_Union::FeaturesAPI_Union(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                      const std::list<ModelHighAPI_Selection>& theBaseObjects)
 : ModelHighAPI_Interface(theFeature)
@@ -26,7 +26,7 @@ FeaturesAPI_Union::FeaturesAPI_Union(const std::shared_ptr<ModelAPI_Feature>& th
   }
 }
 
-//==================================================================================================
+//================================================================================================
 FeaturesAPI_Union::~FeaturesAPI_Union()
 {
 
@@ -46,9 +46,11 @@ void FeaturesAPI_Union::dump(ModelHighAPI_Dumper& theDumper) const
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
 
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
 
-  theDumper << aBase << " = model.addUnion(" << aDocName << ", " << anAttrObjects << ")" << std::endl;
+  theDumper << aBase << " = model.addUnion(" << aDocName << 
+    ", " << anAttrObjects << ")" << std::endl;
 }
 
 //==================================================================================================
index e07a9b168400d6ed7c022f78388388034050a25b..2e60a523bb7cd00c9bc78dbb2ec52597e803c9f5 100644 (file)
@@ -37,7 +37,8 @@ public:
   virtual ~FeaturesAPI_Union();
 
   INTERFACE_1(FeaturesPlugin_Union::ID(),
-              baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */)
+              baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(),
+              ModelAPI_AttributeSelectionList, /** Base objects */)
 
   /// Modify base attribute of the feature.
   FEATURESAPI_EXPORT
index c2c9cdd1fa2b5d1e1c1a90555d9ec04478b94187..dedb288a06731a8412dcac002a16914700ee050f 100644 (file)
@@ -76,7 +76,8 @@ void FeaturesPlugin_Boolean::execute()
   std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape> aCompSolidsObjects;
 
   // Getting objects.
-  AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Boolean::OBJECT_LIST_ID());
+  AttributeSelectionListPtr anObjectsSelList = 
+    selectionList(FeaturesPlugin_Boolean::OBJECT_LIST_ID());
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
     AttributeSelectionPtr anObjectAttr = anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
@@ -87,7 +88,8 @@ void FeaturesPlugin_Boolean::execute()
     ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aContext);
     if(aResCompSolidPtr.get()) {
       std::shared_ptr<GeomAPI_Shape> aContextShape = aResCompSolidPtr->shape();
-      std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+      std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+        anIt = aCompSolidsObjects.begin();
       for(; anIt != aCompSolidsObjects.end(); anIt++) {
         if(anIt->first->isEqual(aContextShape)) {
           aCompSolidsObjects[anIt->first].push_back(anObject);
@@ -136,7 +138,8 @@ void FeaturesPlugin_Boolean::execute()
       }
 
       // For solids cut each object with all tools.
-      for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) {
+      for(ListOfShape::iterator 
+          anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) {
         std::shared_ptr<GeomAPI_Shape> anObject = *anObjectsIt;
         ListOfShape aListWithObject;
         aListWithObject.push_back(anObject);
@@ -145,12 +148,14 @@ void FeaturesPlugin_Boolean::execute()
 
         switch(aType) {
           case BOOL_CUT: {
-            aBoolAlgo = GeomAlgoAPI_Boolean(aListWithObject, aTools, GeomAlgoAPI_Boolean::BOOL_CUT);
+            aBoolAlgo = 
+              GeomAlgoAPI_Boolean(aListWithObject, aTools, GeomAlgoAPI_Boolean::BOOL_CUT);
             aResShape = aBoolAlgo.shape();
             break;
           }
           case BOOL_COMMON: {
-            aBoolAlgo = GeomAlgoAPI_Boolean(aListWithObject, aTools, GeomAlgoAPI_Boolean::BOOL_COMMON);
+            aBoolAlgo = 
+              GeomAlgoAPI_Boolean(aListWithObject, aTools, GeomAlgoAPI_Boolean::BOOL_COMMON);
             aResShape = aBoolAlgo.shape();
             break;
           }
@@ -192,22 +197,26 @@ void FeaturesPlugin_Boolean::execute()
         }
 
         if(GeomAlgoAPI_ShapeTools::volume(aResShape) > 1.e-27) {
-          std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-          loadNamingDS(aResultBody, anObject, aTools, aResShape, aBoolAlgo, *aBoolAlgo.mapOfSubShapes().get());
+          std::shared_ptr<ModelAPI_ResultBody> aResultBody =
+            document()->createBody(data(), aResultIndex);
+          loadNamingDS(aResultBody, anObject, aTools, aResShape, 
+                       aBoolAlgo, *aBoolAlgo.mapOfSubShapes().get());
           setResult(aResultBody, aResultIndex);
           aResultIndex++;
         }
       }
 
       // Compsolids handling
-      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
-        anIt != aCompSolidsObjects.end(); anIt++) {
+      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+          anIt = aCompSolidsObjects.begin();
+          anIt != aCompSolidsObjects.end(); anIt++) {
         std::shared_ptr<GeomAPI_Shape> aCompSolid = anIt->first;
         ListOfShape& aUsedInOperationSolids = anIt->second;
 
         // Collecting solids from compsolids which will not be modified in boolean operation.
         ListOfShape aNotUsedSolids;
-        for(GeomAPI_ShapeExplorer anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+        for(GeomAPI_ShapeExplorer 
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
           std::shared_ptr<GeomAPI_Shape> aSolidInCompSolid = anExp.current();
           ListOfShape::iterator anIt = aUsedInOperationSolids.begin();
           for(; anIt != aUsedInOperationSolids.end(); anIt++) {
@@ -266,7 +275,8 @@ void FeaturesPlugin_Boolean::execute()
         // Add result to not used solids from compsolid.
         ListOfShape aShapesToAdd = aNotUsedSolids;
         aShapesToAdd.push_back(aBoolAlgo->shape());
-        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
         if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "Error: PaveFiller algorithm failed.";
           setError(aFeatureError);
@@ -277,8 +287,10 @@ void FeaturesPlugin_Boolean::execute()
         aMapOfShapes.merge(aFillerAlgo->mapOfSubShapes());
 
         if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo->shape()) > 1.e-27) {
-          std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-          loadNamingDS(aResultBody, aCompSolid, aTools, aFillerAlgo->shape(), aMakeShapeList, aMapOfShapes);
+          std::shared_ptr<ModelAPI_ResultBody> aResultBody = 
+            document()->createBody(data(), aResultIndex);
+          loadNamingDS(aResultBody, aCompSolid, aTools, 
+                       aFillerAlgo->shape(), aMakeShapeList, aMapOfShapes);
           setResult(aResultBody, aResultIndex);
           aResultIndex++;
         }
@@ -286,7 +298,8 @@ void FeaturesPlugin_Boolean::execute()
       break;
     }
     case BOOL_FUSE: {
-      if((anObjects.size() + aTools.size() + aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) {
+      if((anObjects.size() + aTools.size() + 
+          aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) {
         std::string aFeatureError = "Error: Not enough objects for boolean operation.";
         setError(aFeatureError);
         return;
@@ -297,16 +310,20 @@ void FeaturesPlugin_Boolean::execute()
       aSolidsToFuse.insert(aSolidsToFuse.end(), anObjects.begin(), anObjects.end());
       aSolidsToFuse.insert(aSolidsToFuse.end(), aTools.begin(), aTools.end());
 
-      // Collecting solids from compsolids which will not be modified in boolean operation and will be added to result.
+      // Collecting solids from compsolids which will not be modified 
+      // in boolean operation and will be added to result.
       ListOfShape aShapesToAdd;
-      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
-        anIt != aCompSolidsObjects.end(); anIt++) {
+      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+          anIt = aCompSolidsObjects.begin();
+          anIt != aCompSolidsObjects.end(); anIt++) {
         std::shared_ptr<GeomAPI_Shape> aCompSolid = anIt->first;
         ListOfShape& aUsedInOperationSolids = anIt->second;
-        aSolidsToFuse.insert(aSolidsToFuse.end(), aUsedInOperationSolids.begin(), aUsedInOperationSolids.end());
+        aSolidsToFuse.insert(aSolidsToFuse.end(), aUsedInOperationSolids.begin(), 
+                             aUsedInOperationSolids.end());
 
         // Collect solids from compsolid which will not be modified in boolean operation.
-        for(GeomAPI_ShapeExplorer anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+        for(GeomAPI_ShapeExplorer 
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
           std::shared_ptr<GeomAPI_Shape> aSolidInCompSolid = anExp.current();
           ListOfShape::iterator anIt = aUsedInOperationSolids.begin();
           for(; anIt != aUsedInOperationSolids.end(); anIt++) {
@@ -328,22 +345,26 @@ void FeaturesPlugin_Boolean::execute()
       GeomAPI_DataMapOfShapeShape aMapOfShapes;
       std::shared_ptr<GeomAPI_Shape> aCuttedEdgesAndFaces;
       if(!anEdgesAndFaces.empty()) {
-        std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(anEdgesAndFaces, anOriginalShapes, GeomAlgoAPI_Boolean::BOOL_CUT));
+        std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(anEdgesAndFaces,
+                                            anOriginalShapes, GeomAlgoAPI_Boolean::BOOL_CUT));
         if(aCutAlgo->isDone()) {
           aCuttedEdgesAndFaces = aCutAlgo->shape();
           aMakeShapeList.appendAlgo(aCutAlgo);
           aMapOfShapes.merge(aCutAlgo->mapOfSubShapes());
         }
       }
-      anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(), anEdgesAndFaces.end());
+      anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(), 
+                              anEdgesAndFaces.end());
 
       // If we have compsolids then cut with not used solids all others.
       if(!aShapesToAdd.empty()) {
         aSolidsToFuse.clear();
-        for(ListOfShape::iterator anIt = anOriginalShapes.begin(); anIt != anOriginalShapes.end(); anIt++) {
+        for(ListOfShape::iterator 
+            anIt = anOriginalShapes.begin(); anIt != anOriginalShapes.end(); anIt++) {
           ListOfShape aOneObjectList;
           aOneObjectList.push_back(*anIt);
-          std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(aOneObjectList, aShapesToAdd, GeomAlgoAPI_Boolean::BOOL_CUT));
+          std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(
+            new GeomAlgoAPI_Boolean(aOneObjectList, aShapesToAdd, GeomAlgoAPI_Boolean::BOOL_CUT));
 
           if(GeomAlgoAPI_ShapeTools::volume(aCutAlgo->shape()) > 1.e-27) {
             aSolidsToFuse.push_back(aCutAlgo->shape());
@@ -368,8 +389,8 @@ void FeaturesPlugin_Boolean::execute()
         aShape = aTools.front();
       } else if((anObjects.size() + aTools.size()) > 1){
         std::shared_ptr<GeomAlgoAPI_Boolean> aFuseAlgo(new GeomAlgoAPI_Boolean(anObjects,
-                                                                               aTools,
-                                                                               GeomAlgoAPI_Boolean::BOOL_FUSE));
+                                                                aTools,
+                                                                GeomAlgoAPI_Boolean::BOOL_FUSE));
 
         // Checking that the algorithm worked properly.
         if(!aFuseAlgo->isDone()) {
@@ -403,7 +424,8 @@ void FeaturesPlugin_Boolean::execute()
         if(aShape.get()) {
           aShapesToAdd.push_back(aShape);
         }
-        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
         if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "Error: PaveFiller algorithm failed.";
           setError(aFeatureError);
@@ -427,8 +449,10 @@ void FeaturesPlugin_Boolean::execute()
 
       std::shared_ptr<GeomAPI_Shape> aBackShape = anOriginalShapes.back();
       anOriginalShapes.pop_back();
-      std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-      loadNamingDS(aResultBody, aBackShape, anOriginalShapes, aShape, aMakeShapeList, aMapOfShapes);
+      std::shared_ptr<ModelAPI_ResultBody> aResultBody = 
+        document()->createBody(data(), aResultIndex);
+      loadNamingDS(aResultBody, aBackShape, anOriginalShapes, 
+                   aShape, aMakeShapeList, aMapOfShapes);
       setResult(aResultBody, aResultIndex);
       aResultIndex++;
       break;
@@ -449,17 +473,21 @@ void FeaturesPlugin_Boolean::execute()
       ListOfShape aShapesToSmash;
       aShapesToSmash.insert(aShapesToSmash.end(), anObjects.begin(), anObjects.end());
 
-      // Collecting solids from compsolids which will not be modified in boolean operation and will be added to result.
+      // Collecting solids from compsolids which will not be modified in
+      // boolean operation and will be added to result.
       ListOfShape aShapesToAdd;
-      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+      for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+        anIt = aCompSolidsObjects.begin();
         anIt != aCompSolidsObjects.end(); anIt++) {
         std::shared_ptr<GeomAPI_Shape> aCompSolid = anIt->first;
         ListOfShape& aUsedInOperationSolids = anIt->second;
         anOriginalShapes.push_back(aCompSolid);
-        aShapesToSmash.insert(aShapesToSmash.end(), aUsedInOperationSolids.begin(), aUsedInOperationSolids.end());
+        aShapesToSmash.insert(aShapesToSmash.end(), aUsedInOperationSolids.begin(), 
+                              aUsedInOperationSolids.end());
 
         // Collect solids from compsolid which will not be modified in boolean operation.
-        for(GeomAPI_ShapeExplorer anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+        for(GeomAPI_ShapeExplorer 
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
           std::shared_ptr<GeomAPI_Shape> aSolidInCompSolid = anExp.current();
           ListOfShape::iterator anIt = aUsedInOperationSolids.begin();
           for(; anIt != aUsedInOperationSolids.end(); anIt++) {
@@ -477,9 +505,10 @@ void FeaturesPlugin_Boolean::execute()
       GeomAPI_DataMapOfShapeShape aMapOfShapes;
       if(!aShapesToAdd.empty()) {
         // Cut objects with not used solids.
-        std::shared_ptr<GeomAlgoAPI_Boolean> anObjectsCutAlgo(new GeomAlgoAPI_Boolean(aShapesToSmash,
-                                                                                      aShapesToAdd,
-                                                                                      GeomAlgoAPI_Boolean::BOOL_CUT));
+        std::shared_ptr<GeomAlgoAPI_Boolean> anObjectsCutAlgo(new GeomAlgoAPI_Boolean(
+                                                              aShapesToSmash,
+                                                              aShapesToAdd,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
 
         if(GeomAlgoAPI_ShapeTools::volume(anObjectsCutAlgo->shape()) > 1.e-27) {
           aShapesToSmash.clear();
@@ -490,8 +519,8 @@ void FeaturesPlugin_Boolean::execute()
 
         // Cut tools with not used solids.
         std::shared_ptr<GeomAlgoAPI_Boolean> aToolsCutAlgo(new GeomAlgoAPI_Boolean(aTools,
-                                                                                   aShapesToAdd,
-                                                                                   GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                              aShapesToAdd,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
 
         if(GeomAlgoAPI_ShapeTools::volume(aToolsCutAlgo->shape()) > 1.e-27) {
           aTools.clear();
@@ -503,8 +532,8 @@ void FeaturesPlugin_Boolean::execute()
 
       // Cut objects with tools.
       std::shared_ptr<GeomAlgoAPI_Boolean> aBoolAlgo(new GeomAlgoAPI_Boolean(aShapesToSmash,
-                                                                             aTools,
-                                                                             GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                                aTools,
+                                                                GeomAlgoAPI_Boolean::BOOL_CUT));
 
       // Checking that the algorithm worked properly.
       if(!aBoolAlgo->isDone()) {
@@ -529,7 +558,8 @@ void FeaturesPlugin_Boolean::execute()
       aShapesToAdd.push_back(aBoolAlgo->shape());
       aShapesToAdd.insert(aShapesToAdd.end(), aTools.begin(), aTools.end());
 
-      std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+      std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd,
+                                                                                     true));
       if(!aFillerAlgo->isDone()) {
         std::string aFeatureError = "Error: PaveFiller algorithm failed.";
         setError(aFeatureError);
@@ -552,8 +582,10 @@ void FeaturesPlugin_Boolean::execute()
 
       std::shared_ptr<GeomAPI_Shape> aFrontShape = anOriginalShapes.front();
       anOriginalShapes.pop_front();
-      std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-      loadNamingDS(aResultBody, aFrontShape, anOriginalShapes, aShape, aMakeShapeList, aMapOfShapes);
+      std::shared_ptr<ModelAPI_ResultBody> aResultBody = 
+        document()->createBody(data(), aResultIndex);
+      loadNamingDS(aResultBody, aFrontShape, anOriginalShapes, 
+        aShape, aMakeShapeList, aMapOfShapes);
       setResult(aResultBody, aResultIndex);
       aResultIndex++;
 
@@ -583,7 +615,8 @@ void FeaturesPlugin_Boolean::loadNamingDS(std::shared_ptr<ModelAPI_ResultBody> t
   } else {
     const int aModifyTag = 1;
     const int aDeletedTag = 2;
-    const int aSubsolidsTag = 3; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+    /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+    const int aSubsolidsTag = 3; 
     const int anEdgesAndFacesTag = 10000;
 
     theResultBody->storeModified(theBaseShape, theResultShape, aSubsolidsTag);
@@ -594,11 +627,13 @@ void FeaturesPlugin_Boolean::loadNamingDS(std::shared_ptr<ModelAPI_ResultBody> t
 
     theResultBody->loadAndOrientModifiedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::FACE,
                                                aModifyTag, aModName, theMapOfShapes);
-    theResultBody->loadDeletedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::FACE, aDeletedTag);
+    theResultBody->loadDeletedShapes(&theMakeShape, theBaseShape, 
+                                     GeomAPI_Shape::FACE, aDeletedTag);
 
     int aTag;
     std::string aName;
-    for(ListOfShape::const_iterator anIter = theTools.begin(); anIter != theTools.end(); anIter++) {
+    for(ListOfShape::const_iterator 
+        anIter = theTools.begin(); anIter != theTools.end(); anIter++) {
       if((*anIter)->shapeType() == GeomAPI_Shape::EDGE) {
         aTag = anEdgesAndFacesTag;
         aName = aModEName;
@@ -610,8 +645,9 @@ void FeaturesPlugin_Boolean::loadNamingDS(std::shared_ptr<ModelAPI_ResultBody> t
         aTag = aModifyTag;
         aName = aModName;
       }
-      theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, aName == aModEName ? GeomAPI_Shape::EDGE : GeomAPI_Shape::FACE,
-                                                 aTag, aName, theMapOfShapes);
+      theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, 
+        aName == aModEName ? GeomAPI_Shape::EDGE : GeomAPI_Shape::FACE,
+        aTag, aName, theMapOfShapes);
       theResultBody->loadDeletedShapes(&theMakeShape, *anIter, GeomAPI_Shape::FACE, aDeletedTag);
     }
   }
index 507cd2da4f7479b556e98867c088088828bd098d..44ea7eddd4ea242e1cf79415ef004aa856416585 100644 (file)
@@ -36,7 +36,8 @@ void FeaturesPlugin_CompositeBoolean::executeCompositeBoolean()
 
   // Getting tools.
   ListOfShape aTools;
-  for(ListOfMakeShape::const_iterator anIt = aGenMakeShapes.cbegin(); anIt != aGenMakeShapes.cend(); ++anIt) {
+  for(ListOfMakeShape::const_iterator 
+      anIt = aGenMakeShapes.cbegin(); anIt != aGenMakeShapes.cend(); ++anIt) {
     aTools.push_back((*anIt)->shape());
   }
 
@@ -132,13 +133,14 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
       }
 
       // For solids cut each object with all tools.
-      for(ListOfShape::const_iterator anIt = anObjects.cbegin(); anIt != anObjects.cend(); ++anIt) {
+      for(ListOfShape::const_iterator 
+          anIt = anObjects.cbegin(); anIt != anObjects.cend(); ++anIt) {
         GeomShapePtr anObject = *anIt;
         ListOfShape aListWithObject;
         aListWithObject.push_back(anObject);
         std::shared_ptr<GeomAlgoAPI_Boolean> aBoolAlgo(new GeomAlgoAPI_Boolean(aListWithObject,
-                                                                               theTools,
-                                                                               GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                                theTools,
+                                                                GeomAlgoAPI_Boolean::BOOL_CUT));
 
         // Checking that the algorithm worked properly.
         if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) {
@@ -160,7 +162,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
 
         // Collecting solids from compsolids which will not be modified in boolean operation.
         ListOfShape aShapesToAdd;
-        for(GeomAPI_ShapeExplorer anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+        for(GeomAPI_ShapeExplorer 
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
           GeomShapePtr aSolidInCompSolid = anExp.current();
           ListOfShape::const_iterator aUsedShapesIt = aUsedShapes.cbegin();
           for(; aUsedShapesIt != aUsedShapes.cend(); ++aUsedShapesIt) {
@@ -174,8 +177,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
         }
 
         std::shared_ptr<GeomAlgoAPI_Boolean> aBoolAlgo(new GeomAlgoAPI_Boolean(aUsedShapes,
-                                                                               theTools,
-                                                                               GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                                  theTools,
+                                                                  GeomAlgoAPI_Boolean::BOOL_CUT));
 
         // Checking that the algorithm worked properly.
         if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) {
@@ -188,7 +191,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
 
         // Add result to not used solids from compsolid.
         aShapesToAdd.push_back(aBoolAlgo->shape());
-        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
         if(!aFillerAlgo->isDone() || aFillerAlgo->shape()->isNull() || !aFillerAlgo->isValid()) {
           myFeature->setError("Error: PaveFiller algorithm failed.");
           return false;
@@ -220,7 +224,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
         }
       }
 
-      if((anObjects.size() + aTools.size() + aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) {
+      if((anObjects.size() + aTools.size() + 
+          aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) {
         myFeature->setError("Error: Not enough objects for boolean operation.");
         return false;
       }
@@ -230,7 +235,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
       aSolidsToFuse.insert(aSolidsToFuse.end(), anObjects.begin(), anObjects.end());
       aSolidsToFuse.insert(aSolidsToFuse.end(), aTools.begin(), aTools.end());
 
-      // Collecting solids from compsolids which will not be modified in boolean operation and will be added to result.
+      // Collecting solids from compsolids which will not be 
+      // modified in boolean operation and will be added to result.
       ListOfShape aShapesToAdd;
       for(std::map<GeomShapePtr, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
           anIt != aCompSolidsObjects.end(); anIt++) {
@@ -239,7 +245,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
         aSolidsToFuse.insert(aSolidsToFuse.end(), aUsedShapes.begin(), aUsedShapes.end());
 
         // Collect solids from compsolid which will not be modified in boolean operation.
-        for(GeomAPI_ShapeExplorer anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+        for(GeomAPI_ShapeExplorer 
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
           GeomShapePtr aSolidInCompSolid = anExp.current();
           ListOfShape::iterator anIt = aUsedShapes.begin();
           for(; anIt != aUsedShapes.end(); anIt++) {
@@ -262,8 +269,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
       std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeShapeList(new GeomAlgoAPI_MakeShapeList());
       if(!anEdgesAndFaces.empty() && !aCutTools.empty()) {
         std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(anEdgesAndFaces,
-                                                                              aCutTools,
-                                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                              aCutTools,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
         if(aCutAlgo->isDone() && !aCutAlgo->shape()->isNull() && aCutAlgo->isValid()) {
           anEdgesAndFaces.clear();
           anEdgesAndFaces.push_back(aCutAlgo->shape());
@@ -274,8 +281,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
       // If we have compsolids then cut with not used solids all others.
       if(!aShapesToAdd.empty()) {
         std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(aSolidsToFuse,
-                                                                              aShapesToAdd,
-                                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
+                                                              aShapesToAdd,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
         if(aCutAlgo->isDone() && GeomAlgoAPI_ShapeTools::volume(aCutAlgo->shape()) > 1.e-27) {
           aSolidsToFuse.clear();
           aSolidsToFuse.push_back(aCutAlgo->shape());
@@ -294,8 +301,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
         aTools = aSolidsToFuse;
 
         std::shared_ptr<GeomAlgoAPI_Boolean> aFuseAlgo(new GeomAlgoAPI_Boolean(anObjects,
-                                                                               aTools,
-                                                                               GeomAlgoAPI_Boolean::BOOL_FUSE));
+                                                          aTools,
+                                                          GeomAlgoAPI_Boolean::BOOL_FUSE));
 
         // Checking that the algorithm worked properly.
         if(!aFuseAlgo->isDone() || aFuseAlgo->shape()->isNull() || !aFuseAlgo->isValid()) {
@@ -314,7 +321,8 @@ bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
           aShapesToAdd.push_back(aFusedShape);
         }
 
-        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
         if(!aFillerAlgo->isDone() || aFillerAlgo->shape()->isNull() || !aFillerAlgo->isValid()) {
           myFeature->setError("Error: PaveFiller algorithm failed.");
           return false;
@@ -364,8 +372,9 @@ void FeaturesPlugin_CompositeBoolean::storeModificationHistory(ResultBodyPtr the
       aTag = aModTag;
       aName = aModName;
     }
-    theResultBody->loadAndOrientModifiedShapes(theMakeShape.get(), *anIt, (*anIt)->shapeType() == GeomAPI_Shape::EDGE ?
-                                               GeomAPI_Shape::EDGE : GeomAPI_Shape::FACE, aTag, aName, *aMap.get());
+    theResultBody->loadAndOrientModifiedShapes(theMakeShape.get(), *anIt, 
+      (*anIt)->shapeType() == GeomAPI_Shape::EDGE ?
+      GeomAPI_Shape::EDGE : GeomAPI_Shape::FACE, aTag, aName, *aMap.get());
     theResultBody->loadDeletedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::FACE, aDelTag);
   }
 }
index 5fd04a114df11a3f150ce219bcd87a7c9e1d0304..da470abe149e8aa520d8baaa07c82b12ec70bc55 100644 (file)
@@ -69,7 +69,8 @@ int FeaturesPlugin_CompositeSketch::numberOfSubs(bool forTree) const
 }
 
 //=================================================================================================
-std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeSketch::subFeature(const int theIndex, bool forTree)
+std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeSketch::subFeature(const int theIndex, 
+                                                                             bool forTree)
 {
   if(theIndex == 0) {
     return std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_ID())->value());
@@ -148,7 +149,8 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis
       }
       ResultConstructionPtr aConstruction =
         std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aBaseObjectSelection->context());
-      if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape()) && aST == GeomAPI_Shape::WIRE) {
+      if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape()) && 
+          aST == GeomAPI_Shape::WIRE) {
         // It is a wire on the sketch, store it to make face later.
         aSketchWiresMap[aConstruction].push_back(aBaseShape);
         continue;
@@ -170,7 +172,8 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis
         aBaseShape = aConstruction->shape();
         if(aBaseShape.get() && !aBaseShape->isNull()) {
           GeomAPI_Shape::ShapeType aST = aBaseShape->shapeType();
-          if(aST != GeomAPI_Shape::VERTEX && aST != GeomAPI_Shape::EDGE && aST != GeomAPI_Shape::WIRE &&
+          if(aST != GeomAPI_Shape::VERTEX && aST != GeomAPI_Shape::EDGE && 
+             aST != GeomAPI_Shape::WIRE &&
              aST != GeomAPI_Shape::FACE && aST != GeomAPI_Shape::SHELL) {
             setError("Error: Selected shapes has unsupported type.");
             return;
@@ -210,16 +213,19 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis
     ListOfShape aShells;
     ListOfShape aFreeFaces;
     GeomShapePtr aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList);
-    GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces);
+    GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, 
+                                          aShells, aFreeFaces);
     theBaseShapesList.insert(theBaseShapesList.end(), aFreeFaces.begin(), aFreeFaces.end());
     theBaseShapesList.insert(theBaseShapesList.end(), aShells.begin(), aShells.end());
   } else {
-    theBaseShapesList.insert(theBaseShapesList.end(), aBaseFacesList.begin(), aBaseFacesList.end());
+    theBaseShapesList.insert(theBaseShapesList.end(), aBaseFacesList.begin(),
+                             aBaseFacesList.end());
   }
 }
 
 //=================================================================================================
-bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
+bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(
+  const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
 {
   // Check that algo is done.
   if(!theMakeShape->isDone()) {
@@ -244,8 +250,8 @@ bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(const std::shared_ptr<Geom
 
 //=================================================================================================
 void FeaturesPlugin_CompositeSketch::storeResult(const GeomShapePtr theBaseShape,
-                                                 const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
-                                                 const int theIndex)
+                                        const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                        const int theIndex)
 {
   // Create result body.
   ResultBodyPtr aResultBody = document()->createBody(data(), theIndex);
@@ -262,9 +268,9 @@ void FeaturesPlugin_CompositeSketch::storeResult(const GeomShapePtr theBaseShape
 
 //=================================================================================================
 void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theResultBody,
-                                                            const GeomShapePtr theBaseShape,
-                                                            const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
-                                                            int& theTag)
+                                        const GeomShapePtr theBaseShape,
+                                        const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                        int& theTag)
 {
   GeomAPI_Shape::ShapeType aBaseShapeType = theBaseShape->shapeType();
   GeomAPI_Shape::ShapeType aShapeTypeToExplode = GeomAPI_Shape::SHAPE;
@@ -298,32 +304,41 @@ void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theRes
     }
   }
 
-  if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX || aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
-    theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, GeomAPI_Shape::VERTEX,
-                                                theTag++, aGenName + "Edge", *aMapOfSubShapes.get());
+  if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX || 
+      aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
+    theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, 
+                                                GeomAPI_Shape::VERTEX,
+                                                theTag++, aGenName + "Edge", 
+                                                *aMapOfSubShapes.get());
   }
-  if(aShapeTypeToExplode == GeomAPI_Shape::EDGE || aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
-    theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, GeomAPI_Shape::EDGE,
-                                                theTag++, aGenName + "Face", *aMapOfSubShapes.get());
+  if(aShapeTypeToExplode == GeomAPI_Shape::EDGE || 
+      aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
+    theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), 
+                                                theBaseShape, GeomAPI_Shape::EDGE,
+                                                theTag++, aGenName + "Face",
+                                                *aMapOfSubShapes.get());
   }
 
-  std::shared_ptr<GeomAlgoAPI_MakeSweep> aMakeSweep = std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
+  std::shared_ptr<GeomAlgoAPI_MakeSweep> aMakeSweep = 
+    std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
   if(aMakeSweep.get()) {
     // Store from shapes.
-    storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, aMakeSweep->fromShapes(), "From_", theTag);
+    storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, 
+                aMakeSweep->fromShapes(), "From_", theTag);
 
     // Store to shapes.
-    storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, aMakeSweep->toShapes(), "To_", theTag);
+    storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, 
+                aMakeSweep->toShapes(), "To_", theTag);
   }
 }
 
 //=================================================================================================
 void FeaturesPlugin_CompositeSketch::storeShapes(ResultBodyPtr theResultBody,
-                                                 const GeomAPI_Shape::ShapeType theBaseShapeType,
-                                                 const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
-                                                 const ListOfShape& theShapes,
-                                                 const std::string theName,
-                                                 int& theTag)
+                              const GeomAPI_Shape::ShapeType theBaseShapeType,
+                              const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
+                              const ListOfShape& theShapes,
+                              const std::string theName,
+                              int& theTag)
 {
   GeomAPI_Shape::ShapeType aShapeTypeToExplore = GeomAPI_Shape::FACE;
   std::string aShapeTypeStr = "Face";
index 21479418cfb61404446ae00de44042751f71a26e..46620a2edfbfe273a60d40f4ba1d51f8a940af3a 100644 (file)
@@ -40,7 +40,8 @@ public:
   FEATURESPLUGIN_EXPORT virtual int numberOfSubs(bool forTree = false) const;
 
   /// \return the sub-feature by zero-base index.
-  FEATURESPLUGIN_EXPORT virtual std::shared_ptr<ModelAPI_Feature> subFeature(const int theIndex, bool forTree = false);
+  FEATURESPLUGIN_EXPORT virtual 
+    std::shared_ptr<ModelAPI_Feature> subFeature(const int theIndex, bool forTree = false);
 
   /// \return the sub-feature unique identifier in this composite feature by zero-base index.
   FEATURESPLUGIN_EXPORT virtual int subFeatureId(const int theIndex) const;
index 8238b174388404eddc675eb24d0363e3b7d48b60..c80171dfdeae11f66c764b41432b4e09fcc2ba03 100644 (file)
@@ -63,7 +63,8 @@ void FeaturesPlugin_Extrusion::execute()
   int aResultIndex = 0;
   ListOfShape::const_iterator aBaseIt = aBaseShapesList.cbegin();
   ListOfMakeShape::const_iterator anAlgoIt = aMakeShapesList.cbegin();
-  for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend(); ++aBaseIt, ++anAlgoIt) {
+  for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend();
+        ++aBaseIt, ++anAlgoIt) {
     storeResult(*aBaseIt, *anAlgoIt, aResultIndex++);
   }
 
@@ -130,7 +131,8 @@ bool FeaturesPlugin_Extrusion::makeExtrusions(ListOfShape& theBaseShapes,
   }
 
   // Generating result for each base shape.
-  for(ListOfShape::const_iterator anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
+  for(ListOfShape::const_iterator
+      anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
     std::shared_ptr<GeomAPI_Shape> aBaseShape = *anIter;
 
     std::shared_ptr<GeomAlgoAPI_Prism> aPrismAlgo(new GeomAlgoAPI_Prism(aBaseShape, aDir,
index 4501a81911ea8e59d5b5e7cb1f4a5309bc43f9c5..2fa5ea282d7dc1e469dfea7cae3ae1627562bf62 100755 (executable)
@@ -23,9 +23,10 @@ bool FeaturesPlugin_ExtrusionBoolean::makeGeneration(ListOfShape& theBaseShapes,
 
 //=================================================================================================
 void FeaturesPlugin_ExtrusionBoolean::storeGenerationHistory(ResultBodyPtr theResultBody,
-                                                             const GeomShapePtr theBaseShape,
-                                                             const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
-                                                             int& theTag)
+                                        const GeomShapePtr theBaseShape,
+                                        const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                        int& theTag)
 {
-  FeaturesPlugin_Extrusion::storeGenerationHistory(theResultBody, theBaseShape, theMakeShape, theTag);
+  FeaturesPlugin_Extrusion::storeGenerationHistory(theResultBody, theBaseShape, 
+                                                   theMakeShape, theTag);
 }
index 4e4cbad45d636de552156e348db961f8152bd91d..76a45d8c5b597c4cf50495c2f990a8d6f9c47fde 100644 (file)
@@ -13,7 +13,8 @@
 /// \class FeaturesPlugin_ExtrusionBoolean
 /// \ingroup Plugins
 /// \brief Interface for the composite extrusion feature.
-class FeaturesPlugin_ExtrusionBoolean: public FeaturesPlugin_Extrusion, public FeaturesPlugin_CompositeBoolean
+class FeaturesPlugin_ExtrusionBoolean: public FeaturesPlugin_Extrusion, 
+                                       public FeaturesPlugin_CompositeBoolean
 {
 public:
   /// Request for initialization of data model of the feature: adding all attributes.
index 16d625770ca0edaf8cef3b313b0d3b2e3b297917..55a254d73e067a24bc19145ee542533300e423b6 100644 (file)
@@ -24,8 +24,10 @@ FeaturesPlugin_Intersection::FeaturesPlugin_Intersection()
 //=================================================================================================
 void FeaturesPlugin_Intersection::initAttributes()
 {
-  data()->addAttribute(FeaturesPlugin_Intersection::OBJECT_LIST_ID(), ModelAPI_AttributeSelectionList::typeId());
-  data()->addAttribute(FeaturesPlugin_Intersection::TOOL_LIST_ID(), ModelAPI_AttributeSelectionList::typeId());
+  data()->addAttribute(FeaturesPlugin_Intersection::OBJECT_LIST_ID(), 
+                       ModelAPI_AttributeSelectionList::typeId());
+  data()->addAttribute(FeaturesPlugin_Intersection::TOOL_LIST_ID(), 
+                       ModelAPI_AttributeSelectionList::typeId());
 }
 
 //=================================================================================================
@@ -34,9 +36,11 @@ void FeaturesPlugin_Intersection::execute()
   ListOfShape anObjects, aTools;
 
   // Getting objects.
-  AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
+  AttributeSelectionListPtr anObjectsSelList = 
+    selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
   for (int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = 
+      anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if (!anObject.get()) {
       return;
@@ -45,7 +49,8 @@ void FeaturesPlugin_Intersection::execute()
   }
 
   // Getting tools.
-  AttributeSelectionListPtr aToolsSelList = selectionList(FeaturesPlugin_Intersection::TOOL_LIST_ID());
+  AttributeSelectionListPtr aToolsSelList = 
+    selectionList(FeaturesPlugin_Intersection::TOOL_LIST_ID());
   for (int aToolsIndex = 0; aToolsIndex < aToolsSelList->size(); aToolsIndex++) {
     std::shared_ptr<ModelAPI_AttributeSelection> aToolAttr = aToolsSelList->value(aToolsIndex);
     std::shared_ptr<GeomAPI_Shape> aTool = aToolAttr->value();
@@ -63,7 +68,8 @@ void FeaturesPlugin_Intersection::execute()
   int aResultIndex = 0;
 
   // Create result for each object.
-  for (ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) {
+  for (ListOfShape::iterator 
+       anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) {
     std::shared_ptr<GeomAPI_Shape> anObject = *anObjectsIt;
     ListOfShape aListWithObject; aListWithObject.push_back(anObject);
     GeomAlgoAPI_Intersection anIntersectionAlgo(aListWithObject, aTools);
@@ -105,7 +111,8 @@ void FeaturesPlugin_Intersection::loadNamingDS(std::shared_ptr<ModelAPI_ResultBo
   std::shared_ptr<GeomAPI_Shape> aResultShape = theMakeShape.shape();
   std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMapOfShapes = theMakeShape.mapOfSubShapes();
   const int aDeletedTag = 1;
-  const int aSubsolidsTag = 2; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  const int aSubsolidsTag = 2; 
   const int aModifyTag = 100000;
   int aModifyToolsTag = 200000;
   std::ostringstream aStream;
@@ -125,9 +132,9 @@ void FeaturesPlugin_Intersection::loadNamingDS(std::shared_ptr<ModelAPI_ResultBo
     aStream.clear();
     aStream << aModName << "_" << anIndex++;
     theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, GeomAPI_Shape::VERTEX,
-                                               aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
+                                   aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
     theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, GeomAPI_Shape::EDGE,
-                                               aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
+                                 aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
     theResultBody->loadDeletedShapes(&theMakeShape, *anIter, GeomAPI_Shape::FACE, aDeletedTag);
     aModifyToolsTag += 10000;
   }
index 2c8fff3d5c52ed0ac789f09d5328f379ecb8fb94..1b87fff368637a51b4435c2029aae5f588d702ea 100644 (file)
@@ -18,7 +18,8 @@ class GeomAlgoAPI_MakeShape;
 /// \class FeaturesPlugin_Intersection
 /// \ingroup Plugins
 /// \brief Intersection feature takes a list of shapes as objects and list of shapes as tools.
-/// The types of objects and tools may be different: whole objects, compsoilds, solids, shells, faces or edges.
+/// The types of objects and tools may be different: 
+/// whole objects, compsoilds, solids, shells, faces or edges.
 /// The result is less than the minimal dimension from pair of intersection:
 /// for two solids or two faces it is wire, for the edge and face it is vertex, etc.
 class FeaturesPlugin_Intersection : public ModelAPI_Feature
index f1ec8123b50a612e204637d2142f537238ca8190..9268f95d7f1ebe055df9948b85165ac4af1468de 100755 (executable)
@@ -87,7 +87,8 @@ void FeaturesPlugin_Partition::execute()
   }
 
   // Create single result.
-  std::shared_ptr<GeomAlgoAPI_Partition> aPartitionAlgo(new GeomAlgoAPI_Partition(anObjects, aTools));
+  std::shared_ptr<GeomAlgoAPI_Partition> aPartitionAlgo(
+    new GeomAlgoAPI_Partition(anObjects, aTools));
 
   // Checking that the algorithm worked properly.
   if (!aPartitionAlgo->isDone()) {
@@ -161,7 +162,8 @@ void FeaturesPlugin_Partition::storeResult(
   }
 
   const int aDelTag = 1;
-  const int aSubTag = 2; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  const int aSubTag = 2; 
   int aModTag = aSubTag + 10000;
   const std::string aModName = "Modified";
 
@@ -202,7 +204,8 @@ GeomShapePtr findBase(const GeomShapePtr theObjectShape,
     GeomShapePtr anObjectSubShape = anObjectSubShapesExp.current();
     ListOfShape aModifiedShapes;
     theMakeShape->modified(anObjectSubShape, aModifiedShapes);
-    for(ListOfShape::const_iterator aModIt = aModifiedShapes.cbegin(); aModIt != aModifiedShapes.cend(); ++aModIt) {
+    for(ListOfShape::const_iterator 
+        aModIt = aModifiedShapes.cbegin(); aModIt != aModifiedShapes.cend(); ++aModIt) {
       GeomShapePtr aModShape = *aModIt;
       if(aMapOfSubShapes->isBound(aModShape)) {
         aModShape = aMapOfSubShapes->find(aModShape);
index 787a37fcc07b4582c88c90e030877961a9621da0..af528e2ffd58265d9fc757ac23969583e00daef3 100644 (file)
@@ -78,7 +78,8 @@ void FeaturesPlugin_Pipe::execute()
       GeomAPI_Shape::ShapeType aST = aBaseShape->shapeType();
       ResultConstructionPtr aConstruction =
         std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aBaseObjectSelection->context());
-      if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape()) && aST == GeomAPI_Shape::WIRE) {
+      if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape()) && 
+          aST == GeomAPI_Shape::WIRE) {
         // It is a wire on the sketch, store it to make face later.
         aSketchWiresMap[aConstruction].push_back(aBaseShape);
         continue;
@@ -88,7 +89,8 @@ void FeaturesPlugin_Pipe::execute()
       }
     } else {
       // This may be the whole sketch result selected, check and get faces.
-      ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aBaseObjectSelection->context());
+      ResultConstructionPtr aConstruction = 
+        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aBaseObjectSelection->context());
       if(!aConstruction.get()) {
         setError("Error: One of selected sketches does not have results.");
         return;
@@ -103,7 +105,8 @@ void FeaturesPlugin_Pipe::execute()
         }
       } else {
         for(int aFaceIndex = 0; aFaceIndex < aFacesNum; aFaceIndex++) {
-          std::shared_ptr<GeomAPI_Shape> aBaseFace = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
+          std::shared_ptr<GeomAPI_Shape> aBaseFace = 
+            std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
           if(!aBaseFace.get() || aBaseFace->isNull()) {
             setError("Error: One of the faces on selected sketch is Null.");
             return;
@@ -132,8 +135,10 @@ void FeaturesPlugin_Pipe::execute()
   if(aCreationMethod == CREATION_METHOD_SIMPLE()) {
     ListOfShape aShells;
     ListOfShape aFreeFaces;
-    std::shared_ptr<GeomAPI_Shape> aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList);
-    GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces);
+    std::shared_ptr<GeomAPI_Shape> aFacesCompound = 
+      GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList);
+    GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, 
+                                          aShells, aFreeFaces);
     aBaseShapesList.insert(aBaseShapesList.end(), aFreeFaces.begin(), aFreeFaces.end());
     aBaseShapesList.insert(aBaseShapesList.end(), aShells.begin(), aShells.end());
   } else {
@@ -146,7 +151,8 @@ void FeaturesPlugin_Pipe::execute()
     setError("Error: Path selection is empty.");
     return;
   }
-  std::shared_ptr<GeomAPI_Shape> aPathShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aPathSelection->value());
+  std::shared_ptr<GeomAPI_Shape> aPathShape = 
+    std::dynamic_pointer_cast<GeomAPI_Shape>(aPathSelection->value());
   if(!aPathShape.get()) {
     // Probaply it is a construction.
     aPathShape = aPathSelection->context()->shape();
@@ -204,8 +210,10 @@ void FeaturesPlugin_Pipe::execute()
 
   // Generating result for each object.
   int aResultIndex = 0;
-  if(aCreationMethod == CREATION_METHOD_SIMPLE() || aCreationMethod == CREATION_METHOD_BINORMAL()) {
-    for(ListOfShape::const_iterator anIter = aBaseShapesList.cbegin(); anIter != aBaseShapesList.cend(); anIter++) {
+  if(aCreationMethod == CREATION_METHOD_SIMPLE() || 
+      aCreationMethod == CREATION_METHOD_BINORMAL()) {
+    for(ListOfShape::const_iterator
+        anIter = aBaseShapesList.cbegin(); anIter != aBaseShapesList.cend(); anIter++) {
       std::shared_ptr<GeomAPI_Shape> aBaseShape = *anIter;
 
       GeomAlgoAPI_Pipe aPipeAlgo = aCreationMethod ==
@@ -309,20 +317,24 @@ void FeaturesPlugin_Pipe::storeResult(const std::shared_ptr<GeomAPI_Shape> theBa
     }
   }
 
-  if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX || aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
+  if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX || 
+      aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
     aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, theBaseShape, GeomAPI_Shape::VERTEX,
-                                              aGenTag++, aGenName + "Edge", *aMapOfSubShapes.get());
+                                           aGenTag++, aGenName + "Edge", *aMapOfSubShapes.get());
   }
-  if(aShapeTypeToExplode == GeomAPI_Shape::EDGE || aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
+  if(aShapeTypeToExplode == GeomAPI_Shape::EDGE || 
+      aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
     aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, theBaseShape, GeomAPI_Shape::EDGE,
-                                              aGenTag++, aGenName + "Face", *aMapOfSubShapes.get());
+                                           aGenTag++, aGenName + "Face", *aMapOfSubShapes.get());
   }
 
-  aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, theBaseShape, aShapeTypeToExplode, aGenTag++, aGenName, *aMapOfSubShapes.get());
+  aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, theBaseShape, aShapeTypeToExplode, 
+                                            aGenTag++, aGenName, *aMapOfSubShapes.get());
 
   // Store from shapes.
   int aFromTag = aGenTag;
-  storeShapes(aResultBody, aBaseShapeType, aMapOfSubShapes, thePipeAlgo.fromShapes(), "From_", aFromTag);
+  storeShapes(aResultBody, aBaseShapeType, aMapOfSubShapes, 
+              thePipeAlgo.fromShapes(), "From_", aFromTag);
 
   // Store to shapes.
   int aToTag = aFromTag;
@@ -346,7 +358,8 @@ void FeaturesPlugin_Pipe::storeResult(const ListOfShape& theBaseShapes,
   int aGenTag = 1;
   std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMapOfSubShapes = thePipeAlgo.mapOfSubShapes();
 
-  for(ListOfShape::const_iterator anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
+  for(ListOfShape::const_iterator 
+      anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
     GeomShapePtr aBaseShape = *anIter;
     GeomAPI_Shape::ShapeType aBaseShapeType = aBaseShape->shapeType();
     GeomAPI_Shape::ShapeType aShapeTypeToExplode;
@@ -374,16 +387,19 @@ void FeaturesPlugin_Pipe::storeResult(const ListOfShape& theBaseShapes,
         break;
       }
     }
-    aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, aBaseShape, aShapeTypeToExplode, aGenTag++, aGenName, *aMapOfSubShapes.get());
+    aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, aBaseShape, aShapeTypeToExplode,
+                                              aGenTag++, aGenName, *aMapOfSubShapes.get());
   }
 
   // Store from shapes.
   int aFromTag = aGenTag;
-  storeShapes(aResultBody, theBaseShapes.front()->shapeType(), aMapOfSubShapes, thePipeAlgo.fromShapes(), "From", aFromTag);
+  storeShapes(aResultBody, theBaseShapes.front()->shapeType(), aMapOfSubShapes,
+              thePipeAlgo.fromShapes(), "From", aFromTag);
 
   // Store to shapes.
   int aToTag = aFromTag;
-  storeShapes(aResultBody, theBaseShapes.back()->shapeType(), aMapOfSubShapes, thePipeAlgo.toShapes(), "To", aToTag);
+  storeShapes(aResultBody, theBaseShapes.back()->shapeType(), 
+              aMapOfSubShapes, thePipeAlgo.toShapes(), "To", aToTag);
 
 
   setResult(aResultBody, theResultIndex);
@@ -391,11 +407,11 @@ void FeaturesPlugin_Pipe::storeResult(const ListOfShape& theBaseShapes,
 
 //==================================================================================================
 void FeaturesPlugin_Pipe::storeShapes(ResultBodyPtr theResultBody,
-                                      const GeomAPI_Shape::ShapeType theBaseShapeType,
-                                      const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
-                                      const ListOfShape& theShapes,
-                                      const std::string theName,
-                                      int& theTag)
+                              const GeomAPI_Shape::ShapeType theBaseShapeType,
+                              const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
+                              const ListOfShape& theShapes,
+                              const std::string theName,
+                              int& theTag)
 {
   GeomAPI_Shape::ShapeType aShapeTypeToExplore = GeomAPI_Shape::FACE;
   std::string aShapeTypeStr = "Face";
index aba97b091f2146a5d14ae045d4535e27e4f806e3..9fedeee8c9fef270e2e8ad5404b1d9e5115926d8 100644 (file)
@@ -17,7 +17,8 @@
 /// \class FeaturesPlugin_Pipe
 /// \ingroup Plugins
 /// \brief Feature for creation of extrusion along a path.
-/// Pipe creates extrusion of objects along a path. It produces the following results from objects:\n
+/// Pipe creates extrusion of objects along a path. 
+/// It produces the following results from objects:\n
 /// Vertex -> Edge\n
 /// Edge -> Face\n
 /// Wire -> Shell\n
index 627d10666b9819996d38dd6a4479a6aad52e8be7..d3fc14903062a5d5a27ffaf3df4a934815716d62 100644 (file)
@@ -47,7 +47,8 @@ void FeaturesPlugin_Placement::execute()
     return;
   }
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = 
+      anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) { // may be for not-activated parts
       eraseResults();
@@ -142,7 +143,8 @@ void FeaturesPlugin_Placement::execute()
   for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
       anObjectsIt++, aContext++) {
 
-    if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { // for part results just set transformation
+    // for part results just set transformation
+    if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { 
       ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
       ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
       aResultPart->setTrsf(aContextRes, aTrsf);
@@ -169,7 +171,8 @@ void FeaturesPlugin_Placement::execute()
       }
 
       //LoadNamingDS
-      std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
+      std::shared_ptr<ModelAPI_ResultBody> aResultBody = 
+        document()->createBody(data(), aResultIndex);
       loadNamingDS(aTransformAlgo, aResultBody, aBaseShape);
       setResult(aResultBody, aResultIndex);
     }
@@ -200,16 +203,16 @@ void FeaturesPlugin_Placement::loadNamingDS(GeomAlgoAPI_Transform& theTransformA
     case GeomAPI_Shape::SOLID:
     case GeomAPI_Shape::SHELL:
       theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo,
-                                                 theBaseShape, GeomAPI_Shape::FACE,
-                                                 aPlacedTag, aPlacedName + "_Face", *aSubShapes.get());
+                                                theBaseShape, GeomAPI_Shape::FACE,
+                                        aPlacedTag, aPlacedName + "_Face", *aSubShapes.get());
     case GeomAPI_Shape::FACE:
     case GeomAPI_Shape::WIRE:
       theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo,
                                                  theBaseShape, GeomAPI_Shape::EDGE,
-                                                 ++aPlacedTag, aPlacedName + "_Edge", *aSubShapes.get());
+                                        ++aPlacedTag, aPlacedName + "_Edge", *aSubShapes.get());
     case GeomAPI_Shape::EDGE:
       theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo,
                                                  theBaseShape, GeomAPI_Shape::VERTEX,
-                                                 ++aPlacedTag, aPlacedName + "_Vertex", *aSubShapes.get());
+                                        ++aPlacedTag, aPlacedName + "_Vertex", *aSubShapes.get());
   }
 }
index 84541fcd10f55d375a68ffb9e0b750e89f46f0da..e29d8558f59d40385e9958206919d2724e59bada 100644 (file)
@@ -45,7 +45,8 @@ void FeaturesPlugin_RemoveSubShapes::attributeChanged(const std::string& theID)
     aSubShapesAttrList->clear();
 
     ResultPtr aContext = aShapeAttrSelection->context();
-    ResultCompSolidPtr aResultCompSolid = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aContext);
+    ResultCompSolidPtr aResultCompSolid = 
+      std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aContext);
     if(!aResultCompSolid.get()) {
       return;
     }
index 53e4e532888f5d988101c30d59447dd23f158dc8..4ef29b4dadaf9df5ed0310070be74b5ec66f689b 100644 (file)
@@ -61,7 +61,8 @@ void FeaturesPlugin_Revolution::execute()
   int aResultIndex = 0;
   ListOfShape::const_iterator aBaseIt = aBaseShapesList.cbegin();
   ListOfMakeShape::const_iterator anAlgoIt = aMakeShapesList.cbegin();
-  for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend(); ++aBaseIt, ++anAlgoIt) {
+  for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend(); 
+        ++aBaseIt, ++anAlgoIt) {
     storeResult(*aBaseIt, *anAlgoIt, aResultIndex++);
   }
 
@@ -133,12 +134,14 @@ bool FeaturesPlugin_Revolution::makeRevolutions(ListOfShape& theBaseShapes,
   }
 
   // Generating result for each base shape.
-  for(ListOfShape::const_iterator anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
+  for(ListOfShape::const_iterator 
+      anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
     GeomShapePtr aBaseShape = *anIter;
 
-    std::shared_ptr<GeomAlgoAPI_Revolution> aRevolAlgo(new GeomAlgoAPI_Revolution(aBaseShape, anAxis,
-                                                                                  aToShape, aToAngle,
-                                                                                  aFromShape, aFromAngle));
+    std::shared_ptr<GeomAlgoAPI_Revolution> aRevolAlgo(new GeomAlgoAPI_Revolution(
+                                                       aBaseShape, anAxis,
+                                                       aToShape, aToAngle,
+                                                       aFromShape, aFromAngle));
     if(!isMakeShapeValid(aRevolAlgo)) {
       return false;
     }
index 479fd51e97612d29e3166b0dfd907ba2bb5cd597..de4c0a9e2ed2ea93472760766fa5ec6b9c978911 100644 (file)
@@ -23,9 +23,10 @@ bool FeaturesPlugin_RevolutionBoolean::makeGeneration(ListOfShape& theBaseShapes
 
 //=================================================================================================
 void FeaturesPlugin_RevolutionBoolean::storeGenerationHistory(ResultBodyPtr theResultBody,
-                                                             const GeomShapePtr theBaseShape,
-                                                             const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
-                                                             int& theTag)
+                                      const GeomShapePtr theBaseShape,
+                                      const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                      int& theTag)
 {
-  FeaturesPlugin_Revolution::storeGenerationHistory(theResultBody, theBaseShape, theMakeShape, theTag);
+  FeaturesPlugin_Revolution::storeGenerationHistory(theResultBody, theBaseShape,
+                                                    theMakeShape, theTag);
 }
index fc0252ba1e4848303325f7b5981b2eb3dd48685e..371cc09054b46a4177edb18de7264594d8e85804 100644 (file)
@@ -13,7 +13,8 @@
 /// \class FeaturesPlugin_RevolutionBoolean
 /// \ingroup Plugins
 /// \brief Interface for the composite revolution feature.
-class FeaturesPlugin_RevolutionBoolean : public FeaturesPlugin_Revolution, public FeaturesPlugin_CompositeBoolean
+class FeaturesPlugin_RevolutionBoolean : public FeaturesPlugin_Revolution, 
+                                         public FeaturesPlugin_CompositeBoolean
 {
 public:
   /// Request for initialization of data model of the feature: adding all attributes.
index f7768c40502400b3feb2a81d020cfd7942656c28..59b02f42e08e0f5371e3e6dc5939d801fd25b0c7 100755 (executable)
@@ -26,7 +26,8 @@ void FeaturesPlugin_Rotation::initAttributes()
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
     FeaturesPlugin_Rotation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
 
-  data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), 
+                       ModelAPI_AttributeSelection::typeId());
   data()->addAttribute(FeaturesPlugin_Rotation::ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
 }
 
@@ -36,12 +37,14 @@ void FeaturesPlugin_Rotation::execute()
   // Getting objects.
   ListOfShape anObjects;
   std::list<ResultPtr> aContextes;
-  AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
+  AttributeSelectionListPtr anObjectsSelList = 
+    selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID());
   if (anObjectsSelList->size() == 0) {
     return;
   }
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = 
+      anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) {
       return;
@@ -53,7 +56,8 @@ void FeaturesPlugin_Rotation::execute()
   //Getting axis.
   std::shared_ptr<GeomAPI_Ax1> anAxis;
   std::shared_ptr<GeomAPI_Edge> anEdge;
-  std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
+  std::shared_ptr<ModelAPI_AttributeSelection> anObjRef =
+    selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
   if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
   } else if (anObjRef && !anObjRef->value() && anObjRef->context() && 
@@ -61,7 +65,8 @@ void FeaturesPlugin_Rotation::execute()
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->context()->shape()));
   }
   if(anEdge) {
-    anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
+    anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), 
+                                                          anEdge->line()->direction()));
   }
 
   // Getting angle.
@@ -132,16 +137,16 @@ void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo,
     case GeomAPI_Shape::SOLID:
     case GeomAPI_Shape::SHELL:
       theResultBody->loadAndOrientModifiedShapes(&theRotaionAlgo,
-                                                 theBaseShape, GeomAPI_Shape::FACE,
-                                                 aRotatedTag, aRotatedName + "_Face", *aSubShapes.get());
+                                    theBaseShape, GeomAPI_Shape::FACE,
+                                    aRotatedTag, aRotatedName + "_Face", *aSubShapes.get());
     case GeomAPI_Shape::FACE:
     case GeomAPI_Shape::WIRE:
       theResultBody->loadAndOrientModifiedShapes(&theRotaionAlgo,
-                                                 theBaseShape, GeomAPI_Shape::EDGE,
-                                                 ++aRotatedTag, aRotatedName + "_Edge", *aSubShapes.get());
+                                  theBaseShape, GeomAPI_Shape::EDGE,
+                                  ++aRotatedTag, aRotatedName + "_Edge", *aSubShapes.get());
     case GeomAPI_Shape::EDGE:
       theResultBody->loadAndOrientModifiedShapes(&theRotaionAlgo,
-                                                 theBaseShape, GeomAPI_Shape::VERTEX,
-                                                 ++aRotatedTag, aRotatedName + "_Vertex", *aSubShapes.get());
+                                theBaseShape, GeomAPI_Shape::VERTEX,
+                                ++aRotatedTag, aRotatedName + "_Vertex", *aSubShapes.get());
   }
 }
index 9e616107b6ee22438313378a1e2d04e8de10932d..a060576f08775de2b4fc9cd5e670b8f0c64bfba3 100644 (file)
@@ -28,8 +28,10 @@ void FeaturesPlugin_Translation::initAttributes()
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
     FeaturesPlugin_Translation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
 
-  data()->addAttribute(FeaturesPlugin_Translation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
-  data()->addAttribute(FeaturesPlugin_Translation::DISTANCE_ID(), ModelAPI_AttributeDouble::typeId());
+  data()->addAttribute(FeaturesPlugin_Translation::AXIS_OBJECT_ID(),
+                       ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(FeaturesPlugin_Translation::DISTANCE_ID(),
+                       ModelAPI_AttributeDouble::typeId());
 }
 
 //=================================================================================================
@@ -38,12 +40,14 @@ void FeaturesPlugin_Translation::execute()
   // Getting objects.
   ListOfShape anObjects;
   std::list<ResultPtr> aContextes;
-  AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Translation::OBJECTS_LIST_ID());
+  AttributeSelectionListPtr anObjectsSelList = 
+    selectionList(FeaturesPlugin_Translation::OBJECTS_LIST_ID());
   if (anObjectsSelList->size() == 0) {
     return;
   }
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = 
+      anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) { // may be for not-activated parts
       eraseResults();
@@ -56,7 +60,8 @@ void FeaturesPlugin_Translation::execute()
   //Getting axis.
   std::shared_ptr<GeomAPI_Ax1> anAxis;
   std::shared_ptr<GeomAPI_Edge> anEdge;
-  std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = selection(FeaturesPlugin_Translation::AXIS_OBJECT_ID());
+  std::shared_ptr<ModelAPI_AttributeSelection> anObjRef = 
+    selection(FeaturesPlugin_Translation::AXIS_OBJECT_ID());
   if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
   } else if (anObjRef && !anObjRef->value() && anObjRef->context() && 
@@ -64,7 +69,8 @@ void FeaturesPlugin_Translation::execute()
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->context()->shape()));
   }
   if(anEdge) {
-    anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
+    anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), 
+                                                          anEdge->line()->direction()));
   }
 
   // Getting distance.
@@ -135,16 +141,16 @@ void FeaturesPlugin_Translation::loadNamingDS(GeomAlgoAPI_Translation& theTransl
     case GeomAPI_Shape::SOLID:
     case GeomAPI_Shape::SHELL:
       theResultBody->loadAndOrientModifiedShapes(&theTranslationAlgo,
-                                                 theBaseShape, GeomAPI_Shape::FACE,
-                                                 aTranslatedTag, aTranslatedName + "_Face", *aSubShapes.get());
+                                theBaseShape, GeomAPI_Shape::FACE,
+                                aTranslatedTag, aTranslatedName + "_Face", *aSubShapes.get());
     case GeomAPI_Shape::FACE:
     case GeomAPI_Shape::WIRE:
       theResultBody->loadAndOrientModifiedShapes(&theTranslationAlgo,
-                                                 theBaseShape, GeomAPI_Shape::EDGE,
-                                                 ++aTranslatedTag, aTranslatedName + "_Edge", *aSubShapes.get());
+                                theBaseShape, GeomAPI_Shape::EDGE,
+                                ++aTranslatedTag, aTranslatedName + "_Edge", *aSubShapes.get());
     case GeomAPI_Shape::EDGE:
       theResultBody->loadAndOrientModifiedShapes(&theTranslationAlgo,
-                                                 theBaseShape, GeomAPI_Shape::VERTEX,
-                                                 ++aTranslatedTag, aTranslatedName + "_Vertex", *aSubShapes.get());
+                              theBaseShape, GeomAPI_Shape::VERTEX,
+                              ++aTranslatedTag, aTranslatedName + "_Vertex", *aSubShapes.get());
   }
 }
index 1d97c92aa1f043bd68d75d73d58a5a4c737c932b..a7c62749a0812102675e613f49aa07482a0ccfee 100644 (file)
@@ -34,7 +34,8 @@ void FeaturesPlugin_Union::execute()
   std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape> aCompSolidsObjects;
 
   // Getting objects.
-  AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anObjectsSelList = 
+    selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
     AttributeSelectionPtr anObjectAttr = anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
@@ -45,7 +46,8 @@ void FeaturesPlugin_Union::execute()
     ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aContext);
     if(aResCompSolidPtr.get()) {
       std::shared_ptr<GeomAPI_Shape> aContextShape = aResCompSolidPtr->shape();
-      std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+      std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+        anIt = aCompSolidsObjects.begin();
       for(; anIt != aCompSolidsObjects.end(); anIt++) {
         if(anIt->first->isEqual(aContextShape)) {
           aCompSolidsObjects[anIt->first].push_back(anObject);
@@ -60,9 +62,11 @@ void FeaturesPlugin_Union::execute()
     }
   }
 
-  // Collecting solids from compsolids which will not be modified in boolean operation and will be added to result.
+  // Collecting solids from compsolids which will not be modified in
+  // boolean operation and will be added to result.
   ListOfShape aShapesToAdd;
-  for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+  for(std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator 
+    anIt = aCompSolidsObjects.begin();
     anIt != aCompSolidsObjects.end(); anIt++) {
     std::shared_ptr<GeomAPI_Shape> aCompSolid = anIt->first;
     ListOfShape& aUsedInOperationSolids = anIt->second;
@@ -92,8 +96,8 @@ void FeaturesPlugin_Union::execute()
   ListOfShape aTools;
   aTools.splice(aTools.begin(), anObjects, anObjects.begin());
   std::shared_ptr<GeomAlgoAPI_Boolean> aFuseAlgo(new GeomAlgoAPI_Boolean(anObjects,
-                                                                         aTools,
-                                                                         GeomAlgoAPI_Boolean::BOOL_FUSE));
+                                                            aTools,
+                                                            GeomAlgoAPI_Boolean::BOOL_FUSE));
 
   // Checking that the algorithm worked properly.
   GeomAlgoAPI_MakeShapeList aMakeShapeList;
@@ -122,7 +126,8 @@ void FeaturesPlugin_Union::execute()
   // Combine result with not used solids from compsolid.
   if(aShapesToAdd.size() > 0) {
     aShapesToAdd.push_back(aShape);
-    std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+    std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+      new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
     if(!aFillerAlgo->isDone()) {
       setError("Error: PaveFiller algorithm failed.");
       return;
@@ -144,7 +149,8 @@ void FeaturesPlugin_Union::execute()
   // Store result and naming.
   const int aModifyTag = 1;
   const int aDeletedTag = 2;
-  const int aSubsolidsTag = 3; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
+  const int aSubsolidsTag = 3; 
   const std::string aModName = "Modified";
 
   std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
index 4057abd68a538547b6a1002b2972779657cbcc57..d64b506b01abeb4ac2bf83248ae5d5033f124ef0 100755 (executable)
@@ -48,7 +48,8 @@ bool FeaturesPlugin_ValidatorTransform::isValid(const AttributePtr& theAttribute
   if (!aValid) {
     std::string aResultGroupName = isPartSetDocument ? ModelAPI_ResultPart::group()
                                                      : ModelAPI_ResultBody::group();
-    theError = "Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.";
+    theError = "Objects from the %1 group can be selected in the %2 document, \
+ but an objects from the %3 group is selected.";
     theError.arg(aResultGroupName).arg(aDocument->kind()).arg(anErrorGroupName);
   }
   return aValid;
index c29889567e38dae4b9a1c995b69f021b60f81966..be031014be35ffe25bd16063926ab80ee7db74ae 100644 (file)
@@ -44,7 +44,8 @@ bool FeaturesPlugin_ValidatorPipePath::isValid(const AttributePtr& theAttribute,
                                                const std::list<std::string>& theArguments,
                                                Events_InfoMessage& theError) const
 {
-  AttributeSelectionPtr aPathAttrSelection = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
+  AttributeSelectionPtr aPathAttrSelection = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
   if(!aPathAttrSelection.get()) {
     theError = "Error: This validator can only work with path selector in \"Pipe\" feature.";
     return false;
@@ -57,7 +58,8 @@ bool FeaturesPlugin_ValidatorPipePath::isValid(const AttributePtr& theAttribute,
     return false;
   }
   GeomShapePtr aContextShape = aContext->shape();
-  if(aPathShape.get() && aPathShape->shapeType() == GeomAPI_Shape::WIRE && !aPathShape->isEqual(aContextShape)) {
+  if(aPathShape.get() && aPathShape->shapeType() == GeomAPI_Shape::WIRE && 
+      !aPathShape->isEqual(aContextShape)) {
     theError = "Error: Local selection of wires not allowed.";
     return false;
   }
@@ -66,9 +68,10 @@ bool FeaturesPlugin_ValidatorPipePath::isValid(const AttributePtr& theAttribute,
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorPipeLocations::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                    const std::list<std::string>& theArguments,
-                                                    Events_InfoMessage& theError) const
+bool FeaturesPlugin_ValidatorPipeLocations::isValid(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<std::string>& theArguments,
+  Events_InfoMessage& theError) const
 {
   static const std::string aCreationMethodID = "creation_method";
   static const std::string aBaseObjectsID = "base_objects";
@@ -105,7 +108,8 @@ bool FeaturesPlugin_ValidatorPipeLocations::isValid(const std::shared_ptr<ModelA
     return false;
   }
 
-  if(aLocationsSelectionList->size() > 0 && aLocationsSelectionList->size() != aBaseObjectsSelectionList->size()) {
+  if(aLocationsSelectionList->size() > 0 && 
+     aLocationsSelectionList->size() != aBaseObjectsSelectionList->size()) {
     theError = "Error: Number of locations should be the same as base objects.";
     return false;
   }
@@ -114,7 +118,8 @@ bool FeaturesPlugin_ValidatorPipeLocations::isValid(const std::shared_ptr<ModelA
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorPipeLocations::isNotObligatory(std::string theFeature, std::string theAttribute)
+bool FeaturesPlugin_ValidatorPipeLocations::isNotObligatory(std::string theFeature, 
+                                                            std::string theAttribute)
 {
   return false;
 }
@@ -142,7 +147,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
   GeomAPI_DataMapOfShapeShape aSelectedWiresFromObjects;
   std::string anAttributeType = theAttribute->attributeType();
   if(anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
-    AttributeSelectionListPtr aListAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+    AttributeSelectionListPtr aListAttr =
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
     for(int anIndex = 0; anIndex < aListAttr->size(); ++anIndex) {
       AttributeSelectionPtr aSelectionAttr = aListAttr->value(anIndex);
       ResultPtr aContext = aSelectionAttr->context();
@@ -151,9 +157,11 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
         return false;
       }
 
-      ResultConstructionPtr aResultConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+      ResultConstructionPtr aResultConstruction = 
+        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
       if(!aResultConstruction.get()) {
-        // It is not a result construction. If shape is compound check that it contains only faces and edges.
+        // It is not a result construction. 
+        // If shape is compound check that it contains only faces and edges.
         GeomShapePtr aShape = aSelectionAttr->value();
         if(!aShape.get()) {
           aShape = aContext->shape();
@@ -177,8 +185,10 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
       GeomShapePtr aContextShape = aResultConstruction->shape();
       if(!aShape.get()) {
         // Whole sketch selected.
-        if(aSelectedSketchesFromObjects.find(aResultConstruction) != aSelectedSketchesFromObjects.cend()) {
-          theError = "Error: Object from this sketch is already selected. Sketch is not allowed for selection.";
+        if(aSelectedSketchesFromObjects.find(aResultConstruction) !=
+            aSelectedSketchesFromObjects.cend()) {
+          theError = "Error: Object from this sketch is already selected. \
+ Sketch is not allowed for selection.";
           return false;
         }
 
@@ -186,7 +196,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
       } else {
         // Object from sketch selected.
         if(aSelectedSketches.find(aResultConstruction) != aSelectedSketches.cend()) {
-          theError = "Error: Whole sketch with this object is already selected. Don't allow to select this object.";
+          theError = "Error: Whole sketch with this object is already selected. \
+ Don't allow to select this object.";
           return false;
         }
 
@@ -198,7 +209,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
           }
 
           if(aSelectedWiresFromObjects.isBound(aWire)) {
-            theError = "Error: Objects with such wire already selected. Don't allow to select this object.";
+            theError = 
+              "Error: Objects with such wire already selected. Don't allow to select this object.";
             return false;
           }
 
@@ -214,8 +226,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA
 
 //==================================================================================================
 bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const AttributePtr& theAttribute,
-                                                                 const std::list<std::string>& theArguments,
-                                                                 Events_InfoMessage& theError) const
+                                                        const std::list<std::string>& theArguments,
+                                                        Events_InfoMessage& theError) const
 {
   if(!theAttribute.get()) {
     theError = "Error: Empty attribute.";
@@ -224,7 +236,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute
 
   std::string anAttributeType = theAttribute->attributeType();
   if(anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
-    AttributeSelectionListPtr aListAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+    AttributeSelectionListPtr aListAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
     for(int anIndex = 0; anIndex < aListAttr->size(); ++anIndex) {
       // If at least one attribute is invalid, the result is false.
       if(!isValidAttribute(aListAttr->value(anIndex), theArguments, theError)) {
@@ -233,7 +246,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute
     }
   } else if(anAttributeType == ModelAPI_AttributeSelection::typeId()) {
     // Getting context.
-    AttributeSelectionPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
+    AttributeSelectionPtr anAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
     ResultPtr aContext = anAttr->context();
     if(!aContext.get()) {
       theError = "Error: Attribute have empty context.";
@@ -250,7 +264,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute
       return false;
     }
 
-    ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+    ResultConstructionPtr aConstruction = 
+      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
     if(aConstruction.get()) {
       // Construciotn selected. Check that is is not infinite.
       if(aConstruction->isInfinite()) {
@@ -265,7 +280,8 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute
         }
       } else {
         // Shape on construction selected. Check that it is a face or wire.
-        if(aShape->shapeType() == GeomAPI_Shape::WIRE || aShape->shapeType() == GeomAPI_Shape::FACE) {
+        if(aShape->shapeType() == GeomAPI_Shape::WIRE || 
+           aShape->shapeType() == GeomAPI_Shape::FACE) {
           return true;
         }
       }
@@ -275,14 +291,17 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute
 
     if(!aShape->isEqual(aContextShape)) {
       // Local selection on body does not allowed.
-      theError = "Error: Selected shape is in the local selection. Only global selection is allowed.";
+      theError =
+        "Error: Selected shape is in the local selection. Only global selection is allowed.";
       return false;
     }
 
     // Check that object is a shape with allowed type.
     GeomValidators_ShapeType aShapeTypeValidator;
     if(!aShapeTypeValidator.isValid(anAttr, theArguments, theError)) {
-      theError = "Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1";
+      theError = "Error: Selected shape has unacceptable type. Acceptable types are: faces or \
+ wires on sketch, whole sketch(if it has at least one face), \
+ and whole objects with shape types: %1";
       std::string anArgumentString;
       for(auto anIt = theArguments.cbegin(); anIt != theArguments.cend(); ++anIt) {
         if (!anArgumentString.empty())
@@ -351,16 +370,18 @@ bool FeaturesPlugin_ValidatorCompositeLauncher::isValid(const AttributePtr& theA
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                 const std::list<std::string>& theArguments,
-                                                 Events_InfoMessage& theError) const
+bool FeaturesPlugin_ValidatorExtrusionDir::isValid(
+                                               const std::shared_ptr<ModelAPI_Feature>& theFeature,
+                                               const std::list<std::string>& theArguments,
+                                               Events_InfoMessage& theError) const
 {
   if(theArguments.size() != 2) {
     theError = "Error: Validator should be used with 2 parameters for extrusion.";
     return false;
   }
 
-  std::list<std::string>::const_iterator anArgsIt = theArguments.begin(), aLast = theArguments.end();
+  std::list<std::string>::const_iterator 
+    anArgsIt = theArguments.begin(), aLast = theArguments.end();
 
   AttributePtr aCheckAttribute = theFeature->attribute(*anArgsIt);
   ++anArgsIt;
@@ -380,7 +401,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
   if(!aDirShape.get()) {
     // Check that dir can be empty.
     if(!isShapesCanBeEmpty(aCheckAttribute, theError)) {
-      theError = "Error: Base objects list contains vertex or edge, so attribute \"%1\" can not be used with default value. Select direction for extrusion.";
+      theError = "Error: Base objects list contains vertex or edge, so attribute \"%1\" \
+ can not be used with default value. Select direction for extrusion.";
       theError.arg(*anArgsIt);
       return false;
     } else {
@@ -391,7 +413,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
   std::shared_ptr<GeomAPI_Edge> aDirEdge(new GeomAPI_Edge(aDirShape));
 
   // If faces selected check that direction not parallel with them.
-  AttributeSelectionListPtr aListAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aCheckAttribute);
+  AttributeSelectionListPtr aListAttr = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aCheckAttribute);
   for(int anIndex = 0; anIndex < aListAttr->size(); ++anIndex) {
     AttributeSelectionPtr anAttr = aListAttr->value(anIndex);
     GeomShapePtr aShapeInList = anAttr->value();
@@ -399,8 +422,10 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
       aShapeInList = anAttr->context()->shape();
     }
     bool isParallel = true;
-    if(aShapeInList->shapeType() == GeomAPI_Shape::FACE || aShapeInList->shapeType() == GeomAPI_Shape::SHELL) {
-      for(GeomAPI_ShapeExplorer anExp(aShapeInList, GeomAPI_Shape::FACE); anExp.more(); anExp.next()) {
+    if(aShapeInList->shapeType() == GeomAPI_Shape::FACE || 
+       aShapeInList->shapeType() == GeomAPI_Shape::SHELL) {
+      for(GeomAPI_ShapeExplorer 
+          anExp(aShapeInList, GeomAPI_Shape::FACE); anExp.more(); anExp.next()) {
         std::shared_ptr<GeomAPI_Face> aFace(new GeomAPI_Face(anExp.current()));
         isParallel = GeomAlgoAPI_ShapeTools::isParallel(aDirEdge, aFace);
         if(isParallel) {
@@ -408,7 +433,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
         }
       }
     } else if(aShapeInList->shapeType() == GeomAPI_Shape::COMPOUND) {
-      std::shared_ptr<GeomAPI_PlanarEdges> aPlanarEdges = std::dynamic_pointer_cast<GeomAPI_PlanarEdges>(aShapeInList);
+      std::shared_ptr<GeomAPI_PlanarEdges> aPlanarEdges = 
+        std::dynamic_pointer_cast<GeomAPI_PlanarEdges>(aShapeInList);
       if(aPlanarEdges.get()) {
         std::shared_ptr<GeomAPI_Dir> aSketchDir = aPlanarEdges->norm();
         if(aDirEdge->isLine()) {
@@ -424,7 +450,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
       isParallel = false;
     }
     if(isParallel) {
-      theError = "Error: Direction is parallel to one of the selected face or face on selected shell.";
+      theError = 
+        "Error: Direction is parallel to one of the selected face or face on selected shell.";
       return false;
     }
   }
@@ -433,7 +460,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isValid(const std::shared_ptr<ModelAP
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorExtrusionDir::isNotObligatory(std::string theFeature, std::string theAttribute)
+bool FeaturesPlugin_ValidatorExtrusionDir::isNotObligatory(std::string theFeature, 
+                                                           std::string theAttribute)
 {
   return false;
 }
@@ -448,7 +476,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isShapesCanBeEmpty(const AttributePtr
 
   std::string anAttributeType = theAttribute->attributeType();
   if(anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
-    AttributeSelectionListPtr aListAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+    AttributeSelectionListPtr aListAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
     for(int anIndex = 0; anIndex < aListAttr->size(); ++anIndex) {
       // If at least one attribute is invalid, the result is false.
       if(!isShapesCanBeEmpty(aListAttr->value(anIndex), theError)) {
@@ -457,7 +486,8 @@ bool FeaturesPlugin_ValidatorExtrusionDir::isShapesCanBeEmpty(const AttributePtr
     }
   } else if(anAttributeType == ModelAPI_AttributeSelection::typeId()) {
     // Getting context.
-    AttributeSelectionPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
+    AttributeSelectionPtr anAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
     ResultPtr aContext = anAttr->context();
     if(!aContext.get()) {
       return false;
@@ -489,9 +519,11 @@ bool FeaturesPlugin_ValidatorBooleanSelection::isValid(const AttributePtr& theAt
                                                        const std::list<std::string>& theArguments,
                                                        Events_InfoMessage& theError) const
 {
-  AttributeSelectionListPtr anAttrSelectionList = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+  AttributeSelectionListPtr anAttrSelectionList = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
   if(!anAttrSelectionList.get()) {
-    theError = "Error: This validator can only work with selection list attributes in \"Boolean\" feature.";
+    theError = 
+      "Error: This validator can only work with selection list attributes in \"Boolean\" feature.";
     return false;
   }
   FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
@@ -554,10 +586,11 @@ bool FeaturesPlugin_ValidatorBooleanSelection::isValid(const AttributePtr& theAt
 
 //==================================================================================================
 bool FeaturesPlugin_ValidatorPartitionSelection::isValid(const AttributePtr& theAttribute,
-                                                         const std::list<std::string>& theArguments,
-                                                         Events_InfoMessage& theError) const
+                                                       const std::list<std::string>& theArguments,
+                                                       Events_InfoMessage& theError) const
 {
-  AttributeSelectionListPtr anAttrSelectionList = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+  AttributeSelectionListPtr anAttrSelectionList = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
   if(!anAttrSelectionList.get()) {
     theError = "Error: This validator can only work with selection list in \"Partition\" feature.";
     return false;
@@ -577,13 +610,15 @@ bool FeaturesPlugin_ValidatorPartitionSelection::isValid(const AttributePtr& the
     }
 
     ResultPtr aContext = aSelectAttr->context();
-    ResultConstructionPtr aResultConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+    ResultConstructionPtr aResultConstruction = 
+      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
     if(aResultConstruction.get()) {
       theError = "Error: Only body shapes and construction planes are allowed for selection.";
       return false;
     }
 
-    ResultCompSolidPtr aResultCompsolid = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aContext);
+    ResultCompSolidPtr aResultCompsolid = 
+      std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aContext);
     if(aResultCompsolid.get()) {
       continue;
     }
@@ -598,12 +633,14 @@ bool FeaturesPlugin_ValidatorPartitionSelection::isValid(const AttributePtr& the
 
 //==================================================================================================
 bool FeaturesPlugin_ValidatorRemoveSubShapesSelection::isValid(const AttributePtr& theAttribute,
-                                                               const std::list<std::string>& theArguments,
-                                                               Events_InfoMessage& theError) const
+                                                     const std::list<std::string>& theArguments,
+                                                     Events_InfoMessage& theError) const
 {
-  AttributeSelectionListPtr aSubShapesAttrList = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+  AttributeSelectionListPtr aSubShapesAttrList = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
   if(!aSubShapesAttrList.get()) {
-    theError = "Error: This validator can only work with selection list in \"Remove Sub-Shapes\" feature.";
+    theError = 
+      "Error: This validator can only work with selection list in \"Remove Sub-Shapes\" feature.";
     return false;
   }
 
@@ -651,9 +688,10 @@ bool FeaturesPlugin_ValidatorRemoveSubShapesSelection::isValid(const AttributePt
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorRemoveSubShapesResult::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                            const std::list<std::string>& theArguments,
-                                                            Events_InfoMessage& theError) const
+bool FeaturesPlugin_ValidatorRemoveSubShapesResult::isValid(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<std::string>& theArguments,
+  Events_InfoMessage& theError) const
 {
   static const std::string aBaseShapeID = "base_shape";
   static const std::string aSubShapesID = "subshapes";
@@ -714,7 +752,8 @@ bool FeaturesPlugin_ValidatorUnionSelection::isValid(const AttributePtr& theAttr
                                                      const std::list<std::string>& theArguments,
                                                      Events_InfoMessage& theError) const
 {
-  AttributeSelectionListPtr aBaseObjectsAttrList = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+  AttributeSelectionListPtr aBaseObjectsAttrList = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
   if(!aBaseObjectsAttrList.get()) {
     theError = "Error: This validator can only work with selection list in \"%1\" feature.";
     theError.arg(FeaturesPlugin_Union::ID());
@@ -724,7 +763,8 @@ bool FeaturesPlugin_ValidatorUnionSelection::isValid(const AttributePtr& theAttr
   for(int anIndex = 0; anIndex < aBaseObjectsAttrList->size(); ++anIndex) {
     bool isSameFound = false;
     AttributeSelectionPtr anAttrSelectionInList = aBaseObjectsAttrList->value(anIndex);
-    ResultCompSolidPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(anAttrSelectionInList->context());
+    ResultCompSolidPtr aResult = 
+      std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(anAttrSelectionInList->context());
     if(!aResult.get()) {
       continue;
     }
@@ -738,9 +778,10 @@ bool FeaturesPlugin_ValidatorUnionSelection::isValid(const AttributePtr& theAttr
 }
 
 //==================================================================================================
-bool FeaturesPlugin_ValidatorUnionArguments::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                     const std::list<std::string>& theArguments,
-                                                     Events_InfoMessage& theError) const
+bool FeaturesPlugin_ValidatorUnionArguments::isValid(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<std::string>& theArguments,
+  Events_InfoMessage& theError) const
 {
   // Check feature kind.
   if(theFeature->getKind() != FeaturesPlugin_Union::ID()) {
@@ -750,7 +791,8 @@ bool FeaturesPlugin_ValidatorUnionArguments::isValid(const std::shared_ptr<Model
   }
 
   // Get base objects attribute list.
-  AttributeSelectionListPtr aBaseObejctsAttrList = theFeature->selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr aBaseObejctsAttrList = 
+    theFeature->selectionList(FeaturesPlugin_Union::BASE_OBJECTS_ID());
   if(!aBaseObejctsAttrList.get()) {
     theError = "Error: Could not get \"%1\" attribute.";
     theError.arg(FeaturesPlugin_Union::BASE_OBJECTS_ID());