X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiTranslation.cpp;h=3e6a702b6ae1ee350584a72fbaf2997206785781;hb=20d233731eaae06b9a75280a2ca675bc9a11cc72;hp=064b9336327876e2d02fca86f56deed9c1b79c55;hpb=3d063c74ca0ff72184f77d74df198c3bf0730aff;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
old mode 100644
new mode 100755
index 064b93363..3e6a702b6
--- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
@@ -13,7 +13,6 @@
 #include <ModelAPI_Data.h>
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_AttributeRefList.h>
-#include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
@@ -31,17 +30,20 @@ void SketchPlugin_MultiTranslation::initAttributes()
   data()->addAttribute(NUMBER_OF_COPIES_ID(), ModelAPI_AttributeInteger::typeId());
   data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId());
   data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId());
-  AttributeSelectionListPtr aSelection = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
-    TRANSLATION_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
-  aSelection->setSelectionType("EDGE");
+  data()->addAttribute(TRANSLATION_LIST_ID(), ModelAPI_AttributeRefList::typeId());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B());
 }
 
 void SketchPlugin_MultiTranslation::execute()
 {
-  AttributeSelectionListPtr aTranslationObjectRefs = selectionList(TRANSLATION_LIST_ID());
+  if (!sketch()) {
+    // it is possible, that this method is called before this feature has back reference to sketch
+    // in this case, the execute is performed after this is done
+    return;
+  }
+
+  AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID());
   int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value();
 
   // Calculate shift vector
@@ -51,6 +53,11 @@ void SketchPlugin_MultiTranslation::execute()
       attribute(END_POINT_ID()));
   if (!aStart || !aEnd || !aStart->isInitialized() || !aEnd->isInitialized())
     return;
+
+  // make a visible points
+  SketchPlugin_Sketch::createPoint2DResult(this, sketch(), START_POINT_ID(), 0);
+  SketchPlugin_Sketch::createPoint2DResult(this, sketch(), END_POINT_ID(), 1);
+
   std::shared_ptr<GeomAPI_XY> aShiftVec(new GeomAPI_XY(aEnd->x() - aStart->x(), aEnd->y() - aStart->y()));
 
   // Wait all objects being created, then send update events
@@ -68,20 +75,21 @@ void SketchPlugin_MultiTranslation::execute()
       aRefListOfTranslated->size() / aRefListOfShapes->size() - 1 : 0;
   std::list<ObjectPtr> anInitialList = aRefListOfShapes->list();
   std::list<ObjectPtr> aTargetList = aRefListOfTranslated->list();
-  std::list<ResultPtr> anAddition;
+  std::list<ObjectPtr> anAddition;
   std::vector<bool> isUsed(anInitialList.size(), false);
   // collect new items and check the items to remove
   for(int anInd = 0; anInd < aTranslationObjectRefs->size(); anInd++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> aSelect = aTranslationObjectRefs->value(anInd);
+    //std::shared_ptr<ModelAPI_AttributeSelection> aSelect = aTranslationObjectRefs->value(anInd);
+    ObjectPtr anObject = aTranslationObjectRefs->object(anInd);
     std::list<ObjectPtr>::const_iterator anIt = anInitialList.begin();
     std::vector<bool>::iterator aUsedIt = isUsed.begin();
     for (; anIt != anInitialList.end(); anIt++, aUsedIt++)
-      if (*anIt == aSelect->context()) {
+      if (*anIt == anObject) {
         *aUsedIt = true;
         break;
       }
     if (anIt == anInitialList.end())
-      anAddition.push_back(aSelect->context());
+      anAddition.push_back(anObject);
   }
   // remove unused items
   std::list<ObjectPtr>::iterator anInitIter = anInitialList.begin();
@@ -90,6 +98,7 @@ void SketchPlugin_MultiTranslation::execute()
   for (; aUsedIter != isUsed.end(); aUsedIter++) {
     if (!(*aUsedIter)) {
       aRefListOfShapes->remove(*anInitIter);
+      aRefListOfTranslated->remove(*aTargetIter++);
       for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) {
         aRefListOfTranslated->remove(*aTargetIter);
         // remove the corresponding feature from the sketch
@@ -153,7 +162,7 @@ void SketchPlugin_MultiTranslation::execute()
       aRefListOfTranslated->append(*aTargetIter);
   }
   // add new items
-  std::list<ResultPtr>::iterator anAddIter = anAddition.begin();
+  std::list<ObjectPtr>::iterator anAddIter = anAddition.begin();
   for (; anAddIter != anAddition.end(); anAddIter++) {
     aRefListOfShapes->append(*anAddIter);
     aRefListOfTranslated->append(*anAddIter);
@@ -187,10 +196,9 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject)
   if (!aFeature || !aResult)
     return ObjectPtr();
 
-  FeaturePtr aNewFeature = sketch()->addFeature(aFeature->getKind());
-  aFeature->data()->copyTo(aNewFeature->data());
-  aNewFeature->execute();
+  FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch());
 
+  aNewFeature->execute();
   static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
   ModelAPI_EventCreator::get()->sendUpdated(aNewFeature, aRedisplayEvent);
 
@@ -208,3 +216,36 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject)
   }
   return ObjectPtr();
 }
+
+void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID)
+{
+  if (theID == TRANSLATION_LIST_ID()) {
+    AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID());
+    if (aTranslationObjectRefs->size() == 0) {
+      int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value();
+      // Clear list of objects
+      AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
+          data()->attribute(SketchPlugin_Constraint::ENTITY_B()));
+      std::list<ObjectPtr> aTargetList = aRefListOfTranslated->list();
+      std::list<ObjectPtr>::iterator aTargetIter = aTargetList.begin();
+      while (aTargetIter != aTargetList.end()) {
+        aTargetIter++;
+        for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) {
+          aRefListOfTranslated->remove(*aTargetIter);
+          // remove the corresponding feature from the sketch
+          ResultConstructionPtr aRC =
+            std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aTargetIter);
+          DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr();
+          FeaturePtr aFeature =  aDoc ? aDoc->feature(aRC) : FeaturePtr();
+          if (aFeature)
+            aDoc->removeFeature(aFeature);
+        }
+      }
+      aRefListOfTranslated->clear();
+      std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
+        data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear();
+      std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
+        data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear();
+    }
+  }
+}