X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=1047536e988e1abc372d0a6544e7bddc9f6b986b;hb=a7421299e56287e8e55310d7e3d8623e72933f00;hp=1f5d011ea30eb0e16e7dbba808ceb87ef0c6e862;hpb=6a7e53a3d3b52f1f798b7e3aa3c48de9c870d92b;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 1f5d011ea..1047536e9 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,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -65,13 +64,11 @@ #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), myIsActive(false) + : ModuleBase_WidgetSelector(theParent, theWorkshop, theData, theParentId) { QFormLayout* aLayout = new QFormLayout(this); ModuleBase_Tools::adjustMargins(aLayout); @@ -85,11 +82,14 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen QString aToolTip = QString::fromStdString(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); @@ -98,7 +98,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); } //******************************************************************** @@ -109,64 +108,67 @@ bool ModuleBase_WidgetShapeSelector::storeValueCustom() const } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, +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) { + std::string aType = aData->attribute(attributeID())->attributeType(); + if (aType == ModelAPI_AttributeReference::typeId()) { + AttributeReferencePtr aRef = aData->reference(attributeID()); ObjectPtr aObject = aRef->value(); if (!(aObject && aObject->isSame(theSelectedObject))) { aRef->setValue(theSelectedObject); - isChanged = true; } - } else { + } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); - if (aRefAttr) { + + AttributePtr anAttribute = myWorkshop->module()->findAttribute(theSelectedObject, theShape); + if (anAttribute.get()) + aRefAttr->setAttr(anAttribute); + else { 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) { - aSelectAttr->setValue(aResult, theShape); - isChanged = true; } } + } else if (aType == ModelAPI_AttributeSelection::typeId()) { + AttributeSelectionPtr aSelectAttr = aData->selection(attributeID()); + 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; } //******************************************************************** -bool ModuleBase_WidgetShapeSelector::restoreValue() +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::restoreValueCustom() { bool isBlocked = this->blockSignals(true); updateSelectionName(); @@ -183,73 +185,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(); - - QList aSelectedPrs = getSelectedEntitiesOrObjects(myWorkshop->selection()); - if (aSelectedPrs.empty()) - return; - ModuleBase_ViewerPrs aPrs = aSelectedPrs.first(); - if (aPrs.isEmpty() || !isValidSelection(aPrs)) - return; - - if (!aPrs.isEmpty() && isValidSelection(aPrs)) { - setSelectionCustom(aPrs); - // 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::getShapeTypes() const { - TopoDS_Shape aShape = theShape->impl(); - foreach (QString aType, myShapeTypes) { - if (aShape.ShapeType() == ModuleBase_Tools::shapeType(aType)) - return true; + QIntList aShapeTypes; + foreach(QString aType, myShapeTypes) { + aShapeTypes.append(ModuleBase_Tools::shapeType(aType)); } - return false; + return aShapeTypes; } //******************************************************************** @@ -257,7 +205,7 @@ 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()); @@ -271,17 +219,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)); @@ -289,73 +237,25 @@ 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()); + 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(ModuleBase_Tools::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() { + ModuleBase_WidgetValidated::storeAttributeValue(); + DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); - myObject = GeomValidators_Tools::getObject(anAttribute); + myObject = ModuleBase_Tools::getObject(anAttribute); myShape = getShape(); myRefAttribute = AttributePtr(); myIsObject = false; @@ -369,6 +269,8 @@ void ModuleBase_WidgetShapeSelector::storeAttributeValue() //******************************************************************** void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) { + ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); @@ -379,64 +281,3 @@ void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) aRefAttr->setAttr(myRefAttribute); } } - -//******************************************************************** -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 - if (!acceptSubShape(aShape)) - return false; - - setObject(aObject, aShape); - return true; -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -}