X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=6d47be32c6aa52f2ded96d5afad18bacc366fd93;hb=f9fd953bf814fad40ae045f6164c7f80229b0872;hp=457a9f6ffe392950c180d7a2105451e5368ca3c4;hpb=a94eeab620f6c2a559f5fea9b7d638423d010e62;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 457a9f6ff..6d47be32c 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 -// File: ModuleBase_WidgetShapeSelector.h +// File: ModuleBase_WidgetShapeSelector.cpp // Created: 2 June 2014 // Author: Vitaly Smetannikov @@ -67,14 +67,11 @@ #include #include -//#define DEBUG_SHAPE_VALIDATION_PREVIOUS - 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); @@ -96,14 +93,11 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen std::string aTypes = theData->getProperty("shape_types"); myShapeTypes = QString(aTypes.c_str()).split(' ', QString::SkipEmptyParts); - - myShapeValidator = new GeomValidators_ShapeType(); } //******************************************************************** ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector() { - delete myShapeValidator; } //******************************************************************** @@ -114,21 +108,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()); @@ -136,18 +124,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; } //******************************************************************** @@ -173,25 +158,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(); @@ -208,37 +180,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 = myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls); - 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::getShapeTypes() 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; } //******************************************************************** @@ -292,52 +246,6 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() } } - -//******************************************************************** -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() { @@ -368,110 +276,3 @@ void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid) 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::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) -{ -#ifdef DEBUG_SHAPE_VALIDATION_PREVIOUS - return true; -#endif - - GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs); - bool aValid; - // if there is no selected shape, the method returns true - if (!aShape.get()) - aValid = true; - else { - // Check that the selection corresponds to selection type - TopoDS_Shape aTopoShape = aShape->impl(); - aValid = acceptSubShape(aTopoShape); - } - return aValid; -} - -//******************************************************************** -bool ModuleBase_WidgetShapeSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) -{ - bool isDone = false; - - ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); - - // 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;*/ - -#ifdef DEBUG_SHAPE_VALIDATION_PREVIOUS - // 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; -#else - // the difference is that the next method returns an empty shape if the result has the same shape - // to be checked for all cases and uncommented - GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs); -#endif - - setObject(aResult, aShape); - return true; -} - -//******************************************************************** -void ModuleBase_WidgetShapeSelector::deactivate() -{ - activateSelection(false); - activateFilters(myWorkshop, false); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -}