X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FModel%2FModel_SelectionNaming.h;h=e9973deb3c3d6f8ee48ba0f7d60d6d27d8ac73e4;hb=38dd97c8f7a3605ec6c362c3aefdefa3ee2675be;hp=82f1eca7a09c028cbdc8e614aed149fc1005bb7f;hpb=47f93d1e56aff0b9c0515b0e767cbc46ef576ec4;p=modules%2Fshaper.git

diff --git a/src/Model/Model_SelectionNaming.h b/src/Model/Model_SelectionNaming.h
index 82f1eca7a..e9973deb3 100644
--- a/src/Model/Model_SelectionNaming.h
+++ b/src/Model/Model_SelectionNaming.h
@@ -30,8 +30,8 @@ public:
 
   /// Produces the string-name for the selected shape
   std::string namingName(ResultPtr& theContext, std::shared_ptr<GeomAPI_Shape> theSubSh,
-    const std::string& theDefaultName);
-  
+    const std::string& theDefaultName, const bool theAnotherDoc);
+
   /// Makes a selection by the string-name
   /// \param theType string of the type of the shape
   /// \param theSubShapeName string-identifier of the selected shape
@@ -42,13 +42,17 @@ public:
     std::shared_ptr<Model_Document> theDoc, std::shared_ptr<GeomAPI_Shape>& theShapeToBeSelected,
     std::shared_ptr<ModelAPI_Result>& theCont);
 
-  /// Searches the face more appropriate to the given curves (with higher level of matched parameters)
+  /// Searches the face more appropriate to the given curves
+  /// (with higher level of matched parameters)
   /// \param theConstr construction result that contains one or several  faces
-  /// \param theCurves map from the face edges curves to orientation (-1 reversed, 0 unknown, 1 forward)
+  /// \param theCurves map from the face edges curves to orientation
+  ///                  (-1 reversed, 0 unknown, 1 forward)
+  /// \param theIsWire for wire algorithm isquite the same,
+  ///                  but if in face several wires, it returns the needed wire
   /// \returns faces fron this construction if found
   static std::shared_ptr<GeomAPI_Shape> findAppropriateFace(
-    std::shared_ptr<ModelAPI_Result>& theConstr, 
-    NCollection_DataMap<Handle(Geom_Curve), int>& theCurves);
+    std::shared_ptr<ModelAPI_Result>& theConstr,
+    NCollection_DataMap<Handle(Geom_Curve), int>& theCurves, const bool theIsWire);
 
   /// Returns orientation of the edge in the context shape
   static int edgeOrientation(const TopoDS_Shape& theContext, TopoDS_Edge& theEdge);
@@ -64,7 +68,7 @@ public:
 protected:
   /// Gets the stored name from the document
   std::string getShapeName(std::shared_ptr<Model_Document> theDoc, const TopoDS_Shape& theShape,
-    const bool theAddContextName);
+    ResultPtr& theContext, const bool theAnotherDoc, const bool theWholeContext);
 };
 
 #endif