X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=0a15d04b6e674b3fc1f8c181d610d4f069ed83fe;hb=60bbd6f564271cbd47808e7acc3c9b725499d45a;hp=a5e09fea367af384b75ca16d969b2dc54d200216;hpb=12866ad4430e2c7b4fe186d7117291e7aa09a18e;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index a5e09fea3..0a15d04b6 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -2,21 +2,38 @@ // Created: 2 June 2014 // Author: Vitaly Smetannikov -#include "ModuleBase_WidgetShapeSelector.h" +#include +#include +#include #include -#include "ModuleBase_WidgetValue.h" +#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 @@ -31,8 +48,15 @@ #include #include #include +#include + +#include +#include -#include +#include + +#include +#include typedef QMap ShapeTypes; static ShapeTypes MyShapeTypes; @@ -41,15 +65,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, @@ -57,7 +87,7 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen const Config_WidgetAPI* theData, const std::string& theParentId) : ModuleBase_ModelWidget(theParent, theData, theParentId), - myWorkshop(theWorkshop), myIsActive(false) + myWorkshop(theWorkshop), myIsActive(false), myUseSubShapes(false) { myContainer = new QWidget(theParent); QHBoxLayout* aLayout = new QHBoxLayout(myContainer); @@ -77,20 +107,21 @@ 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 aObjTypes = theData->getProperty("object_types"); + myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts); + + myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); } //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { + activateSelection(false); } //******************************************************************** @@ -101,25 +132,97 @@ bool ModuleBase_WidgetShapeSelector::storeValue() const return false; DataPtr aData = myFeature->data(); - boost::shared_ptr aRef = boost::dynamic_pointer_cast< - ModelAPI_AttributeReference>(aData->attribute(attributeID())); + 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; + } + } + } + } else { + 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; + } + } + } + } + return false; +} - ObjectPtr aObject = aRef->value(); - if (!(aObject && aObject->isSame(mySelectedObject))) { - aRef->setValue(mySelectedObject); - updateObject(myFeature); +//******************************************************************** +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()); } - return true; } //******************************************************************** bool ModuleBase_WidgetShapeSelector::restoreValue() { DataPtr aData = myFeature->data(); - boost::shared_ptr aRef = aData->reference(attributeID()); - bool isBlocked = this->blockSignals(true); - mySelectedObject = aRef->value(); + if (myUseSubShapes) { + 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(); + else { + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) + mySelectedObject = aRefAttr->object(); + } + } updateSelectionName(); this->blockSignals(isBlocked); @@ -130,7 +233,6 @@ bool ModuleBase_WidgetShapeSelector::restoreValue() QList ModuleBase_WidgetShapeSelector::getControls() const { QList aControls; - aControls.append(myLabel); aControls.append(myTextLine); return aControls; } @@ -138,54 +240,93 @@ QList ModuleBase_WidgetShapeSelector::getControls() const //******************************************************************** void ModuleBase_WidgetShapeSelector::onSelectionChanged() { - QList aObjects = myWorkshop->selectedObjects(); - if (aObjects.size() > 0) { - ObjectPtr aObject = aObjects.first(); - if ((!mySelectedObject) && (!aObject)) - return; - if (mySelectedObject && aObject && mySelectedObject->isSame(aObject)) - return; + // In order to make reselection possible + // TODO: check with MPV clearAttribute(); - // Check that the selection corresponds to selection type - if (!isAccepted(aObject)) - return; + //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations(); + QList aSelected = myWorkshop->selection()->getSelected(); + if (aSelected.size() > 0) + setSelection(aSelected.first()); +} + +//******************************************************************** +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(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 false; + + // 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 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())); + } + } - setObject(aObject); + // Check that the selection corresponds to selection type + if (myUseSubShapes) { + if (!acceptSubShape(aShape)) + return false; + } else { + if (!acceptObjectShape(aObject)) + return false; + } + if (isValid(aObject, aShape)) { + setObject(aObject, aShape); + emit focusOutWidget(this); } + return true; } //******************************************************************** -void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj) +void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr theShape) { - if (mySelectedObject == theObj) - return; mySelectedObject = theObj; + myShape = theShape; if (mySelectedObject) { raisePanel(); - 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(); - emit focusOutWidget(this); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::isAccepted(const ObjectPtr theResult) const +bool ModuleBase_WidgetShapeSelector::acceptObjectShape(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) - return false; - } - } - boost::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); + 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(); @@ -208,6 +349,37 @@ bool ModuleBase_WidgetShapeSelector::isAccepted(const ObjectPtr theResult) const return false; } +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::acceptSubShape(std::shared_ptr theShape) const +{ + TopoDS_Shape aShape = theShape->impl(); + foreach (QString aType, myShapeTypes) { + if (aShape.ShapeType() == shapeType(aType)) + return true; + } + 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() { @@ -216,17 +388,8 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() 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++; - } - myTextLine->setText(aMsg); - } else - myTextLine->setText(tr("No object selected")); + myTextLine->setText(""); + } } } @@ -234,17 +397,35 @@ 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(); - if (myIsActive) + if (myIsActive) { connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - else + 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); + } + } + } else { disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + if (myUseSubShapes) { + if (!myObjTypeFilter.IsNull()) { + myWorkshop->viewer()->removeSelectionFilter(myObjTypeFilter); + myObjTypeFilter.Nullify(); + } + myWorkshop->deactivateSubShapesSelection(); + } + } } //******************************************************************** @@ -265,36 +446,67 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::focusTo() +//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() { 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