X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=361f6383d8507a66b94c38457a95eab6c878f4f5;hb=abab0a0689765a60fcec0d7861a3ef7893a685fa;hp=e1eed428d90ab242b4c62eb42dddc762759f52fa;hpb=bab9b98219f328a4ea8aa265fef304208495fa03;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index e1eed428d..361f6383d 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,28 +1,47 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: ModuleBase_WidgetShapeSelector.h // Created: 2 June 2014 // Author: Vitaly Smetannikov -#include "ModuleBase_WidgetShapeSelector.h" -#include +#include +#include #include -#include "ModuleBase_WidgetValue.h" +#include +#include #include -#include "ModuleBase_WidgetValueFeature.h" +#include +#include +#include #include -#include -#include +#include +#include +#include +#include #include #include -#include +#include +#include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include + #include +#include #include +#include #include #include @@ -34,8 +53,15 @@ #include #include #include +#include + +#include +#include + +#include -#include +#include +#include typedef QMap ShapeTypes; static ShapeTypes MyShapeTypes; @@ -44,15 +70,21 @@ TopAbs_ShapeEnum ModuleBase_WidgetShapeSelector::shapeType(const QString& theTyp { if (MyShapeTypes.count() == 0) { MyShapeTypes["face"] = TopAbs_FACE; + MyShapeTypes["faces"] = TopAbs_FACE; MyShapeTypes["vertex"] = TopAbs_VERTEX; + MyShapeTypes["vertices"] = TopAbs_VERTEX; MyShapeTypes["wire"] = TopAbs_WIRE; MyShapeTypes["edge"] = TopAbs_EDGE; + MyShapeTypes["edges"] = TopAbs_EDGE; MyShapeTypes["shell"] = TopAbs_SHELL; MyShapeTypes["solid"] = TopAbs_SOLID; + MyShapeTypes["solids"] = TopAbs_SOLID; } - if (MyShapeTypes.contains(theType)) - return MyShapeTypes[theType]; - throw std::invalid_argument("Shape type defined in XML is not implemented!"); + QString aType = theType.toLower(); + if (MyShapeTypes.contains(aType)) + return MyShapeTypes[aType]; + Events_Error::send("Shape type defined in XML is not implemented!"); + return TopAbs_SHAPE; } ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParent, @@ -60,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); @@ -80,21 +112,13 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen myTextLine->setToolTip(aToolTip); myTextLine->installEventFilter(this); - myBasePalet = myTextLine->palette(); - myInactivePalet = myBasePalet; - myInactivePalet.setBrush(QPalette::Base, QBrush(Qt::gray, Qt::Dense6Pattern)); - myTextLine->setPalette(myInactivePalet); - aLayout->addWidget(myTextLine, 1); std::string aTypes = theData->getProperty("shape_types"); - myShapeTypes = QString(aTypes.c_str()).split(' '); + myShapeTypes = QString(aTypes.c_str()).split(' ', QString::SkipEmptyParts); - std::string aUseSubShapes = theData->getProperty("use_subshapes"); - if (aUseSubShapes.length() > 0) { - QString aVal(aUseSubShapes.c_str()); - myUseSubShapes = (aVal.toUpper() == "TRUE"); - } + std::string aObjTypes = theData->getProperty("object_types"); + myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts); } //******************************************************************** @@ -111,24 +135,54 @@ bool ModuleBase_WidgetShapeSelector::storeValue() const return false; DataPtr aData = myFeature->data(); - if (myUseSubShapes) { - boost::shared_ptr aSelect = - boost::dynamic_pointer_cast(aData->attribute(attributeID())); - - ResultBodyPtr aBody = boost::dynamic_pointer_cast(mySelectedObject); - if (aBody) - aSelect->setValue(aBody, myShape); - } else { - boost::shared_ptr aRef = - boost::dynamic_pointer_cast(aData->attribute(attributeID())); - + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { ObjectPtr aObject = aRef->value(); if (!(aObject && aObject->isSame(mySelectedObject))) { aRef->setValue(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; + } + } else { + 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 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()); + } } //******************************************************************** @@ -136,15 +190,21 @@ bool ModuleBase_WidgetShapeSelector::restoreValue() { DataPtr aData = myFeature->data(); bool isBlocked = this->blockSignals(true); - if (myUseSubShapes) { - boost::shared_ptr 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 { - boost::shared_ptr aRef = aData->reference(attributeID()); - mySelectedObject = aRef->value(); + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + mySelectedObject = aRefAttr->object(); + } else { + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { + mySelectedObject = aRef->value(); + } + } } updateSelectionName(); @@ -156,7 +216,6 @@ bool ModuleBase_WidgetShapeSelector::restoreValue() QList ModuleBase_WidgetShapeSelector::getControls() const { QList aControls; - aControls.append(myLabel); aControls.append(myTextLine); return aControls; } @@ -164,103 +223,116 @@ QList ModuleBase_WidgetShapeSelector::getControls() const //******************************************************************** void ModuleBase_WidgetShapeSelector::onSelectionChanged() { - QList aObjects = myWorkshop->selection()->selectedObjects(); - if (aObjects.size() > 0) { - ObjectPtr aObject = aObjects.first(); - if ((!mySelectedObject) && (!aObject)) - return; - if (mySelectedObject && aObject && mySelectedObject->isSame(aObject)) - return; - - // Get sub-shapes from local selection - boost::shared_ptr aShape; - if (myUseSubShapes) { - NCollection_List aShapeList; - myWorkshop->selection()->selectedShapes(aShapeList); - if (aShapeList.Extent() > 0) { - aShape = boost::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(aShapeList.First())); - } - } - - // Check that the selection corresponds to selection type - if (myUseSubShapes) { - if (!isAccepted(aShape)) - return; - } else { - if (!isAccepted(aObject)) - return; - } - setObject(aObject, aShape); - emit focusOutWidget(this); + // 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); } } //******************************************************************** -void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, boost::shared_ptr theShape) +bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue) { - if (mySelectedObject == theObj) - return; - mySelectedObject = theObj; - myShape = theShape; - if (mySelectedObject) { - raisePanel(); - if (!myUseSubShapes) { - static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TOHIDE); - ModelAPI_EventCreator::get()->sendUpdated(mySelectedObject, anEvent); - Events_Loop::loop()->flush(anEvent); - } - } - updateSelectionName(); - activateSelection(false); - emit valuesChanged(); -} + 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(aObject); + if (!aRes) + return false; -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::isAccepted(const ObjectPtr theResult) const -{ - ResultPtr aResult = boost::dynamic_pointer_cast(theResult); if (myFeature) { // We can not select a result of our feature - const std::list>& aRes = myFeature->results(); - std::list >::const_iterator aIt; - for (aIt = aRes.cbegin(); aIt != aRes.cend(); ++aIt) { - if ((*aIt) == aResult) + 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 = aResult->document(); + DocumentPtr aDoc = aRes->document(); SessionPtr aMgr = ModelAPI_Session::get(); - if (!(aDoc == aMgr->activeDocument()) || (aDoc == aMgr->moduleDocument())) + if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument())) return false; - // Check that the shape of necessary type - boost::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); - if (!aShapePtr) + // Check that the result has a shape + GeomShapePtr aShape = ModelAPI_Tools::shape(aRes); + if (!aShape) return false; - TopoDS_Shape aShape = aShapePtr->impl(); - if (aShape.IsNull()) + + /// Check that object has acceptable type + if (!acceptObjectType(aObject)) 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; - } + // 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 (!acceptSubShape(aShape)) + return false; +// if (!acceptObjectShape(aObject)) +// return false; + + if (isValid(aObject, aShape)) { + setObject(aObject, aShape); + return true; } return false; } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::isAccepted(boost::shared_ptr theShape) const +void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr theShape) +{ + mySelectedObject = theObj; + myShape = theShape; + if (mySelectedObject) { + raisePanel(); + } + updateSelectionName(); + 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::acceptSubShape(std::shared_ptr theShape) const { TopoDS_Shape aShape = theShape->impl(); foreach (QString aType, myShapeTypes) { @@ -270,25 +342,47 @@ bool ModuleBase_WidgetShapeSelector::isAccepted(boost::shared_ptr return false; } +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::acceptObjectType(const ObjectPtr theObject) const +{ + // Definition of types is not obligatory. If types are not defined then + // it means that accepted any type + if (myObjectTypes.isEmpty()) + return true; + + foreach (QString aType, myObjectTypes) { + if (aType.toLower() == "construction") { + ResultConstructionPtr aConstr = + std::dynamic_pointer_cast(theObject); + return (aConstr != NULL); + } // ToDo: Process other types of objects + } + // Object type is defined but not found + return false; +} + + //******************************************************************** void ModuleBase_WidgetShapeSelector::updateSelectionName() { - if (mySelectedObject) { - std::string aName = mySelectedObject->data()->name(); - myTextLine->setText(QString::fromStdString(aName)); - } else { - if (myIsActive) { - QString aMsg = tr("Select a "); - int i = 0; - foreach (QString aType, myShapeTypes) { - if (i > 0) - aMsg += " or "; - aMsg += aType; - i++; + 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(""); } - myTextLine->setText(aMsg); - } else - myTextLine->setText(tr("No object selected")); + } } } @@ -296,25 +390,49 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() //******************************************************************** void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate) { + if (myIsActive == toActivate) + return; myIsActive = toActivate; - if (myIsActive) - myTextLine->setPalette(myBasePalet); - else - myTextLine->setPalette(myInactivePalet); 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); + 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) - 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); } } @@ -336,36 +454,54 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::focusTo() +void ModuleBase_WidgetShapeSelector::activate() { activateSelection(true); - return true; } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::eventFilter(QObject* theObj, QEvent* theEvent) +void ModuleBase_WidgetShapeSelector::deactivate() { - if (theObj == myTextLine) { - if (theEvent->type() == QEvent::FocusIn) - activateSelection(true); - } - return ModuleBase_ModelWidget::eventFilter(theObj, theEvent); + activateSelection(false); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::setValue(ModuleBase_WidgetValue* theValue) +bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr theShape) { - if (theValue) { - ModuleBase_WidgetValueFeature* aFeatureValue = - dynamic_cast(theValue); - if (aFeatureValue && aFeatureValue->object()) { - ObjectPtr aObject = aFeatureValue->object(); - if (isAccepted(aObject)) { - setObject(aObject); - return true; + 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; } } } - return false; -} + 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