X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=e5ea9338995ae5ac20362446cbfc2a8d0a26f6f2;hb=f64cb187ce9ab2190d8eff7c9be7dcfffc4242a0;hp=74bd7f61aa2b07a82c43e7b2fc32adb5f966a2b5;hpb=71c613d18c2aa77e10f5b62100b9a0e3d71d023f;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 74bd7f61a..e5ea93389 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetShapeSelector.h -// Created: 2 June 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -10,9 +23,12 @@ #include #include #include -#include #include +#include +#include +#include +#include #include #include #include @@ -33,12 +49,9 @@ #include #include #include -#include -#include -#include +#include #include -#include #include @@ -55,6 +68,7 @@ #include #include #include +#include #include #include @@ -64,152 +78,96 @@ #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_ModelWidget(theParent, theData, theParentId), - myWorkshop(theWorkshop), myIsActive(false) + const Config_WidgetAPI* theData) +: ModuleBase_WidgetSelector(theParent, theWorkshop, theData) { - myContainer = new QWidget(theParent); - QHBoxLayout* aLayout = new QHBoxLayout(myContainer); + 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, myContainer); + myLabel = new QLabel(aLabelText, this); if (!aLabelIcon.isEmpty()) - myLabel->setPixmap(QPixmap(aLabelIcon)); + myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon)); - aLayout->addWidget(myLabel); - QString aToolTip = QString::fromStdString(theData->widgetTooltip()); - myTextLine = new QLineEdit(myContainer); + 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->addWidget(myTextLine, 1); + aLayout->addRow(myLabel, myTextLine); + myLabel->setToolTip(aToolTip); std::string aTypes = theData->getProperty("shape_types"); myShapeTypes = QString(aTypes.c_str()).split(' ', QString::SkipEmptyParts); - - std::string aObjTypes = theData->getProperty("object_types"); - myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts); } //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::storeValue() const +bool ModuleBase_WidgetShapeSelector::storeValueCustom() +{ + // the value is stored on the selection changed signal processing + return true; +} + +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::setSelection(QList& theValues, + const bool theToValidate) { - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(mySelectedObject); - if (aSelectedFeature == myFeature) // In order to avoid selection of the same object + 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(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; - } - } + 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 false; + 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() { - DataPtr aData = myFeature->data(); bool isBlocked = this->blockSignals(true); - - 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(); - } - } - } updateSelectionName(); - this->blockSignals(isBlocked); + return true; } @@ -221,299 +179,61 @@ 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) { - if (setSelection(aSelected.first())) - emit focusOutWidget(this); - } + emit focusOutWidget(this); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue) +QIntList ModuleBase_WidgetShapeSelector::shapeTypes() const { - 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 (!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; + QIntList aShapeTypes; + foreach(QString aType, myShapeTypes) { + aShapeTypes.append(ModuleBase_Tools::shapeType(aType)); } - return false; + return aShapeTypes; } //******************************************************************** -void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr theShape) +GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const { - 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) { - 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 + GeomShapePtr aShape; + DataPtr aData = myFeature->data(); + if (aData->isValid()) { + AttributePtr anAttribute = myFeature->data()->attribute(attributeID()); + aShape = ModuleBase_Tools::getShape(anAttribute, myWorkshop); } - // Object type is defined but not found - return false; + return aShape; } - //******************************************************************** void ModuleBase_WidgetShapeSelector::updateSelectionName() { DataPtr aData = myFeature->data(); + if (!aData->isValid()) + return; + bool isNameUpdated = false; - if (aData.get() != NULL) { - AttributeSelectionPtr aSelect = aData->selection(attributeID()); - if (aSelect) { - myTextLine->setText(QString::fromStdString(aSelect->namingName())); - isNameUpdated = true; - } + AttributeSelectionPtr aSelect = aData->selection(attributeID()); + if (aSelect) { + myTextLine->setText(QString::fromStdString(aSelect->namingName(getDefaultValue()))); + isNameUpdated = true; } if (!isNameUpdated) { - if (mySelectedObject) { - std::string aName = mySelectedObject->data()->name(); + ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID())); + if (anObject.get() != NULL) { + std::string aName = anObject->data()->name(); myTextLine->setText(QString::fromStdString(aName)); } else { - if (myIsActive) { - myTextLine->setText(""); + AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); + if (aRefAttr && aRefAttr->attr().get() != NULL) { + //myIsObject = aRefAttr->isObject(); + std::string anAttrName = ModuleBase_Tools::generateName(aRefAttr->attr(), myWorkshop); + myTextLine->setText(QString::fromStdString(anAttrName)); } - } - } -} - - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate) -{ - if (myIsActive == toActivate) - return; - myIsActive = toActivate; - updateSelectionName(); - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - - if (myIsActive) { - connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - 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 (!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); - } -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::raisePanel() const -{ - QWidget* aParent = myContainer->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() -{ - activateSelection(true); -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr theShape) -{ - 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; + else { + myTextLine->setText(getDefaultValue().c_str()); } } } - 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, theShape)) { - return false; - } - } - else { - const ModelAPI_ShapeValidator* aShapeValidator = - dynamic_cast(*aValidator); - if (aShapeValidator) { - DataPtr aData = myFeature->data(); - AttributeSelectionPtr aSelectAttr = aData->selection(attributeID()); - if (!aShapeValidator->isValid(myFeature, aSelectAttr, theShape)) { - return false; - } - } - } - } - return true; -} \ No newline at end of file +}