From: mpv <mikhail.ponikarov@opencascade.com>
Date: Fri, 7 Nov 2014 10:53:02 +0000 (+0300)
Subject: Groups transactions mechanism debug
X-Git-Tag: V_0.5~16^2~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=644f0470e456dbe2f085869d4b501b5f601b308d;p=modules%2Fshaper.git

Groups transactions mechanism debug
---

diff --git a/src/Model/Model_AttributeSelectionList.cpp b/src/Model/Model_AttributeSelectionList.cpp
index e1cb750aa..443eed177 100644
--- a/src/Model/Model_AttributeSelectionList.cpp
+++ b/src/Model/Model_AttributeSelectionList.cpp
@@ -15,6 +15,8 @@ using namespace std;
 void Model_AttributeSelectionList::append(
     const ResultPtr& theContext, const boost::shared_ptr<GeomAPI_Shape>& theSubShape)
 {
+  updateSubs();
+
   int aNewTag = mySize->Get() + 1;
   TDF_Label aNewLab = mySize->Label().FindChild(aNewTag);
 
@@ -47,12 +49,13 @@ void Model_AttributeSelectionList::setSelectionType(int theType)
 boost::shared_ptr<ModelAPI_AttributeSelection> 
   Model_AttributeSelectionList::value(const int theIndex)
 {
+  updateSubs();
   return mySubs[theIndex];
 }
 
 void Model_AttributeSelectionList::clear()
 {
-  if (!mySubs.empty()) {
+  if (mySize->Get() != 0) {
     mySize->Set(0);
     mySubs.clear();
     TDF_ChildIterator aSubIter(mySize->Label());
@@ -70,16 +73,8 @@ Model_AttributeSelectionList::Model_AttributeSelectionList(TDF_Label& theLabel)
     mySize = TDataStd_Integer::Set(theLabel, 0);
     mySelectionType = TDataStd_Real::Set(theLabel, 0);
   } else { // recollect mySubs
-    int aNum = mySize->Get();
-    TDF_ChildIterator aSubIter(theLabel);
-    for(; aSubIter.More(), aNum != 0; aSubIter.Next(), aNum--) {
-      TDF_Label aChildLab = aSubIter.Value();
-      boost::shared_ptr<Model_AttributeSelection> aNewAttr = 
-        boost::shared_ptr<Model_AttributeSelection>(new Model_AttributeSelection(aChildLab));
-      if (owner())
-        aNewAttr->setObject(owner());
-      mySubs.push_back(aNewAttr);
-    }
+    theLabel.FindAttribute(TDataStd_Real::GetID(), mySelectionType);
+    updateSubs();
   }
 }
 
@@ -91,3 +86,28 @@ void Model_AttributeSelectionList::setObject(const boost::shared_ptr<ModelAPI_Ob
     (*aSubIter)->setObject(theObject);
   }
 }
+
+void Model_AttributeSelectionList::updateSubs()
+{
+  unsigned int aNum = mySize->Get();
+  if (aNum > mySubs.size()) { // add subs what are not yet created
+    TDF_ChildIterator aSubIter(mySize->Label());
+    for(int aExisting = mySubs.size(); aExisting > 0; aSubIter.Next()) aExisting--;
+    for(; aSubIter.More(); aSubIter.Next()) {
+      TDF_Label aChildLab = aSubIter.Value();
+      boost::shared_ptr<Model_AttributeSelection> aNewAttr = 
+        boost::shared_ptr<Model_AttributeSelection>(new Model_AttributeSelection(aChildLab));
+      if (owner())
+        aNewAttr->setObject(owner());
+      mySubs.push_back(aNewAttr);
+    }
+  } else if (aNum < mySubs.size()) { // remove excess subs from the end
+    if (aNum == 0) {
+      mySubs.clear();
+    } else {
+      std::vector<boost::shared_ptr<Model_AttributeSelection> >::iterator aSubIter;
+      for(int aExisting = aNum; aExisting != 0; aSubIter++) aExisting--;
+      mySubs.erase(aSubIter, mySubs.end());
+    }
+  }
+}
diff --git a/src/Model/Model_AttributeSelectionList.h b/src/Model/Model_AttributeSelectionList.h
index f10d6d97f..51001b6d0 100644
--- a/src/Model/Model_AttributeSelectionList.h
+++ b/src/Model/Model_AttributeSelectionList.h
@@ -47,7 +47,8 @@ public:
 protected:
   /// Objects are created for features automatically
   MODEL_EXPORT Model_AttributeSelectionList(TDF_Label& theLabel);
-    /// Performs the selection for the body result (TNaming Selection)
+  /// Updates the mySubs if needed since it is not persistent value
+  void updateSubs();
 
   friend class Model_Data;
 };
diff --git a/src/Model/Model_ResultGroup.cpp b/src/Model/Model_ResultGroup.cpp
index 2fd1ead9d..3e467395d 100644
--- a/src/Model/Model_ResultGroup.cpp
+++ b/src/Model/Model_ResultGroup.cpp
@@ -19,7 +19,7 @@ boost::shared_ptr<GeomAPI_Shape> Model_ResultGroup::shape() const
     AttributeSelectionListPtr aList = myOwnerData->selectionList("group_list");
     if (aList) {
       std::list<boost::shared_ptr<GeomAPI_Shape> > aSubs;
-      for(int a = aList->size(); a >= 0; a--) {
+      for(int a = aList->size() - 1; a >= 0; a--) {
         boost::shared_ptr<GeomAPI_Shape> aSelection = aList->value(a)->value();
         if (aSelection && !aSelection->isNull()) {
           aSubs.push_back(aSelection);
diff --git a/src/ModelAPI/ModelAPI_Tools.cpp b/src/ModelAPI/ModelAPI_Tools.cpp
index 52b88b5b0..8656f2fd7 100644
--- a/src/ModelAPI/ModelAPI_Tools.cpp
+++ b/src/ModelAPI/ModelAPI_Tools.cpp
@@ -5,19 +5,25 @@
 #include "ModelAPI_Tools.h"
 #include <ModelAPI_ResultBody.h>
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultGroup.h>
 
 namespace ModelAPI_Tools {
 
-boost::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
-{
-  ResultBodyPtr aBody = boost::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
-  if (aBody)
-    return aBody->shape();
-  ResultConstructionPtr aConstruct = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
+  boost::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
+  {
+
+    ResultBodyPtr aBody = boost::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
+    if (aBody)
+      return aBody->shape();
+
+    ResultConstructionPtr aConstruct = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
       theResult);
-  if (aConstruct)
-    return aConstruct->shape();
-  return boost::shared_ptr<GeomAPI_Shape>();
-}
+    if (aConstruct)
+      return aConstruct->shape();
 
+    ResultGroupPtr aGroup = boost::dynamic_pointer_cast<ModelAPI_ResultGroup>(theResult);
+    if (aGroup)
+      return aGroup->shape();
+    return boost::shared_ptr<GeomAPI_Shape>();
+  }
 }
diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 0dd985f97..265fb9029 100644
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -125,10 +125,12 @@ void XGUI_Selection::selectedShapes(NCollection_List<TopoDS_Shape>& theList,
     if (!aShape.IsNull()) {
       theList.Append(aShape);
       Handle(SelectMgr_EntityOwner) aEO = aContext->SelectedOwner();
-      Handle(AIS_InteractiveObject) anObj = 
-        Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable());
-      ObjectPtr anObject = myWorkshop->displayer()->getObject(anObj);
-      theOwners.push_back(anObject);
+      if (!aEO.IsNull()) {
+        Handle(AIS_InteractiveObject) anObj = 
+          Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable());
+        ObjectPtr anObject = myWorkshop->displayer()->getObject(anObj);
+        theOwners.push_back(anObject);
+      }
     }
   }
 }