X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=46fc98370adee4d886d1cd61bee8afb68bb1dc78;hb=efe17b3c886ebdac71a0090714db258ce15bd45a;hp=ef46fa06220feb56ad5b131594aab1b1d19ae299;hpb=c65c7a084cf32f54c8d8a93fceace414c3b0fb21;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index ef46fa062..46fc98370 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 @@ -12,13 +12,16 @@ #include #include #include +#include +#include +#include +#include #include #include #include #include #include -#include #include #include @@ -35,10 +38,8 @@ #include #include #include -#include #include -#include #include @@ -65,54 +66,31 @@ #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) + const Config_WidgetAPI* theData) +: ModuleBase_WidgetSelector(theParent, theWorkshop, theData) { QFormLayout* aLayout = new QFormLayout(this); ModuleBase_Tools::adjustMargins(aLayout); - QString aLabelText = QString::fromStdString(theData->widgetLabel()); + QString aLabelText = translate(theData->widgetLabel()); QString aLabelIcon = QString::fromStdString(theData->widgetIcon()); myLabel = new QLabel(aLabelText, this); if (!aLabelIcon.isEmpty()) - myLabel->setPixmap(QPixmap(aLabelIcon)); + myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon)); - QString aToolTip = QString::fromStdString(theData->widgetTooltip()); + QString aToolTip = translate(theData->widgetTooltip()); myTextLine = new QLineEdit(this); + QString anObjName = QString::fromStdString(attributeID()); + myTextLine->setObjectName(anObjName); myTextLine->setReadOnly(true); myTextLine->setToolTip(aToolTip); 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,75 +99,58 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::storeValueCustom() const +bool ModuleBase_WidgetShapeSelector::storeValueCustom() { - // the value is stored on the selection changed signal processing + // the value is stored on the selection changed signal processing return true; } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, - GeomShapePtr theShape) +bool ModuleBase_WidgetShapeSelector::setSelection(QList& theValues, + const bool theToValidate) { - bool isChanged = false; - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject); - if (aSelectedFeature == myFeature) // In order to avoid selection of the same object - return isChanged; + if (theValues.empty()) { + // In order to make reselection possible, set empty object and shape should be done + setSelectionCustom(std::shared_ptr(new ModuleBase_ViewerPrs( + ObjectPtr(), GeomShapePtr(), NULL))); + return false; + } + // it removes the processed value from the parameters list + ModuleBase_ViewerPrsPtr aValue = theValues.takeFirst(); + bool isDone = false; - 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()); - if (aRefAttr) { - 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; - } - } + if (!theToValidate || isValidInFilters(aValue)) { + isDone = setSelectionCustom(aValue); + // updateObject - to update/redisplay feature + // it is commented in order to perfom it outside the method + //updateObject(myFeature); + // to storeValue() + //emit valuesChanged(); } - return isChanged; + return isDone; } //******************************************************************** -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); + std::shared_ptr aShapePtr = getShape(); + ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs(anObject, aShapePtr, NULL)); + aSelected.append(aPrs); } + return aSelected; } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::restoreValue() +bool ModuleBase_WidgetShapeSelector::restoreValueCustom() { bool isBlocked = this->blockSignals(true); updateSelectionName(); @@ -206,70 +167,19 @@ QList ModuleBase_WidgetShapeSelector::getControls() const return aControls; } -//******************************************************************** -void ModuleBase_WidgetShapeSelector::onSelectionChanged() +void ModuleBase_WidgetShapeSelector::updateFocus() { - // 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); - // the updateObject method should be called to flush the updated sigal. The workshop listens it, - // calls validators for the feature and, as a result, updates the Apply button state. - updateObject(myFeature); - //if (theObj) { - // raisePanel(); - //} - //updateSelectionName(); - //emit valuesChanged(); - emit focusOutWidget(this); - } - } + emit focusOutWidget(this); } //******************************************************************** -//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 +QIntList ModuleBase_WidgetShapeSelector::shapeTypes() const { - TopoDS_Shape aShape = theShape->impl(); - foreach (QString aType, myShapeTypes) { - if (aShape.ShapeType() == shapeType(aType)) - return true; + QIntList aShapeTypes; + foreach(QString aType, myShapeTypes) { + aShapeTypes.append(ModuleBase_Tools::shapeType(aType)); } - return false; + return aShapeTypes; } //******************************************************************** @@ -277,13 +187,10 @@ GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const { GeomShapePtr aShape; DataPtr aData = myFeature->data(); - if (aData.get() == NULL) - return aShape; - - AttributeSelectionPtr aSelect = aData->selection(attributeID()); - if (aSelect) - aShape = aSelect->value(); - + if (aData->isValid()) { + AttributePtr anAttribute = myFeature->data()->attribute(attributeID()); + aShape = ModuleBase_Tools::getShape(anAttribute, myWorkshop); + } return aShape; } @@ -291,17 +198,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 = GeomValidators_Tools::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)); @@ -309,150 +216,12 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); if (aRefAttr && aRefAttr->attr().get() != NULL) { //myIsObject = aRefAttr->isObject(); - AttributePtr anAttr = aRefAttr->attr(); - if (anAttr.get() != NULL) { - std::stringstream aName; - aName <owner()->data()->name()<<"/"<id(); - myTextLine->setText(QString::fromStdString(aName.str())); - } + std::string anAttrName = generateName(aRefAttr->attr(), myWorkshop); + myTextLine->setText(QString::fromStdString(anAttrName)); } - 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() -{ - connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateSelection(true); -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::storeAttributeValue() -{ - DataPtr aData = myFeature->data(); - AttributePtr anAttribute = myFeature->attribute(attributeID()); - - myObject = GeomValidators_Tools::getObject(anAttribute); - myShape = getShape(); - myRefAttribute = NULL; - myIsObject = false; - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - myIsObject = aRefAttr->isObject(); - myRefAttribute = aRefAttr->attr(); - } -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) -{ - DataPtr aData = myFeature->data(); - AttributePtr anAttribute = myFeature->attribute(attributeID()); - - setObject(myObject, myShape); - AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { - if (!myIsObject) - aRefAttr->setAttr(myRefAttribute); - } -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::setSelection(const Handle_SelectMgr_EntityOwner& theOwner) -{ - bool isDone = false; - - ModuleBase_ViewerPrs aPrs; - myWorkshop->selection()->fillPresentation(aPrs, theOwner); - ObjectPtr aObject = aPrs.object(); - ObjectPtr aCurrentObject = GeomValidators_Tools::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 (!aPrs.shape().IsNull()) { - aShape = std::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(aPrs.shape())); - } - // Check that the selection corresponds to selection type - if (!acceptSubShape(aShape)) - return false; - - setObject(aObject, aShape); - return true; -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -}