X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetMultiSelector.cpp;h=40149e343af3eaa76486ab8e32c62541712a22ed;hb=8cd56d486b6e96b8814002f9f0f4acadd6cea11b;hp=d4f209b15db5edd1993212b06e5fb206a42566d4;hpb=ad50208b9badd50c6c441f3fe20dcf2e03948e01;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp old mode 100644 new mode 100755 index d4f209b15..40149e343 --- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp @@ -15,10 +15,10 @@ #include #include -#include - #include #include +#include +#include #include @@ -32,18 +32,58 @@ #include #include #include +#include #include #include -//#define DEBUG_SHAPE_VALIDATION_PREVIOUS +/** +* Customization of a List Widget to make it to be placed on full width of container +*/ +class CustomListWidget : public QListWidget +{ +public: + /// Constructor + /// \param theParent a parent widget + CustomListWidget( QWidget* theParent ) + : QListWidget( theParent ) + { + } + + /// Redefinition of virtual method + virtual QSize sizeHint() const + { + int aHeight = 2*QFontMetrics( font() ).height(); + QSize aSize = QListWidget::sizeHint(); + return QSize( aSize.width(), aHeight ); + } + + /// Redefinition of virtual method + virtual QSize minimumSizeHint() const + { + int aHeight = 4/*2*/*QFontMetrics( font() ).height(); + QSize aSize = QListWidget::minimumSizeHint(); + return QSize( aSize.width(), aHeight ); + } + +#ifndef WIN32 +// The code is necessary only for Linux because +//it can not update viewport on widget resize +protected: + void resizeEvent(QResizeEvent* theEvent) + { + QListWidget::resizeEvent(theEvent); + QTimer::singleShot(5, viewport(), SLOT(repaint())); + } +#endif +}; ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(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), + mySelectionCount(0) { QGridLayout* aMainLay = new QGridLayout(this); ModuleBase_Tools::adjustMargins(aMainLay); @@ -52,20 +92,19 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen aMainLay->addWidget(aTypeLabel, 0, 0); myTypeCombo = new QComboBox(this); - // There is no sence to paramerize list of types while we can not parametrize selection mode - - myShapeValidator = new GeomValidators_ShapeType(); + // There is no sense to parameterize list of types while we can not parameterize selection mode std::string aPropertyTypes = theData->getProperty("type_choice"); QString aTypesStr = aPropertyTypes.c_str(); - QStringList aShapeTypes = aTypesStr.split(' '); + QStringList aShapeTypes = aTypesStr.split(' ', QString::SkipEmptyParts); - //myIsUseChoice = theData->getBooleanAttribute("use_choice", true); + myIsUseChoice = theData->getBooleanAttribute("use_choice", true); - myTypeCombo->addItems(aShapeTypes); + if (!aShapeTypes.empty()) + 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/* || !myIsUseChoice*/) { + if (aShapeTypes.size() <= 1 || !myIsUseChoice) { aTypeLabel->setVisible(false); myTypeCombo->setVisible(false); } @@ -75,22 +114,25 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen : 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()); + if (aShapeTypes.size() <= 1) { 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); } - myListControl = new QListWidget(this); - aMainLay->addWidget(myListControl, 2, 0, 2, -1); + myListControl = new CustomListWidget(this); + QString anObjName = QString::fromStdString(attributeID()); + myListControl->setObjectName(anObjName); + + aMainLay->addWidget(myListControl, 2, 0, 1, -1); aMainLay->setRowStretch(2, 1); - aMainLay->addWidget(new QLabel(this)); //FIXME(sbh)??? - aMainLay->setRowMinimumHeight(3, 20); - this->setLayout(aMainLay); + //aMainLay->addWidget(new QLabel(this)); //FIXME(sbh)??? + //aMainLay->setRowMinimumHeight(3, 20); + //this->setLayout(aMainLay); connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged())); myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this); @@ -104,37 +146,6 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen ModuleBase_WidgetMultiSelector::~ModuleBase_WidgetMultiSelector() { - delete myShapeValidator; -} - -//TODO: nds stabilization hotfix -void ModuleBase_WidgetMultiSelector::disconnectSignals() -{ - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -} - -//******************************************************************** -void ModuleBase_WidgetMultiSelector::activateCustom() -{ - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - connect(myWorkshop, SIGNAL(selectionChanged()), - this, SLOT(onSelectionChanged()), - Qt::UniqueConnection); - - activateShapeSelection(true); - - // Restore selection in the viewer by the attribute selection list - myWorkshop->setSelected(getAttributeSelection()); - - activateFilters(myWorkshop, true); -} - -//******************************************************************** -void ModuleBase_WidgetMultiSelector::deactivate() -{ - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateShapeSelection(false); - activateFilters(myWorkshop, false); } //******************************************************************** @@ -142,118 +153,103 @@ bool ModuleBase_WidgetMultiSelector::storeValueCustom() const { // the value is stored on the selection changed signal processing // A rare case when plugin was not loaded. - if(!myFeature) + 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()); + + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { aSelectionListAttr->setSelectionType(myTypeCombo->currentText().toStdString()); } return true; } //******************************************************************** -bool ModuleBase_WidgetMultiSelector::restoreValue() +bool ModuleBase_WidgetMultiSelector::restoreValueCustom() { // A rare case when plugin was not loaded. - if(!myFeature) + if (!myFeature) return false; - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - if (aSelectionListAttr) { + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { // Restore shape type if (!aSelectionListAttr->selectionType().empty()) setCurrentShapeType(ModuleBase_Tools::shapeType(aSelectionListAttr->selectionType().c_str())); - updateSelectionList(aSelectionListAttr); - return true; } - return false; + updateSelectionList(); + return true; } //******************************************************************** void ModuleBase_WidgetMultiSelector::storeAttributeValue() { - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - if (aSelectionListAttr.get() == NULL) - return; - - 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())); + ModuleBase_WidgetValidated::storeAttributeValue(); + + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { + mySelectionType = aSelectionListAttr->selectionType(); + mySelectionCount = aSelectionListAttr->size(); + } + else { + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + mySelectionCount = aRefListAttr->size(); } } //******************************************************************** -void ModuleBase_WidgetMultiSelector::setObject(ObjectPtr theSelectedObject, - GeomShapePtr theShape) +void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool theValid) { - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); + ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + + // Store shape type + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { + aSelectionListAttr->setSelectionType(mySelectionType); - ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); - aSelectionListAttr->append(aResult, theShape); + // restore selection in the attribute. Indeed there is only one stored object + int aCountAppened = aSelectionListAttr->size() - mySelectionCount; + for (int i = 0; i < aCountAppened; i++) + aSelectionListAttr->removeLast(); + } + else { + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + // restore objects in the attribute. Indeed there is only one stored object + int aCountAppened = aRefListAttr->size() - mySelectionCount; + for (int i = 0; i < aCountAppened; i++) + aRefListAttr->removeLast(); + } } //******************************************************************** -void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool/* theValid*/) +void ModuleBase_WidgetMultiSelector::clearAttribute() { - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - if (aSelectionListAttr.get() == NULL) - return; - aSelectionListAttr->clear(); - - // Store shapes type - aSelectionListAttr->setSelectionType(mySelectionType); - - // Store selection in the attribute - int aSize = mySelection.size(); - foreach (GeomSelection aSelec, mySelection) { - setObject(aSelec.first, aSelec.second); + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) + aSelectionListAttr->clear(); + else { + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + aRefListAttr->clear(); } } //******************************************************************** -bool ModuleBase_WidgetMultiSelector::acceptSubShape(const TopoDS_Shape& theShape) const +void ModuleBase_WidgetMultiSelector::setObject(ObjectPtr theSelectedObject, + GeomShapePtr theShape) { - bool aValid = true; - if (theShape.IsNull()) { - aValid = true; // do not check the shape type if the shape is empty - // extrusion uses a sketch object selectected in Object browser + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { + ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); + aSelectionListAttr->append(aResult, theShape, myIsInValidate); } else { - aValid = false; - TopAbs_ShapeEnum aShapeType = theShape.ShapeType(); - if (myTypeCombo->count() > 1) { - TopAbs_ShapeEnum aType = ModuleBase_Tools::shapeType(myTypeCombo->currentText()); - aValid = aShapeType == aType; - } - else { - for(int i = 0, aCount = myTypeCombo->count(); i < aCount && !aValid; i++) { - TopAbs_ShapeEnum aType = ModuleBase_Tools::shapeType(myTypeCombo->itemText(i)); - aValid = aShapeType == aType; - } - } + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + aRefListAttr->append(theSelectedObject); } - return aValid; } //******************************************************************** -bool ModuleBase_WidgetMultiSelector::setSelection(QList& theValues) +bool ModuleBase_WidgetMultiSelector::setSelection(QList& theValues, + const bool theToValidate) { QList aSkippedValues; @@ -262,7 +258,7 @@ bool ModuleBase_WidgetMultiSelector::setSelection(QList& t for (; anIt != aLast; anIt++) { ModuleBase_ViewerPrs aValue = *anIt; bool aProcessed = false; - if (isValidSelection(aValue)) { + if (!theToValidate || isValidInFilters(aValue)) { aProcessed = setSelectionCustom(aValue); } else @@ -287,56 +283,30 @@ bool ModuleBase_WidgetMultiSelector::setSelection(QList& t //******************************************************************** bool ModuleBase_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) { -#ifdef DEBUG_SHAPE_VALIDATION_PREVIOUS - return true; -#endif - GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs); - // if there is no result(the feature is presentable only), result is false - ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); - bool aValid = aResult.get() != NULL; + bool aValid = ModuleBase_WidgetSelector::isValidSelectionCustom(thePrs); if (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); - } - } - - 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; + 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; } - if(isSkipSelf) - aValid = false; } } - return aValid; } -//******************************************************************** -bool ModuleBase_WidgetMultiSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) -{ - // DEBUG_THE_SAME_AS_SHAPE - ObjectPtr anObject; - GeomShapePtr aShape; - getGeomSelection(thePrs, anObject, aShape); - - setObject(anObject, aShape); - return true; -} - //******************************************************************** QList ModuleBase_WidgetMultiSelector::getControls() const { @@ -349,8 +319,7 @@ QList ModuleBase_WidgetMultiSelector::getControls() const //******************************************************************** void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged() { - activateShapeSelection(true); - activateFilters(myWorkshop, true); + activateSelectionAndFilters(true); QList anEmptyList; // This method will call Selection changed event which will call onSelectionChanged // To clear mySelection, myListControl and storeValue() @@ -358,27 +327,37 @@ void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged() myWorkshop->setSelected(anEmptyList); } -//******************************************************************** -void ModuleBase_WidgetMultiSelector::onSelectionChanged() +void ModuleBase_WidgetMultiSelector::updateFocus() { - QList aSelected = myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls); - - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - aSelectionListAttr->clear(); - - setSelection(aSelected); - - emit valuesChanged(); - // 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); - // 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(); + ModuleBase_Tools::setFocus(myListControl, + "ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()"); +} + +//******************************************************************** +void ModuleBase_WidgetMultiSelector::updateSelectionName() +{ +} + +//******************************************************************** +QIntList ModuleBase_WidgetMultiSelector::getShapeTypes() const +{ + QIntList aShapeTypes; + + if (myTypeCombo->count() > 1 && myIsUseChoice) { + aShapeTypes.append(ModuleBase_Tools::shapeType(myTypeCombo->currentText())); + } + else { + for (int i = 0, aCount = myTypeCombo->count(); i < aCount; i++) { + TopAbs_ShapeEnum aType = ModuleBase_Tools::shapeType(myTypeCombo->itemText(i)); + aShapeTypes.append(aType); + if (aType == TopAbs_SOLID) + aShapeTypes.append(TopAbs_COMPSOLID); + } + } + return aShapeTypes; } //******************************************************************** @@ -390,50 +369,26 @@ void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const TopAbs_ShapeEnum aShapeTypeName = myTypeCombo->itemText(idx); TopAbs_ShapeEnum aRefType = ModuleBase_Tools::shapeType(aShapeTypeName); if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) { - activateShapeSelection(false); - activateFilters(myWorkshop, false); + activateSelectionAndFilters(false); bool isBlocked = myTypeCombo->blockSignals(true); myTypeCombo->setCurrentIndex(idx); myTypeCombo->blockSignals(isBlocked); - activateShapeSelection(true); - activateFilters(myWorkshop, true); + activateSelectionAndFilters(true); break; } } } -void ModuleBase_WidgetMultiSelector::activateShapeSelection(const bool isActivated) -{ - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - - if (isActivated) { - QString aNewType = myTypeCombo->currentText(); - QIntList aList; - if (true /*myIsUseChoice*/) { - aList.append(ModuleBase_Tools::shapeType(aNewType)); - } - else { - for(int i = 0, aCount = myTypeCombo->count(); i < aCount; i++) - aList.append(ModuleBase_Tools::shapeType(myTypeCombo->itemText(i))); - } - myWorkshop->activateSubShapesSelection(aList); - } else { - myWorkshop->deactivateSubShapesSelection(); - } -} - QList ModuleBase_WidgetMultiSelector::getAttributeSelection() const { 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); + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { + for (int i = 0; i < aSelectionListAttr->size(); i++) { + AttributeSelectionPtr anAttr = aSelectionListAttr->value(i); ResultPtr anObject = anAttr->context(); if (anObject.get()) { TopoDS_Shape aShape; @@ -445,27 +400,40 @@ QList ModuleBase_WidgetMultiSelector::getAttributeSelectio } } } + else { + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + if (aRefListAttr.get()) { + for (int i = 0; i < aRefListAttr->size(); i++) { + ObjectPtr anObject = aRefListAttr->object(i); + if (anObject.get()) { + aSelected.append(ModuleBase_ViewerPrs(anObject, TopoDS_Shape(), NULL)); + } + } + } + } } return aSelected; } //******************************************************************** -void ModuleBase_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs, - ObjectPtr& theObject, - GeomShapePtr& theShape) -{ - // DEBUG_THE_SAME_AS_SHAPE - theObject = myWorkshop->selection()->getResult(thePrs); - theShape = myWorkshop->selection()->getShape(thePrs); -} - -//******************************************************************** -void ModuleBase_WidgetMultiSelector::updateSelectionList(AttributeSelectionListPtr theList) +void ModuleBase_WidgetMultiSelector::updateSelectionList() { myListControl->clear(); - for (int i = 0; i < theList->size(); i++) { - AttributeSelectionPtr aAttr = theList->value(i); - myListControl->addItem(aAttr->namingName().c_str()); + + AttributeSelectionListPtr aSelectionListAttr = myFeature->data()->selectionList(attributeID()); + if (aSelectionListAttr.get()) { + for (int i = 0; i < aSelectionListAttr->size(); i++) { + AttributeSelectionPtr aAttr = aSelectionListAttr->value(i); + myListControl->addItem(aAttr->namingName().c_str()); + } + } + else { + AttributeRefListPtr aRefListAttr = myFeature->data()->reflist(attributeID()); + for (int i = 0; i < aRefListAttr->size(); i++) { + ObjectPtr anObject = aRefListAttr->object(i); + if (anObject.get()) + myListControl->addItem(anObject->data()->name().c_str()); + } } // We have to call repaint because sometimes the List control is not updated myListControl->repaint(); @@ -510,4 +478,3 @@ void ModuleBase_WidgetMultiSelector::onListSelection() QList aItems = myListControl->selectedItems(); myCopyAction->setEnabled(!aItems.isEmpty()); } -