X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=a88479bc5e845eeb14b88d52b7efc8d7ed8e939f;hb=cdc2caa21375bc96aaad9bb7c3ee1140dac1d738;hp=335d5046d240ee4f3b160f6fd25e83991d20b07f;hpb=fb0152c9215e449f46ee788c06e2902b4b77eefa;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 335d5046d..a88479bc5 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -18,6 +18,7 @@
 #include <Events_Message.h>
 #include <GeomAPI_Interface.h>
 #include <GeomAPI_Shape.h>
+#include <GeomValidators_Tools.h>
 
 #include <ModelAPI_AttributeReference.h>
 #include <ModelAPI_Data.h>
@@ -33,8 +34,7 @@
 #include <ModelAPI_ResultBody.h>
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_Validator.h>
-#include <ModelAPI_ResultValidator.h>
-#include <ModelAPI_RefAttrValidator.h>
+#include <ModelAPI_AttributeValidator.h>
 #include <ModelAPI_ShapeValidator.h>
 
 #include <Config_WidgetAPI.h>
@@ -127,15 +127,13 @@ ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector()
 //********************************************************************
 bool ModuleBase_WidgetShapeSelector::storeValueCustom() const
 {
-  bool isStored = storeAttributeValues(mySelectedObject, myShape);
-  if (isStored)
-    updateObject(myFeature);
-  return isStored;
+  // the value is stored on the selection changed signal processing 
+  return true;
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::storeAttributeValues(ObjectPtr theSelectedObject,
-                                                          GeomShapePtr theShape) const
+bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject,
+                                               GeomShapePtr theShape)
 {
   bool isChanged = false;
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject);
@@ -160,9 +158,9 @@ bool ModuleBase_WidgetShapeSelector::storeAttributeValues(ObjectPtr theSelectedO
       }
     } else {
       AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
-      ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
-      if (aSelectAttr && aBody && (theShape.get() != NULL)) {
-        aSelectAttr->setValue(aBody, theShape);
+      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
+      if (aSelectAttr) {
+        aSelectAttr->setValue(aResult, theShape);
         isChanged = true;
       }
     }
@@ -193,27 +191,10 @@ void ModuleBase_WidgetShapeSelector::clearAttribute()
 //********************************************************************
 bool ModuleBase_WidgetShapeSelector::restoreValue()
 {
-  DataPtr aData = myFeature->data();
   bool isBlocked = this->blockSignals(true);
-
-  AttributeSelectionPtr aSelect = aData->selection(attributeID());
-  if (aSelect) {
-    mySelectedObject = aSelect->context();
-    myShape = aSelect->value();
-  } else {
-    AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-    if (aRefAttr) {
-      mySelectedObject = aRefAttr->object();
-    } else {
-      AttributeReferencePtr aRef = aData->reference(attributeID());
-      if (aRef) {
-        mySelectedObject = aRef->value();
-      }
-    }
-  }
   updateSelectionName();
-
   this->blockSignals(isBlocked);
+
   return true;
 }
 
@@ -231,87 +212,26 @@ void ModuleBase_WidgetShapeSelector::onSelectionChanged()
   // In order to make reselection possible
   // TODO: check with MPV clearAttribute();
 
-  //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations();
-  QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected();
-  if (aSelected.size() > 0) {
-    if (setSelection(aSelected.first()))
-      emit focusOutWidget(this);
-  }
-}
-
-//********************************************************************
-bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue)
-{
-  ObjectPtr aObject = theValue.object();
-  if ((!mySelectedObject) && (!aObject))
-    return false;
-
-  // Check that the selected object is result (others can not be accepted)
-  ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
-  if (!aRes)
-    return false;
-
-  if (myFeature) {
-    // We can not select a result of our feature
-    const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
-    std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
-    for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
-      if ((*aIt) == aRes)
-        return false;
-    }
-  }
-  // Check that object belongs to active document or PartSet
-  DocumentPtr aDoc = aRes->document();
-  SessionPtr aMgr = ModelAPI_Session::get();
-  if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
-    return false;
-
-  // Check that the result has a shape
-  GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
-  if (!aShape)
-    return false;
-
-  // Get sub-shapes from local selection
-  if (!theValue.shape().IsNull()) {
-    aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
-    aShape->setImpl(new TopoDS_Shape(theValue.shape()));
-  }
+  QList<ModuleBase_ViewerPrs> aSelectedPrs = getSelectedEntitiesOrObjects(myWorkshop->selection());
+  if (aSelectedPrs.empty())
+    return;
+  ModuleBase_ViewerPrs aPrs = aSelectedPrs.first();
+  if (aPrs.isEmpty() || !isValidSelection(aPrs))
+    return;
 
