X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_IntersectionSelection.cpp;h=b539b8748355450bf20ae83bfaa028522e1076fb;hb=97c06c5cd9fc736f9b5a1dacde369a9d7b5be703;hp=e3899d7f53ec0267282ccaa7f5673b4e9c51c565;hpb=e7fcc6b20ce1a628ba679d5ca843c6d3d0478020;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_IntersectionSelection.cpp b/src/GeomValidators/GeomValidators_IntersectionSelection.cpp
index e3899d7f5..b539b8748 100644
--- a/src/GeomValidators/GeomValidators_IntersectionSelection.cpp
+++ b/src/GeomValidators/GeomValidators_IntersectionSelection.cpp
@@ -1,37 +1,61 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_IntersectionSelection.cpp
-// Created:     16 Feb 2016
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "GeomValidators_IntersectionSelection.h"
 
+#include <GeomAPI_Shape.h>
+
+#include <Events_InfoMessage.h>
+
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Feature.h>
 
 bool GeomValidators_IntersectionSelection::isValid(const AttributePtr& theAttribute,
                                                    const std::list<std::string>& theArguments,
-                                                   std::string& theError) const
+                                                   Events_InfoMessage& theError) const
 {
   if(!theAttribute.get()) {
     theError = "Error: empty selection.";
     return false;
   }
   FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
-  AttributeSelectionListPtr anAttrSelectionList = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
+  AttributeSelectionListPtr anAttrSelectionList =
+    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);
   for(int anIndex = 0; anIndex < anAttrSelectionList->size(); ++anIndex) {
     AttributeSelectionPtr anAttrSelection = anAttrSelectionList->value(anIndex);
     if(!anAttrSelection.get()) {
       theError = "Error: empty attribute selection.";
       return false;
     }
+    FeaturePtr aFeature;
     ResultPtr aContext = anAttrSelection->context();
     if(!aContext.get()) {
-      theError = "Error: empty selection context.";
-      return false;
+      aFeature = anAttrSelection->contextFeature();
+      if (!aFeature.get()) {
+        theError = "Error: Empty selection context.";
+        return false;
+      }
+    } else {
+      aFeature = ModelAPI_Feature::feature(aContext);
     }
-    FeaturePtr aFeature = ModelAPI_Feature::feature(aContext);
+
     if(!aFeature.get()) {
       theError = "Error: empty feature.";
       return false;
@@ -40,19 +64,24 @@ bool GeomValidators_IntersectionSelection::isValid(const AttributePtr& theAttrib
     if(aFeatureKind == "Sketch" ||
        aFeatureKind == "Plane" ||
        aFeatureKind == "Axis") {
-      theError = "Error: ";
-      theError += aFeatureKind;
-      theError += " shape is not allowed for selection.";
+      theError = "Error: %1 shape is not allowed for selection.";
+      theError.arg(aFeatureKind);
       return false;
     }
     std::shared_ptr<GeomAPI_Shape> aShape = anAttrSelection->value();
+    GeomShapePtr aContextShape = aContext->shape();
     if(!aShape.get()) {
-      aShape = aContext->shape();
+      aShape = aContextShape;
     }
     if(!aShape.get()) {
       theError = "Error: empty shape.";
       return false;
     }
+    if(!aShape->isEqual(aContextShape)) {
+      theError = "Error: Local selection not allowed.";
+      return false;
+    }
+
     int aShapeType = aShape->shapeType();
     // Allow to select edges, faces and solids.
     if(aShapeType != GeomAPI_Shape::EDGE &&