X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=361f6383d8507a66b94c38457a95eab6c878f4f5;hb=abab0a0689765a60fcec0d7861a3ef7893a685fa;hp=cf0e748dba6bb608b1320b4861fbc87338b58e93;hpb=3d680157a89ccd3b3e28bfd9a4404b1ef1b9c3ac;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index cf0e748db..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,6 +10,8 @@ #include #include #include +#include +#include #include #include @@ -37,6 +41,7 @@ #include +#include #include #include @@ -87,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); @@ -114,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); } //******************************************************************** @@ -132,45 +135,30 @@ 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()); - - // We have to check several attributes types - AttributeSelectionPtr aSelectAttr = - std::dynamic_pointer_cast(aAttr); - if (aSelectAttr) { - aSelectAttr->setValue(aBody, myShape); - updateObject(myFeature); - return true; - } else { - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - aRefAttr->setObject(mySelectedObject); - updateObject(myFeature); - return true; - } - } + 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; } } } @@ -202,26 +190,21 @@ 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 { + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + mySelectedObject = aRefAttr->object(); } else { - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - mySelectedObject = aRefAttr->object(); + AttributeReferencePtr aRef = aData->reference(attributeID()); + if (aRef) { + mySelectedObject = aRef->value(); } } - } else { - AttributeReferencePtr aRef = aData->reference(attributeID()); - if (aRef) - mySelectedObject = aRef->value(); - else { - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) - mySelectedObject = aRefAttr->object(); - } } updateSelectionName(); @@ -245,8 +228,10 @@ void ModuleBase_WidgetShapeSelector::onSelectionChanged() //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations(); QList aSelected = myWorkshop->selection()->getSelected(); - if (aSelected.size() > 0) - setSelection(aSelected.first()); + if (aSelected.size() > 0) { + if (setSelection(aSelected.first())) + emit focusOutWidget(this); + } } //******************************************************************** @@ -286,24 +271,19 @@ bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue) return false; // Get sub-shapes from local selection - if (myUseSubShapes) { - if (!theValue.shape().IsNull()) { - aShape = std::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(theValue.shape())); - } + 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 false; - } else { - if (!acceptObjectShape(aObject)) - return false; - } + if (!acceptSubShape(aShape)) + return false; +// if (!acceptObjectShape(aObject)) +// return false; + if (isValid(aObject, aShape)) { setObject(aObject, aShape); - emit focusOutWidget(this); return true; } return false; @@ -322,33 +302,34 @@ void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr } //******************************************************************** -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 @@ -384,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(""); + } } } } @@ -402,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); } } @@ -446,19 +453,6 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const } } -//******************************************************************** -//bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue) -//{ -// if (theValue.object()) { -// ObjectPtr aObject = theValue.object(); -// if (acceptObjectShape(aObject)) { -// setObject(aObject); -// return true; -// } -// } -// return false; -//} - //******************************************************************** void ModuleBase_WidgetShapeSelector::activate() {