X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetMultiSelector.cpp;h=770882294fe6107bcdc1e6fe6784d140f12b5805;hb=01159d19136fded13c08b72974dc897173376eb4;hp=8fc20d6b94e1bd76b76f13f82d4f26c8ce5b487f;hpb=dbf43e581cd94f420a395f7347926a26218451a3;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp index 8fc20d6b9..770882294 100644 --- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D /* * ModuleBase_WidgetMultiSelector.cpp @@ -9,11 +9,13 @@ #include #include -#include #include #include #include #include +#include + +#include #include #include @@ -34,12 +36,13 @@ #include #include +//#define DEBUG_SHAPE_VALIDATION_PREVIOUS + ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(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) { QGridLayout* aMainLay = new QGridLayout(this); ModuleBase_Tools::adjustMargins(aMainLay); @@ -54,24 +57,28 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen QString aTypesStr = aPropertyTypes.c_str(); QStringList aShapeTypes = aTypesStr.split(' '); + myIsUseChoice = theData->getBooleanAttribute("use_choice", true); + myTypeCombo->addItems(aShapeTypes); aMainLay->addWidget(myTypeCombo, 0, 1); // if the xml definition contains one type, the controls to select a type should not be shown - if (aShapeTypes.size() == 1) { + if (aShapeTypes.size() == 1 || !myIsUseChoice) { aTypeLabel->setVisible(false); myTypeCombo->setVisible(false); } - QLabel* aListLabel = new QLabel(tr("Selected objects:"), this); + std::string aLabelText = theData->getProperty("label"); + QLabel* aListLabel = new QLabel(!aLabelText.empty() ? aLabelText.c_str() + : tr("Selected objects:"), this); aMainLay->addWidget(aListLabel, 1, 0); // if the xml definition contains one type, an information label should be shown near to the latest if (aShapeTypes.size() == 1) { - QString aLabelText = QString::fromStdString(theData->widgetLabel()); QString aLabelIcon = QString::fromStdString(theData->widgetIcon()); - QLabel* aSelectedLabel = new QLabel(aLabelText, this); - if (!aLabelIcon.isEmpty()) + if (!aLabelIcon.isEmpty()) { + QLabel* aSelectedLabel = new QLabel("", this); aSelectedLabel->setPixmap(QPixmap(aLabelIcon)); - aMainLay->addWidget(aSelectedLabel, 1, 1); + aMainLay->addWidget(aSelectedLabel, 1, 1); + } aMainLay->setColumnStretch(2, 1); } @@ -94,35 +101,26 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen ModuleBase_WidgetMultiSelector::~ModuleBase_WidgetMultiSelector() { - myIsActive = false; - activateShapeSelection(); -} - -//******************************************************************** -void ModuleBase_WidgetMultiSelector::activateCustom() -{ - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - connect(myWorkshop, SIGNAL(selectionChanged()), - this, SLOT(onSelectionChanged()), - Qt::UniqueConnection); - - myIsActive = true; - activateShapeSelection(); -} - -//******************************************************************** -void ModuleBase_WidgetMultiSelector::deactivate() -{ - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - myIsActive = false; - activateShapeSelection(); } //******************************************************************** bool ModuleBase_WidgetMultiSelector::storeValueCustom() const { // the value is stored on the selection changed signal processing - return true; + // A rare case when plugin was not loaded. + if(!myFeature) + return false; + DataPtr aData = myFeature->data(); + AttributeSelectionListPtr aSelectionListAttr = + std::dynamic_pointer_cast(aData->attribute(attributeID())); + + if (aSelectionListAttr) { + // Store shapes type + TopAbs_ShapeEnum aCurrentType = + ModuleBase_Tools::shapeType(myTypeCombo->currentText()); + aSelectionListAttr->setSelectionType(myTypeCombo->currentText().toStdString()); + } + return true; } //******************************************************************** @@ -137,8 +135,8 @@ bool ModuleBase_WidgetMultiSelector::restoreValue() if (aSelectionListAttr) { // Restore shape type - setCurrentShapeType( - ModuleBase_WidgetShapeSelector::shapeType(aSelectionListAttr->selectionType().c_str())); + if (!aSelectionListAttr->selectionType().empty()) + setCurrentShapeType(ModuleBase_Tools::shapeType(aSelectionListAttr->selectionType().c_str())); updateSelectionList(aSelectionListAttr); return true; } @@ -146,7 +144,7 @@ bool ModuleBase_WidgetMultiSelector::restoreValue() } //******************************************************************** -void ModuleBase_WidgetMultiSelector::backupAttributeValue(const bool isBackup) +void ModuleBase_WidgetMultiSelector::storeAttributeValue() { DataPtr aData = myFeature->data(); AttributeSelectionListPtr aSelectionListAttr = @@ -154,67 +152,112 @@ void ModuleBase_WidgetMultiSelector::backupAttributeValue(const bool isBackup) if (aSelectionListAttr.get() == NULL) return; - if (isBackup) { - mySelectionType = aSelectionListAttr->selectionType(); - mySelection.clear(); - for (int i = 0; i < aSelectionListAttr->size(); i++) { - AttributeSelectionPtr aSelectAttr = aSelectionListAttr->value(i); - mySelection.append(GeomSelection(aSelectAttr->context(), aSelectAttr->value())); - } + mySelectionType = aSelectionListAttr->selectionType(); + mySelection.clear(); + int aSize = aSelectionListAttr->size(); + for (int i = 0; i < aSelectionListAttr->size(); i++) { + AttributeSelectionPtr aSelectAttr = aSelectionListAttr->value(i); + mySelection.append(GeomSelection(aSelectAttr->context(), aSelectAttr->value())); } - else { - aSelectionListAttr->clear(); - // Store shapes type - aSelectionListAttr->setSelectionType(mySelectionType); +} - // Store selection in the attribute - foreach (GeomSelection aSelec, mySelection) { - aSelectionListAttr->append(aSelec.first, aSelec.second); - } - } +//******************************************************************** +void ModuleBase_WidgetMultiSelector::clearAttribute() +{ + DataPtr aData = myFeature->data(); + AttributeSelectionListPtr aSelectionListAttr = + std::dynamic_pointer_cast(aData->attribute(attributeID())); + aSelectionListAttr->clear(); } //******************************************************************** -bool ModuleBase_WidgetMultiSelector::setSelection(const Handle_SelectMgr_EntityOwner& theOwner) +void ModuleBase_WidgetMultiSelector::setObject(ObjectPtr theSelectedObject, + GeomShapePtr theShape) { - ModuleBase_ViewerPrs aPrs; - ModuleBase_ISelection* aSelection = myWorkshop->selection(); - aSelection->fillPresentation(aPrs, theOwner); + DataPtr aData = myFeature->data(); + AttributeSelectionListPtr aSelectionListAttr = + std::dynamic_pointer_cast(aData->attribute(attributeID())); - const TopoDS_Shape& aTDSShape = aPrs.shape(); - if (aTDSShape.IsNull()) - return false; - GeomShapePtr aShape = std::shared_ptr(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(aTDSShape)); - - ObjectPtr anObject = aSelection->getSelectableObject(theOwner); - ResultPtr aResult = std::dynamic_pointer_cast(anObject); - if (myFeature) { - // We can not select a result of our feature - const std::list& aResList = myFeature->results(); - std::list::const_iterator aIt; - bool isSkipSelf = false; - for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) { - if ((*aIt) == aResult) { - isSkipSelf = true; - break; - } - } - if(isSkipSelf) - return false; - } + ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); + aSelectionListAttr->append(aResult, theShape); +} - // if the result has the similar shap as the parameter shape, just the context is set to the - // selection list attribute. +//******************************************************************** +void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool/* theValid*/) +{ + clearAttribute(); + + // Store shape type DataPtr aData = myFeature->data(); AttributeSelectionListPtr aSelectionListAttr = std::dynamic_pointer_cast(aData->attribute(attributeID())); - if (aShape->isEqual(aResult->shape())) - aSelectionListAttr->append(aResult, NULL); - else - aSelectionListAttr->append(aResult, aShape); + aSelectionListAttr->setSelectionType(mySelectionType); - return true; + // Store selection in the attribute + int aSize = mySelection.size(); + foreach (GeomSelection aSelec, mySelection) { + setObject(aSelec.first, aSelec.second); + } +} + +//******************************************************************** +bool ModuleBase_WidgetMultiSelector::setSelection(QList& theValues, + const bool theToValidate) +{ + QList aSkippedValues; + + QList::const_iterator anIt = theValues.begin(), aLast = theValues.end(); + bool isDone = false; + for (; anIt != aLast; anIt++) { + ModuleBase_ViewerPrs aValue = *anIt; + bool aProcessed = false; + if (!theToValidate || isValidInFilters(aValue)) { + aProcessed = setSelectionCustom(aValue); + } + else + aSkippedValues.append(aValue); + // if there is at least one set, the result is true + isDone = isDone || aProcessed; + } + // updateObject - to update/redisplay feature + // it is commented in order to perfom it outside the method + //if (isDone) { + //updateObject(myFeature); + // this emit is necessary to call store/restore method an restore type of selection + //emit valuesChanged(); + //} + theValues.clear(); + if (!aSkippedValues.empty()) + theValues.append(aSkippedValues); + + return isDone; +} + +//******************************************************************** +bool ModuleBase_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +{ + bool aValid = ModuleBase_WidgetSelector::isValidSelectionCustom(thePrs); + if (aValid) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + aValid = aResult.get() != NULL; + if (aValid) { + if (myFeature) { + // We can not select a result of our feature + const std::list& aResList = myFeature->results(); + std::list::const_iterator aIt; + bool isSkipSelf = false; + for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) { + if ((*aIt) == aResult) { + isSkipSelf = true; + break; + } + } + if (isSkipSelf) + aValid = false; + } + } + } + return aValid; } //******************************************************************** @@ -227,45 +270,44 @@ QList ModuleBase_WidgetMultiSelector::getControls() const } //******************************************************************** -bool ModuleBase_WidgetMultiSelector::eventFilter(QObject* theObj, QEvent* theEvent) +void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged() { - //TODO: Remove maybe? - return ModuleBase_ModelWidget::eventFilter(theObj, theEvent); + activateSelection(true); + activateFilters(true); + QList anEmptyList; + // This method will call Selection changed event which will call onSelectionChanged + // To clear mySelection, myListControl and storeValue() + // So, we don't need to call it + myWorkshop->setSelected(anEmptyList); } -//******************************************************************** -void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged() +void ModuleBase_WidgetMultiSelector::updateFocus() { - activateShapeSelection(); - QObjectPtrList anEmptyList; - myWorkshop->setSelected(anEmptyList); - // Clear mySelection, myListControl and storeValue() - onSelectionChanged(); + // Set focus to List control in order to make possible + // to use Tab key for transfer the focus to next widgets + myListControl->setCurrentRow(myListControl->model()->rowCount() - 1); + myListControl->setFocus(); } //******************************************************************** -void ModuleBase_WidgetMultiSelector::onSelectionChanged() +void ModuleBase_WidgetMultiSelector::updateSelectionName() { - QList aSelected = myWorkshop->selection()->getSelected(); +} - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); +//******************************************************************** +QIntList ModuleBase_WidgetMultiSelector::getShapeTypes() const +{ + QIntList aShapeTypes; - aSelectionListAttr->clear(); - if (aSelected.size() > 0) { - foreach (ModuleBase_ViewerPrs aPrs, aSelected) { - Handle(SelectMgr_EntityOwner) anOwner = aPrs.owner(); - if (isValid(anOwner)) { - setSelection(anOwner); - } + if (myTypeCombo->count() > 1 && myIsUseChoice) { + aShapeTypes.append(ModuleBase_Tools::shapeType(myTypeCombo->currentText())); + } + else { + for (int i = 0, aCount = myTypeCombo->count(); i < aCount; i++) { + aShapeTypes.append(ModuleBase_Tools::shapeType(myTypeCombo->itemText(i))); } } - // 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); - - emit valuesChanged(); + return aShapeTypes; } //******************************************************************** @@ -275,46 +317,45 @@ void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const TopAbs_ShapeEnum for (int idx = 0; idx < myTypeCombo->count(); ++idx) { aShapeTypeName = myTypeCombo->itemText(idx); - TopAbs_ShapeEnum aRefType = ModuleBase_WidgetShapeSelector::shapeType(aShapeTypeName); + TopAbs_ShapeEnum aRefType = ModuleBase_Tools::shapeType(aShapeTypeName); if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) { - myIsActive = false; - activateShapeSelection(); + activateSelection(false); + activateFilters(false); bool isBlocked = myTypeCombo->blockSignals(true); myTypeCombo->setCurrentIndex(idx); - myIsActive = true; myTypeCombo->blockSignals(isBlocked); - activateShapeSelection(); + + activateSelection(true); + activateFilters(true); break; } } } -void ModuleBase_WidgetMultiSelector::activateShapeSelection() +QList ModuleBase_WidgetMultiSelector::getAttributeSelection() const { - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - - if (myIsActive) { - QString aNewType = myTypeCombo->currentText(); - QIntList aList; - aList.append(ModuleBase_WidgetShapeSelector::shapeType(aNewType)); - myWorkshop->activateSubShapesSelection(aList); - - // it is necessary to filter the selected edges to be non-degenerated - // it is not possible to build naming name for such edges - if (aNewType == "Edges") { - myEdgesTypeFilter = new ModuleBase_FilterNoDegeneratedEdge(); - aViewer->addSelectionFilter(myEdgesTypeFilter); - } - else { - aViewer->removeSelectionFilter(myEdgesTypeFilter); + QList aSelected; + // Restore selection in the viewer by the attribute selection list + if(myFeature) { + DataPtr aData = myFeature->data(); + AttributeSelectionListPtr aListAttr = + std::dynamic_pointer_cast(aData->attribute(attributeID())); + if (aListAttr) { + for (int i = 0; i < aListAttr->size(); i++) { + AttributeSelectionPtr anAttr = aListAttr->value(i); + ResultPtr anObject = anAttr->context(); + if (anObject.get()) { + TopoDS_Shape aShape; + std::shared_ptr aShapePtr = anAttr->value(); + if (aShapePtr.get()) { + aShape = aShapePtr->impl(); + } + aSelected.append(ModuleBase_ViewerPrs(anObject, aShape, NULL)); + } + } } - - } else { - myWorkshop->deactivateSubShapesSelection(); - aViewer->removeSelectionFilter(myEdgesTypeFilter); } - - activateFilters(myWorkshop, myIsActive); + return aSelected; } //******************************************************************** @@ -325,6 +366,25 @@ void ModuleBase_WidgetMultiSelector::updateSelectionList(AttributeSelectionListP AttributeSelectionPtr aAttr = theList->value(i); myListControl->addItem(aAttr->namingName().c_str()); } + // We have to call repaint because sometimes the List control is not updated + myListControl->repaint(); +} + +//******************************************************************** +std::string ModuleBase_WidgetMultiSelector::validatorType(const QString& theType) const +{ + std::string aType; + + if (theType == "Vertices") + aType = "vertex"; + else if (theType == "Edges") + aType = "edge"; + else if (theType == "Faces") + aType = "face"; + else if (theType == "Solids") + aType = "solid"; + + return aType; } //******************************************************************** @@ -349,4 +409,3 @@ void ModuleBase_WidgetMultiSelector::onListSelection() QList aItems = myListControl->selectedItems(); myCopyAction->setEnabled(!aItems.isEmpty()); } -