X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=361f6383d8507a66b94c38457a95eab6c878f4f5;hb=a2982d2108f929cf9e7f996cfd590c4ce59dc21c;hp=211363d1661920c52520516f3498ec36407b4075;hpb=4b116f1c2ff374e8c5cc5afe2b64eb1fe2a8abd3;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 211363d16..361f6383d 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: ModuleBase_WidgetShapeSelector.h // Created: 2 June 2014 // Author: Vitaly Smetannikov @@ -8,7 +10,8 @@ #include #include #include -#include +#include +#include #include #include @@ -29,12 +32,16 @@ #include #include #include +#include +#include +#include #include #include #include +#include #include #include @@ -46,6 +53,7 @@ #include #include #include +#include #include #include @@ -84,7 +92,7 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen const Config_WidgetAPI* theData, const std::string& theParentId) : ModuleBase_ModelWidget(theParent, theData, theParentId), - myWorkshop(theWorkshop), myIsActive(false), myUseSubShapes(false) + myWorkshop(theWorkshop), myIsActive(false) { myContainer = new QWidget(theParent); QHBoxLayout* aLayout = new QHBoxLayout(myContainer); @@ -111,8 +119,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen std::string aObjTypes = theData->getProperty("object_types"); myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts); - - myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); } //******************************************************************** @@ -129,61 +135,75 @@ bool ModuleBase_WidgetShapeSelector::storeValue() const return false; DataPtr aData = myFeature->data(); - if (myUseSubShapes) { - ResultPtr aBody = std::dynamic_pointer_cast(mySelectedObject); - if (aBody) { - AttributePtr aAttr = aData->attribute(attributeID()); - - AttributeSelectionPtr aSelectAttr = - std::dynamic_pointer_cast(aAttr); - if (aSelectAttr) - aSelectAttr->setValue(aBody, myShape); + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { + ObjectPtr aObject = aRef->value(); + if (!(aObject && aObject->isSame(mySelectedObject))) { + aRef->setValue(mySelectedObject); updateObject(myFeature); return true; } } else { - AttributeReferencePtr aRef = aData->reference(attributeID()); - if (aRef) { - ObjectPtr aObject = aRef->value(); + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + ObjectPtr aObject = aRefAttr->object(); if (!(aObject && aObject->isSame(mySelectedObject))) { - aRef->setValue(mySelectedObject); + aRefAttr->setObject(mySelectedObject); updateObject(myFeature); return true; } } else { - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - ObjectPtr aObject = aRefAttr->object(); - if (!(aObject && aObject->isSame(mySelectedObject))) { - aRefAttr->setObject(mySelectedObject); - updateObject(myFeature); - return true; - } + AttributeSelectionPtr aSelectAttr = aData->selection(attributeID()); + ResultPtr aBody = std::dynamic_pointer_cast(mySelectedObject); + if (aSelectAttr && aBody && (myShape.get() != NULL)) { + aSelectAttr->setValue(aBody, myShape); + updateObject(myFeature); + return true; } } } return false; } +//******************************************************************** +void ModuleBase_WidgetShapeSelector::clearAttribute() +{ + DataPtr aData = myFeature->data(); + AttributeSelectionPtr aSelect = aData->selection(attributeID()); + if (aSelect) { + aSelect->setValue(ResultPtr(), std::shared_ptr(new GeomAPI_Shape())); + return; + } + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + aRefAttr->setObject(ObjectPtr()); + return; + } + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { + aRef->setObject(ObjectPtr()); + } +} + //******************************************************************** bool ModuleBase_WidgetShapeSelector::restoreValue() { DataPtr aData = myFeature->data(); bool isBlocked = this->blockSignals(true); - if (myUseSubShapes) { - AttributeSelectionPtr aSelect = aData->selection(attributeID()); - if (aSelect) { - mySelectedObject = aSelect->context(); - myShape = aSelect->value(); - } + + AttributeSelectionPtr aSelect = aData->selection(attributeID()); + if (aSelect) { + mySelectedObject = aSelect->context(); + myShape = aSelect->value(); } else { - AttributeReferencePtr aRef = aData->reference(attributeID()); - if (aRef) - mySelectedObject = aRef->value(); - else { - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) - mySelectedObject = aRefAttr->object(); + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + mySelectedObject = aRefAttr->object(); + } else { + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { + mySelectedObject = aRef->value(); + } } } updateSelectionName(); @@ -203,64 +223,70 @@ QList ModuleBase_WidgetShapeSelector::getControls() const //******************************************************************** void ModuleBase_WidgetShapeSelector::onSelectionChanged() { - QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations(); - if (aObjects.size() > 0) { - ObjectPtr aObject = aObjects.first(); - if ((!mySelectedObject) && (!aObject)) - return; + // In order to make reselection possible + // TODO: check with MPV clearAttribute(); + + //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations(); + QList aSelected = myWorkshop->selection()->getSelected(); + if (aSelected.size() > 0) { + if (setSelection(aSelected.first())) + emit focusOutWidget(this); + } +} - // Check that the selected object is result (others can not be accepted) - ResultPtr aRes = std::dynamic_pointer_cast(aObject); - if (!aRes) - return; +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue) +{ + ObjectPtr aObject = theValue.object(); + if ((!mySelectedObject) && (!aObject)) + return false; - if (myFeature) { - // We can not select a result of our feature - const std::list>& aResList = myFeature->results(); - std::list >::const_iterator aIt; - for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) { - if ((*aIt) == aRes) - return; - } + // Check that the selected object is result (others can not be accepted) + ResultPtr aRes = std::dynamic_pointer_cast(aObject); + if (!aRes) + return false; + + if (myFeature) { + // We can not select a result of our feature + const std::list>& aResList = myFeature->results(); + std::list >::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; + } + // 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; + // Check that the result has a shape + GeomShapePtr aShape = ModelAPI_Tools::shape(aRes); + if (!aShape) + return false; - /// Check that object has acceptable type - if (!acceptObjectType(aObject)) - return; + /// Check that object has acceptable type + if (!acceptObjectType(aObject)) + return false; - // Get sub-shapes from local selection - if (myUseSubShapes) { - NCollection_List aShapeList; - std::list aOwners; - myWorkshop->selection()->selectedShapes(aShapeList, aOwners); - if (aShapeList.Extent() > 0) { - aShape = std::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(aShapeList.First())); - } - } + // Get sub-shapes from local selection + if (!theValue.shape().IsNull()) { + aShape = std::shared_ptr(new GeomAPI_Shape()); + aShape->setImpl(new TopoDS_Shape(theValue.shape())); + } - // Check that the selection corresponds to selection type - if (myUseSubShapes) { - if (!acceptSubShape(aShape)) - return; - } else { - if (!acceptObjectShape(aObject)) - return; - } + // Check that the selection corresponds to selection type + if (!acceptSubShape(aShape)) + return false; +// if (!acceptObjectShape(aObject)) +// return false; + + if (isValid(aObject, aShape)) { setObject(aObject, aShape); - //activateSelection(false); - emit focusOutWidget(this); + return true; } + return false; } //******************************************************************** @@ -272,38 +298,38 @@ void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr raisePanel(); } updateSelectionName(); - //activateSelection(false); emit valuesChanged(); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::acceptObjectShape(const ObjectPtr theResult) const -{ - ResultPtr aResult = std::dynamic_pointer_cast(theResult); - - // Check that the shape of necessary type - std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); - if (!aShapePtr) - return false; - TopoDS_Shape aShape = aShapePtr->impl(); - if (aShape.IsNull()) - return false; - - TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); - if (aShapeType == TopAbs_COMPOUND) { - foreach (QString aType, myShapeTypes) { - TopExp_Explorer aEx(aShape, shapeType(aType)); - if (aEx.More()) - return true; - } - } else { - foreach (QString aType, myShapeTypes) { - if (shapeType(aType) == aShapeType) - return true; - } - } - return false; -} +//bool ModuleBase_WidgetShapeSelector::acceptObjectShape(const ObjectPtr theResult) const +//{ +// ResultPtr aResult = std::dynamic_pointer_cast(theResult); +// +// // Check that the shape of necessary type +// std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); +// if (!aShapePtr) +// return false; +// TopoDS_Shape aShape = aShapePtr->impl(); +// if (aShape.IsNull()) +// return false; +// +// TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); +// if (aShapeType == TopAbs_COMPOUND) { +// foreach (QString aType, +// myShapeTypes) { +// TopExp_Explorer aEx(aShape, shapeType(aType)); +// if (aEx.More()) +// return true; +// } +// } else { +// foreach (QString aType, myShapeTypes) { +// if (shapeType(aType) == aShapeType) +// return true; +// } +// } +// return false; +//} //******************************************************************** bool ModuleBase_WidgetShapeSelector::acceptSubShape(std::shared_ptr theShape) const @@ -339,12 +365,23 @@ bool ModuleBase_WidgetShapeSelector::acceptObjectType(const ObjectPtr theObject) //******************************************************************** void ModuleBase_WidgetShapeSelector::updateSelectionName() { - if (mySelectedObject) { - std::string aName = mySelectedObject->data()->name(); - myTextLine->setText(QString::fromStdString(aName)); - } else { - if (myIsActive) { - myTextLine->setText(""); + DataPtr aData = myFeature->data(); + bool isNameUpdated = false; + if (aData.get() != NULL) { + 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(); + myTextLine->setText(QString::fromStdString(aName)); + } else { + if (myIsActive) { + myTextLine->setText(""); + } } } } @@ -357,30 +394,45 @@ void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate) return; myIsActive = toActivate; updateSelectionName(); + ModuleBase_IViewer* aViewer = myWorkshop->viewer(); if (myIsActive) { connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - if (myUseSubShapes) { - - QIntList aList; - foreach (QString aType, myShapeTypes) - aList.append(shapeType(aType)); - myWorkshop->activateSubShapesSelection(aList); - if (!myObjectTypes.isEmpty()) { - myObjTypeFilter = new ModuleBase_ObjectTypesFilter(myWorkshop, myObjectTypes); - myWorkshop->viewer()->clearSelectionFilters(); - myWorkshop->viewer()->addSelectionFilter(myObjTypeFilter); - } + QIntList aList; + foreach (QString aType, myShapeTypes) { + aList.append(shapeType(aType)); + } + myWorkshop->activateSubShapesSelection(aList); + if (!myObjectTypes.isEmpty()) { + myObjTypeFilter = new ModuleBase_ObjectTypesFilter(myWorkshop, myObjectTypes); + aViewer->clearSelectionFilters(); + aViewer->addSelectionFilter(myObjTypeFilter); } } else { disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - if (myUseSubShapes) { - if (!myObjTypeFilter.IsNull()) { - myWorkshop->viewer()->removeSelectionFilter(myObjTypeFilter); - myObjTypeFilter.Nullify(); - } - myWorkshop->deactivateSubShapesSelection(); + if (!myObjTypeFilter.IsNull()) { + aViewer->removeSelectionFilter(myObjTypeFilter); + myObjTypeFilter.Nullify(); } + myWorkshop->deactivateSubShapesSelection(); + } + // apply filters loaded from the XML definition of the widget + ModuleBase_FilterFactory* aFactory = myWorkshop->selectionFilters(); + SelectMgr_ListOfFilter aFilters; + aFactory->filters(parentID(), attributeID(), aFilters); + SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); + for (; aIt.More(); aIt.Next()) { + Handle(SelectMgr_Filter) aSelFilter = aIt.Value(); + if (aSelFilter.IsNull()) + continue; + + //Handle(ModuleBase_Filter) aFilter = Handle(ModuleBase_Filter)::DownCast(aIt.Value()); + //if (aFilter.IsNull()) + // continue; + if (myIsActive) + aViewer->addSelectionFilter(aSelFilter); + else + aViewer->removeSelectionFilter(aSelFilter); } } @@ -401,23 +453,6 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const } } -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::setValue(ModuleBase_WidgetValue* theValue) -{ - if (theValue) { - ModuleBase_WidgetValueFeature* aFeatureValue = - dynamic_cast(theValue); - if (aFeatureValue && aFeatureValue->object()) { - ObjectPtr aObject = aFeatureValue->object(); - if (acceptObjectShape(aObject)) { - setObject(aObject); - return true; - } - } - } - return false; -} - //******************************************************************** void ModuleBase_WidgetShapeSelector::activate() { @@ -429,3 +464,44 @@ void ModuleBase_WidgetShapeSelector::deactivate() { activateSelection(false); } + +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr theShape) +{ + SessionPtr aMgr = ModelAPI_Session::get(); + ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); + std::list aValidators; + std::list > anArguments; + aFactory->validators(parentID(), attributeID(), aValidators, anArguments); + + // Check the type of selected object + std::list::iterator aValidator = aValidators.begin(); + bool isValid = true; + for (; aValidator != aValidators.end(); aValidator++) { + const ModelAPI_ResultValidator* aResValidator = + dynamic_cast(*aValidator); + if (aResValidator) { + isValid = false; + if (aResValidator->isValid(theObj)) { + isValid = true; + break; + } + } + } + if (!isValid) + return false; + + // Check the acceptability of the object as attribute + aValidator = aValidators.begin(); + std::list >::iterator aArgs = anArguments.begin(); + for (; aValidator != aValidators.end(); aValidator++, aArgs++) { + const ModelAPI_RefAttrValidator* aAttrValidator = + dynamic_cast(*aValidator); + if (aAttrValidator) { + if (!aAttrValidator->isValid(myFeature, *aArgs, theObj)) { + return false; + } + } + } + return true; +} \ No newline at end of file