From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 28 Oct 2014 09:51:44 +0000 (+0300)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.5~69
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=61da4e89d2ec63daa429d304f928482a0e6fa0b7;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_OperationFeatureEditMulti.cpp
---

61da4e89d2ec63daa429d304f928482a0e6fa0b7
diff --cc src/PartSet/PartSet_OperationFeatureEditMulti.cpp
index 7ae6d08d9,7be21c613..d1ee29448
--- a/src/PartSet/PartSet_OperationFeatureEditMulti.cpp
+++ b/src/PartSet/PartSet_OperationFeatureEditMulti.cpp
@@@ -80,16 -79,16 +79,15 @@@ void PartSet_OperationFeatureEditMulti:
    //} else
    myFeatures = theSelected;
    // add highlighted elements if they are not selected
 -  std::list<ModuleBase_ViewerPrs>::const_iterator anIt = theHighlighted.cbegin();
 -  for ( ; anIt != theHighlighted.cend(); ++anIt) {
 -    if (!isContains(myFeatures, (*anIt)))
 -      myFeatures.push_back(*anIt);
 +  foreach (ModuleBase_ViewerPrs aPrs, theHighlighted) {
 +    if (!isContains(myFeatures, aPrs))
 +      myFeatures.append(aPrs);
    }
    // Remove current feature if it is in the list (it will be moved as main feature)
-   FeaturePtr aFea = feature();
 -  std::list<ModuleBase_ViewerPrs>::iterator anEraseIt = myFeatures.begin();
 -  for ( ; anEraseIt != myFeatures.end(); ++anEraseIt) {
 -    if (ModelAPI_Feature::feature((*anEraseIt).object()) == feature()) {
 -      myFeatures.erase(anEraseIt);
 +  foreach (ModuleBase_ViewerPrs aPrs, myFeatures) {
 +    FeaturePtr aF = ModelAPI_Feature::feature(aPrs.object());
 +    if (ModelAPI_Feature::feature(aPrs.object()) == feature()) {
 +      myFeatures.removeOne(aPrs);
        break;
      }
    }
diff --cc src/PartSet/PartSet_OperationFeatureEditMulti.h
index 3454bdd5b,1008f3deb..e0fe5da1c
--- a/src/PartSet/PartSet_OperationFeatureEditMulti.h
+++ b/src/PartSet/PartSet_OperationFeatureEditMulti.h
@@@ -9,8 -9,9 +9,10 @@@
  
  #include <PartSet_OperationSketchBase.h>
  #include <QObject>
 +#include <QList>
  
+ #include <list>
+ 
  class QMouseEvent;
  
  /*!