-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModuleBase_WidgetSelector.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultGroup.h>
+
+#include <Config_WidgetAPI.h>
#include <TopoDS_Iterator.hxx>
+// Get object from group
+// Return true if find object
+static bool getObjectFromGroup(ObjectPtr& theObject, GeomShapePtr& theShape);
+
ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent,
ModuleBase_IWorkshop* theWorkshop,
const Config_WidgetAPI* theData)
-: ModuleBase_WidgetValidated(theParent, theWorkshop, theData)
+: ModuleBase_WidgetValidated(theParent, theWorkshop, theData),
+myIsPointsFiltering(true)
{
+ QString aFiltering = QString::fromStdString(theData->getProperty("filter_points"));
+ if (aFiltering.toLower() == "false")
+ myIsPointsFiltering = false;
}
//********************************************************************
{
ModuleBase_ISelection* aSelection = myWorkshop->selection();
theObject = aSelection->getResult(thePrs);
+ if (!theObject.get())
+ theObject = thePrs->object();
theShape = aSelection->getShape(thePrs);
+
+ FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+ while (aFeature && aFeature->lastResult()->groupName() == ModelAPI_ResultGroup::group()) {
+ if (!getObjectFromGroup(theObject, theShape))
+ break;
+ aFeature = ModelAPI_Feature::feature(theObject);
+
+ thePrs->setObject(theObject);
+ }
}
//********************************************************************
{
QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
// equal vertices should not be used here
- ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected);
+ if (myIsPointsFiltering)
+ ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected);
bool isDone = setSelection(aSelected, true/*false*/);
updateOnSelectionChanged(isDone);
return aValid;
}
// when the SHAPE type is provided by XML as Object, the whole result shape should be selected.
- if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+ //if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+ // In case of selection of a feature aShape could be not NULL, but result has to be selected
+ if (aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
aValid = true;
return aValid;
}
if (aShape.get()) {
// Check that the selection corresponds to selection type
TopoDS_Shape aTopoShape = aShape->impl<TopoDS_Shape>();
- aShapeType = aTopoShape.ShapeType();
- // for compounds check sub-shapes: it may be compound of needed type:
- // Booleans may produce compounds of Solids
- if (aShapeType == TopAbs_COMPOUND) {
- aShapeType = ModuleBase_Tools::getCompoundSubType(aTopoShape);
+ if (!aTopoShape.IsNull()) {
+ aShapeType = aTopoShape.ShapeType();
+ // for compounds check sub-shapes: it may be compound of needed type:
+ // Booleans may produce compounds of Solids
+ if (aShapeType == TopAbs_COMPOUND) {
+ aShapeType = ModuleBase_Tools::getCompoundSubType(aTopoShape);
+ }
}
}
{
GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs);
ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
- bool aValid = acceptSubShape(aShape, aResult);
+ bool aValid = aResult.get();
+ if (!isWholeResultAllowed())
+ aValid = acceptSubShape(aShape, aResult);
if (aValid) {
// In order to avoid selection of the same object
- ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
+ aResult = myWorkshop->selection()->getResult(thePrs);
FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aResult);
aValid = aSelectedFeature != myFeature;
}
}
//********************************************************************
-std::string ModuleBase_WidgetSelector::generateName(const AttributePtr& theAttribute,
- ModuleBase_IWorkshop* theWorkshop)
+bool ModuleBase_WidgetSelector::isWholeResultAllowed() const
{
- std::string aName;
- if (theAttribute.get() != NULL) {
- ModuleBase_Operation* anOperation = theWorkshop->currentOperation();
-
- FeaturePtr aFeature = ModelAPI_Feature::feature(theAttribute->owner());
- if (aFeature.get()) {
- std::string aXmlCfg, aDescription;
- theWorkshop->module()->getXMLRepresentation(aFeature->getKind(), aXmlCfg, aDescription);
-
- ModuleBase_WidgetFactory aFactory(aXmlCfg, theWorkshop);
- std::string anAttributeTitle;
- aFactory.getAttributeTitle(theAttribute->id(), anAttributeTitle);
-
- std::stringstream aStreamName;
- aStreamName << theAttribute->owner()->data()->name() << "/"<< anAttributeTitle.c_str();
- aName = aStreamName.str();
- }
+ AttributePtr anAttribute = attribute();
+ if (anAttribute.get()) {
+ AttributeSelectionListPtr aSelAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(anAttribute);
+ if (aSelAttr.get())
+ return aSelAttr->isWholeResultAllowed();
}
- return aName;
+ return false;
}
+
+bool getObjectFromGroup(ObjectPtr& theObject, GeomShapePtr& theShape)
+{
+ FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+
+ AttributeSelectionListPtr anAttrList = aFeature->selectionList("group_list");
+
+ for (int anIndex = 0; anIndex < anAttrList->size(); ++anIndex) {
+ AttributeSelectionPtr aSelect = anAttrList->value(anIndex);
+ if (aSelect->context()->shape()->isSubShape(theShape) ||
+ aSelect->context()->shape()->isEqual(theShape)) {
+ theObject = aSelect->contextObject();
+ return true;
+ }
+ }
+ return false;
+}
\ No newline at end of file
