X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=47fc4b44c12474b84c49673fab4988121f6ac93b;hb=86c435d69e7b27d36c037ed028d79d8f32f021ac;hp=cea370ba22459d542c78437cc3e13f7c637347af;hpb=ae56990359c40cfa4fa0fc99be2fd7e64c4c0ea3;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index cea370ba2..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 @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -35,7 +34,6 @@ #include #include #include -#include #include #include @@ -65,13 +63,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) + : ModuleBase_WidgetSelector(theParent, theWorkshop, theData, theParentId) { QFormLayout* aLayout = new QFormLayout(this); ModuleBase_Tools::adjustMargins(aLayout); @@ -90,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); @@ -98,8 +95,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - activateSelection(false); - activateFilters(myWorkshop, false); } //******************************************************************** @@ -110,21 +105,15 @@ 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) { ObjectPtr aObject = aRef->value(); if (!(aObject && aObject->isSame(theSelectedObject))) { aRef->setValue(theSelectedObject); - isChanged = true; } } else { AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); @@ -132,18 +121,15 @@ bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, 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; } } } - return isChanged; } //******************************************************************** @@ -154,7 +140,7 @@ QList ModuleBase_WidgetShapeSelector::getAttributeSelectio DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); - ObjectPtr anObject = GeomValidators_Tools::getObject(anAttribute); + ObjectPtr anObject = ModuleBase_Tools::getObject(anAttribute); TopoDS_Shape aShape; std::shared_ptr aShapePtr = getShape(); if (aShapePtr.get()) { @@ -169,25 +155,12 @@ QList ModuleBase_WidgetShapeSelector::getAttributeSelectio //******************************************************************** 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()); - } + // 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(); @@ -204,38 +177,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(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; } //******************************************************************** @@ -243,7 +197,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()); @@ -257,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 = 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)); @@ -283,65 +237,21 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() } } else { - myTextLine->setText(""); + myTextLine->setText(getDefaultValue().c_str()); } } } } - -//******************************************************************** -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 -{ - 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() { + 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; @@ -355,6 +265,8 @@ void ModuleBase_WidgetShapeSelector::storeAttributeValue() //******************************************************************** void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) { + ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + DataPtr aData = myFeature->data(); AttributePtr anAttribute = myFeature->attribute(attributeID()); @@ -365,65 +277,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); - activateFilters(myWorkshop, false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -}