X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=89c506e8616a6ab567b72501212f57e68f76ff70;hb=2ae03d01e656c09a563bf30d741e5f6ce4cf3a53;hp=b021cb0b7e26ee335e0ec2a2bd350974258998e9;hpb=ead20a0065c5c4552f3e02c7d6f304110dc0e4e6;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index b021cb0b7..89c506e86 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-2020 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,17 +23,17 @@ #include #include #include -#include #include +#include +#include +#include -#include - +#include #include #include #include #include #include -#include #include #include @@ -37,10 +50,8 @@ #include #include #include -#include #include -#include #include @@ -67,133 +78,91 @@ #include #include - ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myWorkshop(theWorkshop) + 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); - - myShapeValidator = new GeomValidators_ShapeType(); } //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); - activateFilters(myWorkshop, false); - - delete myShapeValidator; } //******************************************************************** -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 aResult = std::dynamic_pointer_cast(theSelectedObject); - if (aSelectAttr.get() != NULL) { - aSelectAttr->setValue(aResult, 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; } //******************************************************************** -QList ModuleBase_WidgetShapeSelector::getAttributeSelection() const +QList ModuleBase_WidgetShapeSelector::getAttributeSelection() const { - QList aSelected; + QList aSelected; if(myFeature) { DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); - ObjectPtr anObject = GeomValidators_Tools::getObject(anAttribute); - TopoDS_Shape aShape; + ObjectPtr anObject = ModuleBase_Tools::getObject(anAttribute); std::shared_ptr aShapePtr = getShape(); - if (aShapePtr.get()) { - aShape = aShapePtr->impl(); - } - ModuleBase_ViewerPrs aPrs(anObject, aShape, NULL); + ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs(anObject, aShapePtr, NULL)); aSelected.append(aPrs); } return aSelected; } //******************************************************************** -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()); - } -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::restoreValue() +bool ModuleBase_WidgetShapeSelector::restoreValueCustom() { bool isBlocked = this->blockSignals(true); updateSelectionName(); @@ -210,37 +179,19 @@ QList ModuleBase_WidgetShapeSelector::getControls() const return aControls; } -//******************************************************************** -void ModuleBase_WidgetShapeSelector::onSelectionChanged() +void ModuleBase_WidgetShapeSelector::updateFocus() { - // In order to make reselection possible, set empty object and shape should be done - setObject(ObjectPtr(), std::shared_ptr(new GeomAPI_Shape())); - - bool aHasObject = false; - QList aSelectedPrs = getSelectedEntitiesOrObjects(myWorkshop->selection()); - if (!aSelectedPrs.empty()) { - ModuleBase_ViewerPrs aPrs = aSelectedPrs.first(); - if (!aPrs.isEmpty() && isValidSelection(aPrs)) { - setSelectionCustom(aPrs); - aHasObject = true; - } - } - // 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); - // the widget loses the focus only if the selected object is set - if (aHasObject) - emit focusOutWidget(this); + emit focusOutWidget(this); } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::acceptSubShape(const TopoDS_Shape& theShape) const +QIntList ModuleBase_WidgetShapeSelector::shapeTypes() const { - foreach (QString aType, myShapeTypes) { - if (theShape.ShapeType() == ModuleBase_Tools::shapeType(aType)) - return true; + QIntList aShapeTypes; + foreach(QString aType, myShapeTypes) { + aShapeTypes.append(ModuleBase_Tools::shapeType(aType)); } - return false; + return aShapeTypes; } //******************************************************************** @@ -248,13 +199,10 @@ GeomShapePtr ModuleBase_WidgetShapeSelector::getShape() const { GeomShapePtr aShape; DataPtr aData = myFeature->data(); - if (!aData->isValid()) - 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; } @@ -268,11 +216,12 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() bool isNameUpdated = false; AttributeSelectionPtr aSelect = aData->selection(attributeID()); if (aSelect) { - myTextLine->setText(QString::fromStdString(aSelect->namingName(getDefaultValue()))); + std::string aDefault = translate(getDefaultValue()).toStdString(); + myTextLine->setText(QString::fromStdString(aSelect->namingName(aDefault))); 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)); @@ -280,171 +229,18 @@ 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 = ModuleBase_Tools::generateName(aRefAttr->attr(), myWorkshop); + myTextLine->setText(QString::fromStdString(anAttrName)); } else { - myTextLine->setText(getDefaultValue().c_str()); + myTextLine->setText(translate(getDefaultValue())); } } } } - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate) -{ - updateSelectionName(); - - if (toActivate) { - QIntList aList; - foreach (QString aType, myShapeTypes) { - aList.append(ModuleBase_Tools::shapeType(aType)); - } - myWorkshop->activateSubShapesSelection(aList); - } else { - myWorkshop->deactivateSubShapesSelection(); - } -} - //******************************************************************** -void ModuleBase_WidgetShapeSelector::raisePanel() const +bool ModuleBase_WidgetShapeSelector::isModified() 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); - - // Restore selection in the viewer by the attribute selection list - myWorkshop->setSelected(getAttributeSelection()); - - activateFilters(myWorkshop, true); -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::storeAttributeValue() -{ - DataPtr aData = myFeature->data(); - AttributePtr anAttribute = myFeature->attribute(attributeID()); - - myObject = GeomValidators_Tools::getObject(anAttribute); - myShape = getShape(); - myRefAttribute = AttributePtr(); - 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); - } -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::customValidators( - std::list& theValidators, - std::list >& theArguments) const -{ - return; - theValidators.push_back(myShapeValidator); - - std::list anArguments; - foreach(QString aType, myShapeTypes) { - anArguments.push_back(aType.toStdString().c_str()); - } - theArguments.push_back(anArguments); -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) -{ - bool isDone = false; - - // It should be checked by corresponded validator - ObjectPtr aObject = thePrs.object(); - ObjectPtr aCurrentObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID())); - /* - if ((!aCurrentObject) && (!aObject)) - return false;*/ - - // It should be checked by corresponded validator - // 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; - } - } - */ - // It should be checked by corresponded validator - /* - // 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;*/ - - // It should be checked by corresponded validator - // Check that the result has a shape - GeomShapePtr aShape = ModelAPI_Tools::shape(aRes); - if (!aShape) - return false; - - // Get sub-shapes from local selection - if (!thePrs.shape().IsNull()) { - aShape = std::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(thePrs.shape())); - } - // Check that the selection corresponds to selection type - TopoDS_Shape aTopoShape = aShape->impl(); - if (!acceptSubShape(aTopoShape)) - return false; - - setObject(aObject, aShape); - return true; -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); - activateFilters(myWorkshop, false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -} + return !myTextLine->text().isEmpty(); +} \ No newline at end of file