Lot2 : Shared Faces integration review fixes

diff --git a/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.cpp b/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.cpp
index 354452e23494bf128f89d8a1ebd067cf5764d3c4..e361a3b95167b8800d38e68c04c238b779bfa3fa 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.cpp
@@ -69,8 +69,6 @@ void FeaturesPlugin_CommonSharedFaces::updateFaces()
       ListOfShape::const_iterator anIt = aFaces.cbegin();
       for(; anIt != aFaces.cend(); ++anIt) {
         GeomShapePtr aFacePtr = *anIt;
-        if (!aFacePtr.get())
-          setError("GetSharedFaces : An invalid face found " +  anError);
         aFacesListAttr->append( aCompSolidAttr->context(), aFacePtr);
       }
       std::stringstream aLabel;

diff --git a/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.h b/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.h
index dead172f8e1ffb5f0a2e5a98abfd84d7e53798f3..2f134aad207f8b7d4425785bca1ec5f43f08b126 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_CommonSharedFaces.h
@@ -26,10 +26,6 @@
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_ResultGroup.h>
 
-#include <GeomAPI_IPresentable.h>
-#include <GeomAPI_IScreenParams.h>
-
-
 /// \class FeaturesPlugin_CommonSharedFaces
 /// \ingroup Plugins
 /// \brief Feature to check the shared faces of solid

diff --git a/src/FeaturesPlugin/FeaturesPlugin_GroupSharedFaces.cpp b/src/FeaturesPlugin/FeaturesPlugin_GroupSharedFaces.cpp
index 258085a59acc52c3029ecef73eb19591d5d5f3e8..0335121305026be407725a9ea17237d9ca3fb327 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_GroupSharedFaces.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_GroupSharedFaces.cpp
@@ -31,11 +31,6 @@
 #include <ModelAPI_Tools.h>
 #include <ModelAPI_Validator.h>
 
-#include <GeomAPI_ShapeIterator.h>
-
-#include <GeomAlgoAPI_CompoundBuilder.h>
-#include <GeomAlgoAPI_ShapeTools.h>
-
 #include <Locale_Convert.h>
 
 //=================================================================================================

diff --git a/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp b/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
index fa9f441abe60dffb525674a4e5140d302df356e5..78952756b90ab8e8c03e5d422c4a361350642689 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
@@ -33,12 +33,6 @@
 #include <ModelAPI_Tools.h>
 #include <ModelAPI_Validator.h>
 
-#include <GeomAPI_ShapeIterator.h>
-
-#include <GeomAlgoAPI_CompoundBuilder.h>
-#include <GeomAlgoAPI_ShapeTools.h>
-#include <GeomAlgoAPI_SharedFaces.h>
-
 //=================================================================================================
 FeaturesPlugin_SharedFaces::FeaturesPlugin_SharedFaces()
 {

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 32d26c4438f171e7a2186a245a1fe3c90fc6b875..12fdc52ae618cc4bc09c5e8141374d906e571a76 100644 (file)
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -134,7 +134,7 @@
         <source path="chamfer_widget.xml"/>
       </feature>
       <feature id="FusionFaces" title="Fuse Faces" tooltip="Performs fusion of connected faces"
-               icon="icons/Features/fusion_faces.png" auto_preview="true" helpfile="FeaturesPlugin/fusionFacesFeature.html">
+               icon="icons/Features/fusion_faces.png" auto_preview="true" helpfile="fusionFacesFeature.html">
         <source path="fusion_faces_widget.xml"/>
       </feature>
       <feature id="Defeaturing" title="Defeaturing" tooltip="Perform removing faces from solid"

diff --git a/src/FeaturesPlugin/shared_Faces_macro_widget.xml b/src/FeaturesPlugin/shared_Faces_macro_widget.xml
index b9031cff278cdbc5b0523f59f56659d660a030e0..74b6f8c3d2a250f7309c6838079163335c192cf4 100644 (file)
--- a/src/FeaturesPlugin/shared_Faces_macro_widget.xml
+++ b/src/FeaturesPlugin/shared_Faces_macro_widget.xml
@@ -29,6 +29,5 @@
   </integervalue>
   <optionalbox id="create_group" title="Create group" show_title="true">
     <stringvalue id="group_name" label="Group name"/>
-    <label/>
   </optionalbox>
 </source>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
index 2792421df34813faa028533738603355807a203d..073c542d360ec9faff86b70f1278e4e21b470c13 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
@@ -69,8 +69,7 @@ bool GetSharedFaces(const ListOfShape& theShapes,
   #ifdef _DEBUG
   std::cout << "GetSharedFaces " << std::endl;
   #endif
-  int aLen = theShapes.size();
-  if (aLen < 1) return NULL;
+  if (theShapes.empty()) return false;
 
   TopAbs_ShapeEnum aShapeType = TopAbs_FACE;
 

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
index 5c3ba1fdce92ffb46dd1dfb8473e9cecf0ad29b9..4ae19191d04b402ab1ce84213dc26d5c57f51d2e 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
@@ -23,9 +23,7 @@
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
 
-#include <Standard_TypeDef.hxx>
-
-/// get the boundin box of theshape.
+/// get the object shared faces
 /// \param theShape   the shape
 /// \param theTolerance precise TRUE for precise computation; FALSE for fast one.
 /// \param theFaces  the faces shared