-  // Check that the selection corresponds to selection type
-  if (!acceptSubShape(aShape))
-    return false;
-//  if (!acceptObjectShape(aObject))
-//      return false;
-
-  // Check whether the value is valid for the viewer selection filters
-  Handle(SelectMgr_EntityOwner) anOwner = theValue.owner();
-  if (!anOwner.IsNull()) {
-    SelectMgr_ListOfFilter aFilters;
-    selectionFilters(myWorkshop, aFilters);
-    SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
-    for (; aIt.More(); aIt.Next()) {
-      const Handle(SelectMgr_Filter)& aFilter = aIt.Value();
-      if (!aFilter->IsOk(anOwner))
-        return false;
-    }
-  }
-  if (isValid(aObject, aShape)) {
-    setObject(aObject, aShape);
-    return true;
+  if (!aPrs.isEmpty() && isValidSelection(aPrs)) {
+    setSelectionCustom(aPrs);
+    // the updateObject method should be called to flush the updated sigal. The workshop listens it,
+    // calls validators for the feature and, as a result, updates the Apply button state.
+    updateObject(myFeature);
+    //if (theObj) {
+      //  raisePanel();
+    //} 
+    //updateSelectionName();
+    //emit valuesChanged();
+    emit focusOutWidget(this);
   }
-  return false;
-}
 
-//********************************************************************
-void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr<GeomAPI_Shape> theShape)
-{
-  mySelectedObject = theObj;
-  myShape = theShape;
-  if (mySelectedObject) {
-    raisePanel();
-  } 
-  updateSelectionName();
-  emit valuesChanged();
 }
 
 //********************************************************************
@@ -355,24 +275,51 @@ bool ModuleBase_WidgetShapeSelector::acceptSubShape(std::shared_ptr<GeomAPI_Shap
   return false;
 }
 
