#include <ModuleBase_Tools.h>
#include <ModuleBase_Definitions.h>
-#include <GeomValidators_ShapeType.h>
-
#include <ModelAPI_Data.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <QAction>
#include <QApplication>
#include <QClipboard>
+#include <QTimer>
#include <memory>
#include <string>
+/**
+* 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();
return QSize( aSize.width(), aHeight );
}
+ /// Redefinition of virtual method
virtual QSize minimumSizeHint() const
{
- int aHeight = 2*QFontMetrics( font() ).height();
+ 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,
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);
- 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);
}
: 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) {
+ if (aShapeTypes.size() <= 1) {
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
if (!aLabelIcon.isEmpty()) {
QLabel* aSelectedLabel = new QLabel("", this);
}
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)???
//********************************************************************
void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
{
- activateSelection(true);
- activateFilters(true);
+ activateSelectionAndFilters(true);
QList<ModuleBase_ViewerPrs> anEmptyList;
// This method will call Selection changed event which will call onSelectionChanged
// To clear mySelection, myListControl and storeValue()
// 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()");
}
//********************************************************************
}
else {
for (int i = 0, aCount = myTypeCombo->count(); i < aCount; i++) {
- aShapeTypes.append(ModuleBase_Tools::shapeType(myTypeCombo->itemText(i)));
+ TopAbs_ShapeEnum aType = ModuleBase_Tools::shapeType(myTypeCombo->itemText(i));
+ aShapeTypes.append(aType);
+ if (aType == TopAbs_SOLID)
+ aShapeTypes.append(TopAbs_COMPSOLID);
}
}
return aShapeTypes;
aShapeTypeName = myTypeCombo->itemText(idx);
TopAbs_ShapeEnum aRefType = ModuleBase_Tools::shapeType(aShapeTypeName);
if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) {
- activateSelection(false);
- activateFilters(false);
+ activateSelectionAndFilters(false);
bool isBlocked = myTypeCombo->blockSignals(true);
myTypeCombo->setCurrentIndex(idx);
myTypeCombo->blockSignals(isBlocked);
- activateSelection(true);
- activateFilters(true);
+ activateSelectionAndFilters(true);
break;
}
}