Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6

diff --combined src/PartSet/PartSet_Module.cpp
index 39830ef5576aaf32c67ddb31707b383bdaeab0b5,1e2a511ee1753184bca111808df0c60fb2b134c4..ca49036a681acb908ee57bfb1882608634bbc0c9
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -69,22 -69,6 +69,22 @@@
  #endif
  
  
 +/// Returns list of unique objects by sum of objects from List1 and List2
 +QList<ObjectPtr> getSumList(const QList<ModuleBase_ViewerPrs>& theList1,
 +                                       const QList<ModuleBase_ViewerPrs>& theList2)
 +{
 +  QList<ObjectPtr> aRes;
 +  foreach (ModuleBase_ViewerPrs aPrs, theList1) {
 +    if (!aRes.contains(aPrs.object()))
 +      aRes.append(aPrs.object());
 +  }
 +  foreach (ModuleBase_ViewerPrs aPrs, theList2) {
 +    if (!aRes.contains(aPrs.object()))
 +      aRes.append(aPrs.object());
 +  }
 +  return aRes;
 +}
 +
  /*!Create and return new instance of XGUI_Module*/
  extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop)
  {
@@@ -110,6 -94,10 +110,10 @@@ PartSet_Module::PartSet_Module(ModuleBa
  
  PartSet_Module::~PartSet_Module()
  {
+   if (!myDocumentShapeFilter.IsNull())
+     myDocumentShapeFilter.Nullify();
+   if (!myPlaneFilter.IsNull())
+     myPlaneFilter.Nullify();
  }
  
  void PartSet_Module::registerValidators()
@@@ -191,6 -179,9 +195,9 @@@ void PartSet_Module::onOperationStarted
        myPlaneFilter->setPlane(aPln->impl<gp_Pln>());
      }
    }
+   if (myDocumentShapeFilter.IsNull())
+     myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(myWorkshop);
+   myWorkshop->viewer()->addSelectionFilter(myDocumentShapeFilter);
  }
  
  void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
@@@ -225,6 -216,7 +232,7 @@@
      myCurrentSketch = CompositeFeaturePtr();
      myWorkshop->viewer()->removeSelectionFilter(myPlaneFilter);
    }
+   myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter);
  }
  
  void PartSet_Module::onPlaneSelected(const std::shared_ptr<GeomAPI_Pln>& thePln)
@@@ -302,7 -294,6 +310,7 @@@ void PartSet_Module::onMousePressed(Mod
  {
    if (!(theEvent->buttons() & Qt::LeftButton))
      return;
 +
    ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
    // Use only for sketch operations
    if (aOperation && myCurrentSketch) {
@@@ -322,31 -313,14 +330,31 @@@
      if ((!isSketcher) && (!isEditing))
        return;
  
 +    if (theEvent->modifiers()) {
 +      // If user performs multiselection
 +      if (isSketchOpe && (!isSketcher))
 +        if (!aOperation->commit())
 +          aOperation->abort();
 +      return;
 +    }
      // Remember highlighted objects for editing
      ModuleBase_ISelection* aSelect = myWorkshop->selection();
 -    QList<ModuleBase_ViewerPrs> aObjects = aSelect->getHighlighted();
 +    QList<ModuleBase_ViewerPrs> aHighlighted = aSelect->getHighlighted();
 +    QList<ModuleBase_ViewerPrs> aSelected = aSelect->getSelected();
      myEditingFeatures.clear();
      myEditingAttr.clear();
 -    if (aObjects.size() == 1) {
 -      foreach(ModuleBase_ViewerPrs aPrs, aObjects) {
 -        FeaturePtr aFeature = ModelAPI_Feature::feature(aObjects.first().object());
 +    if ((aHighlighted.size() == 0) && (aSelected.size() == 0)) {
 +      if (isSketchOpe && (!isSketcher))
 +        // commit previous operation
 +        if (!aOperation->commit())
 +          aOperation->abort();
 +      return;
 +    }
 +
 +    if ((aHighlighted.size() == 1) && (aSelected.size() == 0)) {
 +      // Move by selected shape (vertex). Can be used only for single selection
 +      foreach(ModuleBase_ViewerPrs aPrs, aHighlighted) {
 +        FeaturePtr aFeature = ModelAPI_Feature::feature(aHighlighted.first().object());
          if (aFeature) {
            myEditingFeatures.append(aFeature);
            TopoDS_Shape aShape = aPrs.shape();
@@@ -360,16 -334,7 +368,16 @@@
            }
          }
        }
 -    } 
 +    } else {
 +      // Provide multi-selection. Can be used only for features
 +      QList<ObjectPtr> aObjects = getSumList(aHighlighted, aSelected);
 +      foreach (ObjectPtr aObj, aObjects) {
 +        FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
 +        if (aFeature && (!myEditingFeatures.contains(aFeature)))
 +          myEditingFeatures.append(aFeature);
 +      }
 +
 +    }
      // If nothing highlighted - return
      if (myEditingFeatures.size() == 0)
        return;
@@@ -410,7 -375,7 +418,7 @@@ void PartSet_Module::get2dPoint(ModuleB
  
  void PartSet_Module::launchEditing()
  {
 -  if (myEditingFeatures.size() == 1) {
 +  if (myEditingFeatures.size() > 0) {
      FeaturePtr aFeature = myEditingFeatures.first();
      std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
                std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
@@@ -435,11 -400,8 +443,11 @@@ void PartSet_Module::onMouseReleased(Mo
    myWorkshop->viewer()->enableSelection(true);
    if (myIsDragging) {
      myIsDragging = false;
 -    if (myDragDone)
 +    if (myDragDone) {
        myWorkshop->currentOperation()->commit();
 +      myEditingFeatures.clear();
 +      myEditingAttr.clear();
 +    }
    }
  }
  
@@@ -460,7 -422,7 +468,7 @@@ void PartSet_Module::onMouseMoved(Modul
      double dY =  aY - myCurY;
  
      if ((aOperation->id().toStdString() == SketchPlugin_Line::ID()) &&
 -        (myEditingAttr.size() > 0) && 
 +        (myEditingAttr.size() == 1) && 
          myEditingAttr.first()) {
        // probably we have prehighlighted point
        AttributePtr aAttr = myEditingAttr.first();
@@@ -478,16 -440,14 +486,16 @@@
          }
        }
      } else {
 -      std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
 -        std::dynamic_pointer_cast<SketchPlugin_Feature>(aOperation->feature());
 -      if (aSketchFeature) { 
 -        aSketchFeature->move(dX, dY);
 -        ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent);
 -        Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED));
 -        Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
 +      foreach(FeaturePtr aFeature, myEditingFeatures) {
 +        std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
 +          std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
 +        if (aSketchFeature) { 
 +          aSketchFeature->move(dX, dY);
 +          ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent);
 +        }
        }
 +      Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED));
 +      Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
      }
      myDragDone = true;
      myCurX = aX;