X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=47fc4b44c12474b84c49673fab4988121f6ac93b;hb=86c435d69e7b27d36c037ed028d79d8f32f021ac;hp=e60c8cb301559e8c065fe632d7153154f54d32d3;hpb=e3f1f11a6fa18935c70877e804bae039d375094b;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index e60c8cb30..47fc4b44c 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,6 +1,6 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_WidgetShapeSelector.h +// File: ModuleBase_WidgetShapeSelector.cpp // Created: 2 June 2014 // Author: Vitaly Smetannikov @@ -33,9 +33,7 @@ #include #include #include -#include #include -#include #include #include @@ -65,36 +63,11 @@ #include #include -typedef QMap ShapeTypes; -static ShapeTypes MyShapeTypes; - -TopAbs_ShapeEnum ModuleBase_WidgetShapeSelector::shapeType(const QString& theType) -{ - 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; - } - 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, ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, const std::string& theParentId) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myWorkshop(theWorkshop), myIsActive(false) + : ModuleBase_WidgetSelector(theParent, theWorkshop, theData, theParentId) { QFormLayout* aLayout = new QFormLayout(this); ModuleBase_Tools::adjustMargins(aLayout); @@ -113,6 +86,7 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen myTextLine->installEventFilter(this); aLayout->addRow(myLabel, myTextLine); + myLabel->setToolTip(aToolTip); std::string aTypes = theData->getProperty("shape_types"); myShapeTypes = QString(aTypes.c_str()).split(' ', QString::SkipEmptyParts); @@ -121,7 +95,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); } //******************************************************************** @@ -132,21 +105,15 @@ bool ModuleBase_WidgetShapeSelector::storeValueCustom() const } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::storeAttributeValues(ObjectPtr theSelectedObject, - GeomShapePtr theShape) const +void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, + GeomShapePtr theShape) { - bool isChanged = false; - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject); - if (aSelectedFeature == myFeature) // In order to avoid selection of the same object - return isChanged; - DataPtr aData = myFeature->data(); AttributeReferencePtr aRef = aData->reference(attributeID()); if (aRef) { ObjectPtr aObject = aRef->value(); if (!(aObject && aObject->isSame(theSelectedObject))) { aRef->setValue(theSelectedObject); - isChanged = true; } } else { AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); @@ -154,42 +121,46 @@ bool ModuleBase_WidgetShapeSelector::storeAttributeValues(ObjectPtr theSelectedO ObjectPtr aObject = aRefAttr->object(); if (!(aObject && aObject->isSame(theSelectedObject))) { aRefAttr->setObject(theSelectedObject); - isChanged = true; } } else { AttributeSelectionPtr aSelectAttr = aData->selection(attributeID()); - ResultPtr aBody = std::dynamic_pointer_cast(theSelectedObject); - if (aSelectAttr && aBody && (theShape.get() != NULL)) { - aSelectAttr->setValue(aBody, theShape); - isChanged = true; + ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); + if (aSelectAttr.get() != NULL) { + aSelectAttr->setValue(aResult, theShape); } } } - return isChanged; } //******************************************************************** -void ModuleBase_WidgetShapeSelector::clearAttribute() +QList ModuleBase_WidgetShapeSelector::getAttributeSelection() const { - 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()); + QList aSelected; + if(myFeature) { + DataPtr aData = myFeature->data(); + AttributePtr anAttribute = myFeature->attribute(attributeID()); + + ObjectPtr anObject = ModuleBase_Tools::getObject(anAttribute); + TopoDS_Shape aShape; + std::shared_ptr aShapePtr = getShape(); + if (aShapePtr.get()) { + aShape = aShapePtr->impl(); + } + ModuleBase_ViewerPrs aPrs(anObject, aShape, NULL); + aSelected.append(aPrs); } + return aSelected; +} + +//******************************************************************** +void ModuleBase_WidgetShapeSelector::clearAttribute() +{ + // In order to make reselection possible, set empty object and shape should be done + setObject(ObjectPtr(), std::shared_ptr(new GeomAPI_Shape())); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::restoreValue() +bool ModuleBase_WidgetShapeSelector::restoreValueCustom() { bool isBlocked = this->blockSignals(true); updateSelectionName(); @@ -206,153 +177,27 @@ QList ModuleBase_WidgetShapeSelector::getControls() const return aControls; } -//******************************************************************** -void ModuleBase_WidgetShapeSelector::onSelectionChanged() -{ - // 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) { - Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner(); - if (isValid(anOwner)) { - setSelection(anOwner); - emit focusOutWidget(this); - } - } -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::setSelectionPrs(ModuleBase_ViewerPrs theValue) +void ModuleBase_WidgetShapeSelector::updateFocus() { - ObjectPtr aObject = theValue.object(); - ObjectPtr aCurrentObject = getObject(myFeature->attribute(attributeID())); - if ((!aCurrentObject) && (!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; - - // 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; - - setObject(aObject, aShape); - return true; + emit focusOutWidget(this); } //******************************************************************** -void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr theShape) +QIntList ModuleBase_WidgetShapeSelector::getShapeTypes() const { - //if ( - storeAttributeValues(theObj, theShape);//) - // updateObject(myFeature); - - //if (theObj) { - // 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) { - if (aShape.ShapeType() == shapeType(aType)) - return true; - } - return false; -} - -ObjectPtr ModuleBase_WidgetShapeSelector::getObject(const AttributePtr& theAttribute) -{ - ObjectPtr anObject; - std::string anAttrType = theAttribute->attributeType(); - if (anAttrType == ModelAPI_AttributeRefAttr::type()) { - AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast(theAttribute); - if (anAttr != NULL && anAttr->isObject()) - anObject = anAttr->object(); - } - if (anAttrType == ModelAPI_AttributeSelection::type()) { - AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(theAttribute); - if (anAttr != NULL && anAttr->isInitialized()) - anObject = anAttr->context(); + QIntList aShapeTypes; + foreach(QString aType, myShapeTypes) { + aShapeTypes.append(ModuleBase_Tools::shapeType(aType)); } - if (anAttrType == ModelAPI_AttributeReference::type()) { - AttributeReferencePtr anAttr = std::dynamic_pointer_cast(theAttribute); - if (anAttr.get() != NULL && anAttr->isInitialized()) - anObject = anAttr->value(); - } - return anObject; + return aShapeTypes; } - //******************************************************************** GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const { GeomShapePtr aShape; DataPtr aData = myFeature->data(); - if (aData.get() == NULL) + if (!aData->isValid()) return aShape; AttributeSelectionPtr aSelect = aData->selection(attributeID()); @@ -366,17 +211,17 @@ GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const void ModuleBase_WidgetShapeSelector::updateSelectionName() { DataPtr aData = myFeature->data(); - if (aData.get() == NULL) + if (!aData->isValid()) return; bool isNameUpdated = false; AttributeSelectionPtr aSelect = aData->selection(attributeID()); if (aSelect) { - myTextLine->setText(QString::fromStdString(aSelect->namingName())); + myTextLine->setText(QString::fromStdString(aSelect->namingName(getDefaultValue()))); isNameUpdated = true; } if (!isNameUpdated) { - ObjectPtr anObject = getObject(myFeature->attribute(attributeID())); + ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID())); if (anObject.get() != NULL) { std::string aName = anObject->data()->name(); myTextLine->setText(QString::fromStdString(aName)); @@ -391,143 +236,44 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() myTextLine->setText(QString::fromStdString(aName.str())); } } - else if (myIsActive) { - myTextLine->setText(""); + else { + myTextLine->setText(getDefaultValue().c_str()); } } } } - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate) -{ - if (myIsActive == toActivate) - return; - myIsActive = toActivate; - updateSelectionName(); - - if (myIsActive) { - QIntList aList; - foreach (QString aType, myShapeTypes) { - aList.append(shapeType(aType)); - } - myWorkshop->activateSubShapesSelection(aList); - } else { - myWorkshop->deactivateSubShapesSelection(); - } - - activateFilters(myWorkshop, myIsActive); -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::raisePanel() const -{ - QWidget* aParent = this->parentWidget(); - QWidget* aLastPanel = 0; - while (!aParent->inherits("QDockWidget")) { - aLastPanel = aParent; - aParent = aParent->parentWidget(); - if (!aParent) - return; - } - if (aParent->inherits("QDockWidget")) { - QDockWidget* aTabWgt = (QDockWidget*) aParent; - aTabWgt->raise(); - } -} - //******************************************************************** -void ModuleBase_WidgetShapeSelector::activateCustom() +void ModuleBase_WidgetShapeSelector::storeAttributeValue() { - connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateSelection(true); -} + ModuleBase_WidgetValidated::storeAttributeValue(); -//******************************************************************** -void ModuleBase_WidgetShapeSelector::backupAttributeValue(const bool isBackup) -{ DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); - if (isBackup) { - myObject = getObject(anAttribute); - myShape = getShape(); - myRefAttribute = NULL; - myIsObject = false; - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - myIsObject = aRefAttr->isObject(); - myRefAttribute = aRefAttr->attr(); - } - } - else { - storeAttributeValues(myObject, myShape); - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - if (!myIsObject) - aRefAttr->setAttr(myRefAttribute); - } + myObject = ModuleBase_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::setSelection(const Handle_SelectMgr_EntityOwner& theOwner) +void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) { - bool isDone = false; - //QList aSelected = myWorkshop->selection()->getSelected(); - //if (aSelected.size() > 0) { - ModuleBase_ViewerPrs aPrs; - myWorkshop->selection()->fillPresentation(aPrs, theOwner); - isDone = setSelectionPrs(aPrs); - //} - return isDone; -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -} - -//******************************************************************** -/*bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr theShape) -{ - bool isValid = ModuleBase_WidgetValidated::isValid(theObj, theShape); - if (!isValid) - return false; - - SessionPtr aMgr = ModelAPI_Session::get(); - ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - std::list aValidators; - std::list > anArguments; - aFactory->validators(parentID(), attributeID(), aValidators, anArguments); + ModuleBase_WidgetValidated::restoreAttributeValue(theValid); DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); - // 1. make a backup of the previous attribute values - backupAttributeValue(true); - // 2. store the current values, disable the model's update - aData->blockSendAttributeUpdated(true); - - // 3. check the acceptability of the current values - std::list::iterator aValidator = aValidators.begin(); - std::list >::iterator aArgs = anArguments.begin(); - bool aValid = true; - for (; aValidator != aValidators.end() && aValid; aValidator++, aArgs++) { - const ModelAPI_AttributeValidator* aAttrValidator = - dynamic_cast(*aValidator); - if (aAttrValidator) { - aValid = aAttrValidator->isValid(anAttribute, *aArgs); - } + setObject(myObject, myShape); + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr) { + if (!myIsObject) + aRefAttr->setAttr(myRefAttribute); } - - // 4. if the values are not valid, restore the previous values to the attribute - backupAttributeValue(false); - - // 5. enable the model's update - aData->blockSendAttributeUpdated(false); - return aValid; -}*/ +}