Fix for Issue #359 : implement the method of validator

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 01b66978090198dfd92624ff87ca61e941e795de..64479abe1243c553a1f0c09fd23e9b27dea11e2a 100644 (file)
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -160,14 +160,16 @@ class Model_Data : public ModelAPI_Data
   // returns all objects referenced to this
   MODEL_EXPORT virtual const std::set<AttributePtr>& refsToMe() {return myRefsToMe;}
 
+  // returns all references by attributes of this data
+  // \param theRefs returned list of pairs: id of referenced attribute and list of referenced objects
+  MODEL_EXPORT virtual void referencesToObjects(
+    std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs);
+
 private:
   // removes all information about back references
   void eraseBackReferences();
   // adds a back reference (with identifier which attribute references to this object
   void addBackReference(FeaturePtr theFeature, std::string theAttrID);
-  // returns all references by attributes of this data
-  // \param the returned list of pairs: id of referenced attribute and list of referenced objects
-  void referencesToObjects(std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs);
 };
 
 #endif

diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index 14d191b08bb4556e9cca2264e68dc34ff07f6829..03e21b36fef4ae3f239c4f87f496b714607e82fb 100644 (file)
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -26,6 +26,7 @@ class ModelAPI_Attribute;
 class ModelAPI_Feature;
 class ModelAPI_AttributeSelection;
 class ModelAPI_AttributeSelectionList;
+class ModelAPI_Object;
 class GeomAPI_Shape;
 
 /// Enumeration that contains the execution status of the Object
@@ -126,6 +127,10 @@ class MODELAPI_EXPORT ModelAPI_Data
  // returns all objects referenced to this
   virtual const std::set<std::shared_ptr<ModelAPI_Attribute> >& refsToMe() = 0;
 
+  // returns all references by attributes of this data
+  // \param theRefs returned list of pairs: id of referenced attribute and list of referenced objects
+  virtual void referencesToObjects(
+    std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >& theRefs) = 0;
  protected:
   /// Objects are created for features automatically
   ModelAPI_Data()

diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp
index 69c488639f9e7287e05406cb7b1ba60b7f7e06ae..c4e4417678b033d667f9fb93402366b8b88e0550 100644 (file)
--- a/src/PartSet/PartSet_Validators.cpp
+++ b/src/PartSet/PartSet_Validators.cpp
@@ -16,6 +16,7 @@
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeReference.h>
+#include <ModelAPI_Object.h>
 
 #include <SketchPlugin_Sketch.h>
 
@@ -170,7 +171,31 @@ bool PartSet_DifferentObjectsValidator::isValid(const FeaturePtr& theFeature,
 bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute, 
                                                 const std::list<std::string>& theArguments) const
 {
-  // not implemented
+  std::list<std::pair<std::string, std::list<ObjectPtr> > > allRefs;
+  if (theAttribute->owner().get() && theAttribute->owner()->data().get())
+    theAttribute->owner()->data()->referencesToObjects(allRefs);
+  // collect object referenced by theAttribute
+  std::list<ObjectPtr>* anAttrObjs = 0;
+  std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRefIter = allRefs.begin();
+  for(; aRefIter != allRefs.end(); aRefIter++) {
+    if (theAttribute->id() == aRefIter->first)
+      anAttrObjs = &(aRefIter->second);
+  }
+  if (!anAttrObjs || anAttrObjs->empty())
+    return true; // theAttribute does not references to anything
+  // check with all others
+  for(aRefIter = allRefs.begin(); aRefIter != allRefs.end(); aRefIter++) {
+    if (theAttribute->id() == aRefIter->first)
+      continue; // do not check with myself
+    std::list<ObjectPtr>::iterator aReferenced = aRefIter->second.begin();
+    for(; aReferenced != aRefIter->second.end(); aReferenced++) {
+      std::list<ObjectPtr>::iterator aReferencedByMe = anAttrObjs->begin();
+      for(; aReferencedByMe != anAttrObjs->end(); aReferencedByMe++) {
+        if (*aReferenced == *aReferencedByMe) // found same objects!
+          return false;
+      }
+    }
+  }
   return true;
 }