//#define DEBUG_SHAPE_VALIDATION_PREVIOUS
+class CustomListWidget : public QListWidget
+{
+public:
+ CustomListWidget( QWidget* theParent )
+ : QListWidget( theParent )
+ {
+ }
+
+ virtual QSize sizeHint() const
+ {
+ int aHeight = 2*QFontMetrics( font() ).height();
+ QSize aSize = QListWidget::sizeHint();
+ return QSize( aSize.width(), aHeight );
+ }
+
+ virtual QSize minimumSizeHint() const
+ {
+ int aHeight = 2*QFontMetrics( font() ).height();
+ QSize aSize = QListWidget::minimumSizeHint();
+ return QSize( aSize.width(), aHeight );
+ }
+};
+
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),
+ mySelectionType(""), mySelectionCount(0)
{
QGridLayout* aMainLay = new QGridLayout(this);
ModuleBase_Tools::adjustMargins(aMainLay);
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(' ');
- //myIsUseChoice = theData->getBooleanAttribute("use_choice", true);
+ 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/* || !myIsUseChoice*/) {
+ if (aShapeTypes.size() == 1 || !myIsUseChoice) {
aTypeLabel->setVisible(false);
myTypeCombo->setVisible(false);
}
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);
}
- myListControl = new QListWidget(this);
- aMainLay->addWidget(myListControl, 2, 0, 2, -1);
+ myListControl = new CustomListWidget(this);
+ 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);
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);
}
//********************************************************************
}
//********************************************************************
-bool ModuleBase_WidgetMultiSelector::restoreValue()
+bool ModuleBase_WidgetMultiSelector::restoreValueCustom()
{
// A rare case when plugin was not loaded.
if(!myFeature)
return;
mySelectionType = aSelectionListAttr->selectionType();
- mySelection.clear();
+ mySelectionCount = aSelectionListAttr->size();
+
+ /*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()));
- }
+ }*/
}
//********************************************************************
-void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool/* theValid*/)
+void ModuleBase_WidgetMultiSelector::clearAttribute()
{
DataPtr aData = myFeature->data();
- AttributeSelectionListPtr aSelectionListAttr =
+ AttributeSelectionListPtr aSelectionListAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(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) {
- aSelectionListAttr->append(aSelec.first, aSelec.second);
- }
}
//********************************************************************
-void ModuleBase_WidgetMultiSelector::customValidators(
- std::list<ModelAPI_Validator*>& theValidators,
- std::list<std::list<std::string> >& theArguments) const
+void ModuleBase_WidgetMultiSelector::setObject(ObjectPtr theSelectedObject,
+ GeomShapePtr theShape)
{
- return;
- std::list<std::string> anArguments;
+ DataPtr aData = myFeature->data();
+ AttributeSelectionListPtr aSelectionListAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
- theValidators.push_back(myShapeValidator);
- if (true/*myIsUseChoice*/) {
- QString aType = myTypeCombo->currentText();
- anArguments.push_back(validatorType(aType));
- }
- else {
- for(int i = 0, aCount = myTypeCombo->count(); i < aCount; i++) {
- anArguments.push_back(validatorType(myTypeCombo->itemText(i)));
- }
- }
- theArguments.push_back(anArguments);
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
+ aSelectionListAttr->append(aResult, theShape);
}
//********************************************************************
-bool ModuleBase_WidgetMultiSelector::acceptSubShape(const TopoDS_Shape& theShape) const
+void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool/* theValid*/)
{
- 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
- }
- 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;
- }
- }
- }
- return aValid;
+ //clearAttribute();
+
+ // Store shape type
+ DataPtr aData = myFeature->data();
+ AttributeSelectionListPtr aSelectionListAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
+ aSelectionListAttr->setSelectionType(mySelectionType);
+
+ // Store selection in the attribute
+ //int aSize = mySelection.size();
+ //foreach (GeomSelection aSelec, mySelection) {
+ // setObject(aSelec.first, aSelec.second);
+ //}
+
+ //int aCountAppened = aSelectionListAttr->size() - mySelectionCount;
+ //for ( int i = 0; i < aCountAppened; i++)
+ // aSelectionListAttr->removeLast();
}
//********************************************************************
-bool ModuleBase_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues)
+bool ModuleBase_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+ const bool theToValidate)
{
QList<ModuleBase_ViewerPrs> aSkippedValues;
for (; anIt != aLast; anIt++) {
ModuleBase_ViewerPrs aValue = *anIt;
bool aProcessed = false;
- if (isValidSelection(aValue)) {
+ if (!theToValidate || isValidInFilters(aValue)) {
aProcessed = setSelectionCustom(aValue);
}
else
//********************************************************************
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 selected shape, the method returns true
- bool aValid;
- if (!aShape.get())
- aValid = true;
- else {
- // Check that the selection corresponds to selection type
- TopoDS_Shape aTopoShape = aShape->impl<TopoDS_Shape>();
- aValid = acceptSubShape(aTopoShape);
- }
-
+ bool aValid = ModuleBase_WidgetSelector::isValidSelectionCustom(thePrs);
if (aValid) {
ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
-
- if (myFeature) {
- // We can not select a result of our feature
- const std::list<ResultPtr>& aResList = myFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- bool isSkipSelf = false;
- for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
- if ((*aIt) == aResult) {
- isSkipSelf = true;
- break;
+ aValid = aResult.get() != NULL;
+ if (aValid) {
+ if (myFeature) {
+ // We can not select a result of our feature
+ const std::list<ResultPtr>& aResList = myFeature->results();
+ std::list<ResultPtr>::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)
-{
- //TopoDS_Shape aShape = thePrs.shape();
- //if (!acceptSubShape(aShape))
- // return false;
-
- ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
- /*
- if (myFeature) {
- // We can not select a result of our feature
- const std::list<ResultPtr>& aResList = myFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- bool isSkipSelf = false;
- for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
- if ((*aIt) == aResult) {
- isSkipSelf = true;
- break;
- }
- }
- if(isSkipSelf)
- return false;
- }*/
-
- // if the result has the similar shap as the parameter shape, just the context is set to the
- // selection list attribute.
- DataPtr aData = myFeature->data();
- AttributeSelectionListPtr aSelectionListAttr =
- std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
-
- /*const TopoDS_Shape& aTDSShape = thePrs.shape();
- // if only result is selected, an empty shape is set to the model
- if (aTDSShape.IsNull()) {
- aSelectionListAttr->append(aResult, GeomShapePtr());
- }
- else {
- GeomShapePtr aShape(new GeomAPI_Shape());
- aShape->setImpl(new TopoDS_Shape(aTDSShape));
- // We can not select a result of our feature
- if (aShape->isEqual(aResult->shape()))
- aSelectionListAttr->append(aResult, GeomShapePtr());
- else
- aSelectionListAttr->append(aResult, aShape);
- }*/
- GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs);
- aSelectionListAttr->append(aResult, aShape);
-
- return true;
-}
-
//********************************************************************
QList<QWidget*> ModuleBase_WidgetMultiSelector::getControls() const
{
//********************************************************************
void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
{
- activateShapeSelection(true);
- activateFilters(myWorkshop, true);
+ activateSelection(true);
+ activateFilters(true);
QList<ModuleBase_ViewerPrs> anEmptyList;
// This method will call Selection changed event which will call onSelectionChanged
// To clear mySelection, myListControl and storeValue()
myWorkshop->setSelected(anEmptyList);
}
+void ModuleBase_WidgetMultiSelector::updateFocus()
+{
+ // 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<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls);
+}
- DataPtr aData = myFeature->data();
- AttributeSelectionListPtr aSelectionListAttr =
- std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
+//********************************************************************
+QIntList ModuleBase_WidgetMultiSelector::getShapeTypes() const
+{
+ QIntList aShapeTypes;
- aSelectionListAttr->clear();
- if (aSelected.size() > 0) {
- foreach (ModuleBase_ViewerPrs aPrs, aSelected) {
- if (isValidSelection(aPrs)) {
- setSelectionCustom(aPrs);
- }
+ 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)));
}
}
- 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();
+ return aShapeTypes;
}
//********************************************************************
aShapeTypeName = myTypeCombo->itemText(idx);
TopAbs_ShapeEnum aRefType = ModuleBase_Tools::shapeType(aShapeTypeName);
if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) {
- activateShapeSelection(false);
- activateFilters(myWorkshop, false);
+ activateSelection(false);
+ activateFilters(false);
bool isBlocked = myTypeCombo->blockSignals(true);
myTypeCombo->setCurrentIndex(idx);
myTypeCombo->blockSignals(isBlocked);
- activateShapeSelection(true);
- activateFilters(myWorkshop, true);
+ activateSelection(true);
+ activateFilters(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_ViewerPrs> ModuleBase_WidgetMultiSelector::getAttributeSelection() const
{
QList<ModuleBase_ViewerPrs> aSelected;
QList<QListWidgetItem*> aItems = myListControl->selectedItems();
myCopyAction->setEnabled(!aItems.isEmpty());
}
-
