X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_BooleanArguments.cpp;h=7c16a62631e70828dd67561eda77187fba0b685a;hb=d5b5ce2284869d8b97ce638502c58c810bbeb0c7;hp=c8a75ead58c3c381878b42e444e02b263b2d0604;hpb=a95effb94656e5d4721f86ccb6ffbc2572bb1214;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_BooleanArguments.cpp b/src/GeomValidators/GeomValidators_BooleanArguments.cpp
index c8a75ead5..7c16a6263 100644
--- a/src/GeomValidators/GeomValidators_BooleanArguments.cpp
+++ b/src/GeomValidators/GeomValidators_BooleanArguments.cpp
@@ -1,20 +1,39 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_BooleanArguments.cpp
-// Created:     30 June 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <GeomValidators_BooleanArguments.h>
 
+#include <Events_InfoMessage.h>
+
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_Tools.h>
 
 //=================================================================================================
 bool GeomValidators_BooleanArguments::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                               const std::list<std::string>& theArguments,
-                                              std::string& theError) const
+                                              Events_InfoMessage& theError) const
 {
   if(theArguments.size() != 3) {
+    theError = "Wrong number of arguments (expected 3).";
     return false;
   }
 
@@ -23,15 +42,51 @@ bool GeomValidators_BooleanArguments::isValid(const std::shared_ptr<ModelAPI_Fea
 
   std::list<std::string>::const_iterator anIt = theArguments.begin(), aLast = theArguments.end();
 
-  std::shared_ptr<ModelAPI_AttributeSelectionList> anAttrSelList = theFeature->selectionList(*anIt);
+  bool isAllInSameCompSolid = true;
+  ResultCompSolidPtr aCompSolid;
+
+  AttributeSelectionListPtr anAttrSelList = theFeature->selectionList(*anIt);
   if(anAttrSelList) {
     anObjectsNb = anAttrSelList->size();
+    for(int anIndex = 0; anIndex < anObjectsNb; ++anIndex) {
+      AttributeSelectionPtr anAttr = anAttrSelList->value(anIndex);
+      ResultPtr aContext = anAttr->context();
+      ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aContext);
+      if(aResCompSolidPtr.get()) {
+        if(aCompSolid.get()) {
+          isAllInSameCompSolid = aCompSolid == aResCompSolidPtr;
+        } else {
+          aCompSolid = aResCompSolidPtr;
+        }
+      } else {
+        isAllInSameCompSolid = false;
+        break;
+      }
+    }
   }
   anIt++;
 
+
   anAttrSelList = theFeature->selectionList(*anIt);
   if(anAttrSelList) {
     aToolsNb = anAttrSelList->size();
+    if(isAllInSameCompSolid) {
+      for(int anIndex = 0; anIndex < aToolsNb; ++anIndex) {
+        AttributeSelectionPtr anAttr = anAttrSelList->value(anIndex);
+        ResultPtr aContext = anAttr->context();
+        ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aContext);
+        if(aResCompSolidPtr.get()) {
+          if(aCompSolid.get()) {
+            isAllInSameCompSolid = aCompSolid == aResCompSolidPtr;
+          } else {
+            aCompSolid = aResCompSolidPtr;
+          }
+        } else {
+          isAllInSameCompSolid = false;
+          break;
+        }
+      }
+    }
   }
   anIt++;
 
@@ -40,18 +95,36 @@ bool GeomValidators_BooleanArguments::isValid(const std::shared_ptr<ModelAPI_Fea
     anOperationType = anAttrInt->value();
   }
 
-  if(anOperationType == 1 && (anObjectsNb + aToolsNb > 1)) {
-    return true;
-  } else if (anOperationType != 1 && anObjectsNb > 0 && aToolsNb > 0) {
-    return true;
+  if(anOperationType == 1) {
+    // Fuse operation
+    if(anObjectsNb + aToolsNb < 2) {
+      theError = "Not enough arguments for Fuse operation.";
+      return false;
+    } else if(isAllInSameCompSolid) {
+      theError = "Operations only between sub-shapes of the same shape not allowed.";
+      return false;
+    }
+  } else {
+    if(anObjectsNb < 1) {
+      theError = "Objects not selected.";
+      return false;
+    }
+    if(aToolsNb < 1) {
+      theError = "Tools not selected.";
+      return false;
+    }
+    if(isAllInSameCompSolid) {
+      theError = "Operations only between sub-shapes of the same shape not allowed.";
+      return false;
+    }
   }
 
-  theError = "Not enough arguments";
-  return false;
+  return true;
 }
 
 //=================================================================================================
-bool GeomValidators_BooleanArguments::isNotObligatory(std::string theFeature, std::string theAttribute)
+bool GeomValidators_BooleanArguments::isNotObligatory(std::string theFeature,
+                                                      std::string theAttribute)
 {
   if(theAttribute == "main_objects" || theAttribute == "tool_objects") {
     return true;