+//********************************************************************
+GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const
+{
+  GeomShapePtr aShape;
+  DataPtr aData = myFeature->data();
+  if (aData.get() == NULL)
+    return aShape;
+
+  AttributeSelectionPtr aSelect = aData->selection(attributeID());
+  if (aSelect)
+    aShape = aSelect->value();
+
+  return aShape;
+}
+
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::updateSelectionName()
 {
   DataPtr aData = myFeature->data();
+  if (aData.get() == NULL)
+    return;
+
   bool isNameUpdated = false;
-  if (aData.get() != NULL) {
-    AttributeSelectionPtr aSelect = aData->selection(attributeID());
-    if (aSelect) {
-      myTextLine->setText(QString::fromStdString(aSelect->namingName()));
-      isNameUpdated = true;
-    }
+  AttributeSelectionPtr aSelect = aData->selection(attributeID());
+  if (aSelect) {
+    myTextLine->setText(QString::fromStdString(aSelect->namingName()));
+    isNameUpdated = true;
   }
   if (!isNameUpdated) {
-    if (mySelectedObject) {
-      std::string aName = mySelectedObject->data()->name();
+    ObjectPtr anObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
+    if (anObject.get() != NULL) {
+      std::string aName = anObject->data()->name();
       myTextLine->setText(QString::fromStdString(aName));
     } else {
-      if (myIsActive) {
+      AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+      if (aRefAttr && aRefAttr->attr().get() != NULL) {
+        //myIsObject = aRefAttr->isObject();
+        AttributePtr anAttr = aRefAttr->attr();
+        if (anAttr.get() != NULL) {
+          std::stringstream aName;
+          aName <<anAttr->owner()->data()->name()<<"/"<<anAttr->id();
+          myTextLine->setText(QString::fromStdString(aName.str()));
+        }
+      }
+      else if (myIsActive) {
         myTextLine->setText("");
       }
     }
@@ -426,89 +373,93 @@ void ModuleBase_WidgetShapeSelector::activateCustom()
 }
 
 //********************************************************************
-void ModuleBase_WidgetShapeSelector::deactivate()
+void ModuleBase_WidgetShapeSelector::storeAttributeValue()
 {
-  activateSelection(false);
-  disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
+  DataPtr aData = myFeature->data();
+  AttributePtr anAttribute = myFeature->attribute(attributeID());
+
+  myObject = GeomValidators_Tools::getObject(anAttribute);
+  myShape = getShape();
+  myRefAttribute = AttributePtr();
+  myIsObject = false;
+  AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+  if (aRefAttr) {
+    myIsObject = aRefAttr->isObject();
+    myRefAttribute = aRefAttr->attr();
+  }
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr<GeomAPI_Shape> theShape)
+void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid)
 {
-  bool isValid = ModuleBase_WidgetValidated::isValid(theObj, theShape);
-  if (!isValid)
-    return false;
-
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
-  std::list<ModelAPI_Validator*> aValidators;
-  std::list<std::list<std::string> > anArguments;
-  aFactory->validators(parentID(), attributeID(), aValidators, anArguments);
-
   DataPtr aData = myFeature->data();
-  //AttributePtr aAttr = aData->attribute(attributeID());
+  AttributePtr anAttribute = myFeature->attribute(attributeID());
+
+  setObject(myObject, myShape);
   AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
   if (aRefAttr) {
-    // 1. saves the previous attribute values
-    bool isObject = aRefAttr->isObject();
-    ObjectPtr aPrevObject = aRefAttr->object();
-    AttributePtr aPrevAttr = aRefAttr->attr();
-
-    // 2. store the current values, disable the model's update
-    aData->blockSendAttributeUpdated(true);
-    ObjectPtr aPrevSelectedObject = mySelectedObject;
-    GeomShapePtr aPrevShape = myShape;
-
-    storeAttributeValues(theObj, theShape);
-
-    // 3. check the acceptability of the current values
-    std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
-    std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
-    bool aValid = true;
-    for (; aValidator != aValidators.end() && aValid; aValidator++, aArgs++) {
-      const ModelAPI_RefAttrValidator* aAttrValidator =
-          dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
-      if (aAttrValidator) {
-        aValid = aAttrValidator->isValid(aRefAttr, *aArgs);
-      }
-    }
-
-    // 4. if the values are not valid, restore the previous values to the attribute
-    //if (!aValid) {
-    if (isObject)
-      aRefAttr->setObject(aPrevObject);
-    else
-      aRefAttr->setAttr(aPrevAttr);
-    //}
-    // 5. enable the model's update
-    aData->blockSendAttributeUpdated(false);
-    //updateObject(myFeature);
-
-    return aValid;
+    if (!myIsObject)
+      aRefAttr->setAttr(myRefAttribute);
   }
+}
 
-  // Check the acceptability of the object as attribute
-  std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
-  std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
-  for (; aValidator != aValidators.end(); aValidator++, aArgs++) {
-    const ModelAPI_RefAttrValidator* aAttrValidator =
-        dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
-    if (aAttrValidator) {
-      //if (!aAttrValidator->isValid(myFeature, *aArgs, theObj)) {
-      //  return false;
-      //}
-    }
-    else {
-      const ModelAPI_ShapeValidator* aShapeValidator = 
-                               dynamic_cast<const ModelAPI_ShapeValidator*>(*aValidator);
-      if (aShapeValidator) {
-        DataPtr aData = myFeature->data();
-        AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
-        if (!aShapeValidator->isValid(myFeature, *aArgs, theObj, aSelectAttr, theShape)) {
-          return false;
-        }
-      }
+//********************************************************************
+bool ModuleBase_WidgetShapeSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+{
+  bool isDone = false;
+
+  // It should be checked by corresponded validator
+  ObjectPtr aObject = thePrs.object();
+  ObjectPtr aCurrentObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
+  /*
+  if ((!aCurrentObject) && (!aObject))
+    return false;*/
+
+  // It should be checked by corresponded validator
+  // Check that the selected object is result (others can not be accepted)
+  ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
+  if (!aRes)
+    return false;
+  /*if (myFeature) {
+    // We can not select a result of our feature
+    const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
+    std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
+    for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
+      if ((*aIt) == aRes)
+        return false;
     }
   }
+  */
+  // It should be checked by corresponded validator
+  /*
+  // Check that object belongs to active document or PartSet
+  DocumentPtr aDoc = aRes->document();
+  SessionPtr aMgr = ModelAPI_Session::get();
+  if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
+    return false;*/
+
+  // It should be checked by corresponded validator
+  // Check that the result has a shape
+  GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
+  if (!aShape)
+    return false;
+
+  // Get sub-shapes from local selection
+  if (!thePrs.shape().IsNull()) {
+    aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+    aShape->setImpl(new TopoDS_Shape(thePrs.shape()));
+  }
+  // Check that the selection corresponds to selection type
+  if (!acceptSubShape(aShape))
+    return false;
+
+  setObject(aObject, aShape);
   return true;
 }
+
+//********************************************************************
+void ModuleBase_WidgetShapeSelector::deactivate()
+{
+  activateSelection(false);
+  disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
+}