]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Fix for the issue #2903 : Crash when creating a group on all faces
authormpv <mpv@opencascade.com>
Tue, 9 Apr 2019 11:50:36 +0000 (14:50 +0300)
committermpv <mpv@opencascade.com>
Tue, 9 Apr 2019 11:50:36 +0000 (14:50 +0300)
Prevent user from selection of features and results used in other features and both with concealment ability.

src/Model/Model_AttributeValidator.cpp
src/ModelAPI/CMakeLists.txt
src/ModelAPI/Test/Test2903.py [new file with mode: 0644]

index cef7202906378c2136bb1aebb90f1f25ae632976..659082b054c8221a26838c7e1431bdae28c12ec1 100644 (file)
 
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeInteger.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultPart.h>
 
 #include <GeomDataAPI_Point.h>
 #include <GeomDataAPI_Point2D.h>
@@ -82,6 +86,69 @@ bool Model_AttributeValidator::isValid(const AttributePtr& theAttribute,
       theError.arg(anErrorMessage);
       return false;
     }
+  } else { // #2903 : check that concealed attribute refers to already concealed result
+    FeaturePtr aFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
+
+    std::set<ObjectPtr> alreadyProcessed; // optimization
+    if (aFeat.get() &&
+        ModelAPI_Session::get()->validators()->isConcealed(aFeat->getKind(), theAttribute->id())) {
+      std::list<std::pair<std::string, std::list<ObjectPtr> > > allRefs;
+      aFeat->data()->referencesToObjects(allRefs);
+      std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator anIter = allRefs.begin();
+      for(; anIter != allRefs.end(); anIter++) {
+        if (anIter->first == theAttribute->id()) {
+          const std::list<ObjectPtr>& aReferencedList = anIter->second;
+          std::list<ObjectPtr>::const_iterator aRefIter = aReferencedList.cbegin();
+          for(; aRefIter != aReferencedList.cend(); aRefIter++) {
+            const ObjectPtr& aReferenced = *aRefIter;
+            // get all results and feature that is referenced to see all references to them
+            FeaturePtr aReferencedFeature;
+            if (aReferenced->groupName() == ModelAPI_Feature::group()) {
+              aReferencedFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aReferenced);
+            } else {
+              aReferencedFeature = aReferenced->document()->feature(
+                std::dynamic_pointer_cast<ModelAPI_Result>(aReferenced));
+            }
+            if (alreadyProcessed.count(aReferencedFeature))
+              continue;
+            alreadyProcessed.insert(aReferencedFeature);
+            std::list<ResultPtr> aReferencedResults;
+            ModelAPI_Tools::allResults(aReferencedFeature, aReferencedResults);
+            std::list<ResultPtr>::iterator aRefRes = aReferencedResults.begin();
+            bool aCheckFeature = true; // the last iteration to check the feature
+            while(aRefRes != aReferencedResults.end() || aCheckFeature) {
+              ObjectPtr aRefd;
+              if (aRefRes == aReferencedResults.end()) {
+                aRefd = aReferencedFeature;
+                aCheckFeature = false;
+              } else {
+                aRefd = *aRefRes;
+                if (aRefd->groupName() != ModelAPI_ResultBody::group() &&
+                    aRefd->groupName() != ModelAPI_ResultPart::group())
+                  break;
+              }
+              if (!aRefd->data().get() || !aRefd->data()->isValid())
+                continue;
+              const std::set<AttributePtr>& aRefsToRef = aRefd->data()->refsToMe();
+              std::set<AttributePtr>::const_iterator aRR = aRefsToRef.cbegin();
+              for(; aRR != aRefsToRef.cend(); aRR++) {
+                FeaturePtr aRefFeat = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRR)->owner());
+                if (!aRefFeat.get() || aRefFeat == aFeat)
+                  continue;
+                if (ModelAPI_Session::get()->validators()->isConcealed(
+                    aRefFeat->getKind(), (*aRR)->id())) {
+                  theError = "Reference to concealed object %1";
+                  theError.arg(aRefd->data()->name());
+                  return false;
+                }
+              }
+              if (aCheckFeature)
+                aRefRes++;
+            }
+          }
+        }
+      }
+    }
   }
   return true;
 }
index dbb19965cad7914ae46dc31101d158177bad3d68..27bf507126f6c65d5064aecd04f5de07aa58e351 100644 (file)
@@ -245,4 +245,5 @@ ADD_UNIT_TESTS(TestConstants.py
                Test2859.py
                Test2873.py
                Test2901.py
+               Test2903.py
 )
diff --git a/src/ModelAPI/Test/Test2903.py b/src/ModelAPI/Test/Test2903.py
new file mode 100644 (file)
index 0000000..b97b1e6
--- /dev/null
@@ -0,0 +1,41 @@
+# 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
+#
+
+from salome.shaper import model
+from ModelAPI import *
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+Cylinder_1 = model.addCylinder(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 5, 10)
+Sphere_1 = model.addSphere(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), 10)
+Fuse_1 = model.addFuse(Part_1_doc, [model.selection("COMPOUND", "all-in-Box_1"), model.selection("COMPOUND", "all-in-Cylinder_1")], True)
+Partition_1 = model.addPartition(Part_1_doc, [model.selection("COMPOUND", "all-in-Fuse_1"), model.selection("COMPOUND", "all-in-Sphere_1")])
+model.do()
+aFactory = ModelAPI_Session.get().validators()
+assert(aFactory.validate(Fuse_1.feature()))
+assert(aFactory.validate(Partition_1.feature()))
+# Modify Fuse to add sphere thatwas used in Partition
+Fuse_1.setMainObjects([model.selection("COMPOUND", "all-in-Box_1"), model.selection("COMPOUND", "all-in-Cylinder_1"), model.selection("COMPOUND", "all-in-Sphere_1")])
+model.end()
+# both fuse and partition must become invalid because both refer to the same object
+assert(not aFactory.validate(Fuse_1.feature()))
+assert(not aFactory.validate(Partition_1.feature()))