#include <ModuleBase_Definitions.h>
#include <ModuleBase_IModule.h>
#include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_IconFactory.h>
+#include <ModuleBase_Events.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_AttributeRefList.h>
#include <ModelAPI_AttributeRefAttrList.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_Events.h>
#include <Config_WidgetAPI.h>
#include <QApplication>
#include <QClipboard>
#include <QTimer>
+#include <QMainWindow>
#include <memory>
#include <string>
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 the xml definition contains one type, an information label
+ // should be shown near to the latest
if (aShapeTypes.size() <= 1) {
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
if (!aLabelIcon.isEmpty()) {
QLabel* aSelectedLabel = new QLabel("", this);
- aSelectedLabel->setPixmap(QPixmap(aLabelIcon));
+ aSelectedLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
aMainLay->addWidget(aSelectedLabel, 1, 1);
}
aMainLay->setColumnStretch(2, 1);
//this->setLayout(aMainLay);
connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged()));
- myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this);
+ myCopyAction = ModuleBase_Tools::createAction(QIcon(":pictures/copy.png"), tr("Copy"),
+ myWorkshop->desktop(), this, SLOT(onCopyItem()));
myCopyAction->setShortcut(QKeySequence::Copy);
myCopyAction->setEnabled(false);
- connect(myCopyAction, SIGNAL(triggered(bool)), SLOT(onCopyItem()));
myListControl->addAction(myCopyAction);
- myDeleteAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
+ myDeleteAction = ModuleBase_Tools::createAction(QIcon(":pictures/delete.png"), tr("Delete"),
+ myWorkshop->desktop(), this, SLOT(onDeleteItem()));
myDeleteAction->setEnabled(false);
- connect(myDeleteAction, SIGNAL(triggered(bool)), SLOT(onDeleteItem()));
myListControl->addAction(myDeleteAction);
myListControl->setContextMenuPolicy(Qt::ActionsContextMenu);
connect(myListControl, SIGNAL(itemSelectionChanged()), SLOT(onListSelection()));
+
+ myIsNeutralPointClear = theData->getBooleanAttribute("clear_in_neutral_point", true);
}
ModuleBase_WidgetMultiSelector::~ModuleBase_WidgetMultiSelector()
}
//********************************************************************
-bool ModuleBase_WidgetMultiSelector::storeValueCustom() const
+bool ModuleBase_WidgetMultiSelector::storeValueCustom()
{
// the value is stored on the selection changed signal processing
// A rare case when plugin was not loaded.
bool ModuleBase_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
const bool theToValidate)
{
- QList<ModuleBase_ViewerPrsPtr> aSkippedValues;
+ AttributeSelectionListPtr aSelectionListAttr;
+ if (attribute()->attributeType() == ModelAPI_AttributeSelectionList::typeId())
+ aSelectionListAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(attribute());
+ if (aSelectionListAttr.get())
+ aSelectionListAttr->cashValues(true);
/// remove unused objects from the model attribute.
/// It should be performed before new attributes append.
- removeUnusedAttributeObjects(theValues);
+ bool isDone = removeUnusedAttributeObjects(theValues);
+ QList<ModuleBase_ViewerPrsPtr> anInvalidValues;
+ QList<ModuleBase_ViewerPrsPtr> anAttributeValues;
QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
- bool isDone = false;
for (; anIt != aLast; anIt++) {
ModuleBase_ViewerPrsPtr aValue = *anIt;
- bool aProcessed = false;
- if (!theToValidate || isValidInFilters(aValue)) {
- aProcessed = setSelectionCustom(aValue);
+ // do not validate and append to attribute selection presentation if it exists in the attribute
+ ObjectPtr anObject;
+ GeomShapePtr aShape;
+ getGeomSelection(aValue, anObject, aShape);
+ if (ModuleBase_Tools::hasObject(attribute(), anObject, aShape, myWorkshop, myIsInValidate)) {
+ anAttributeValues.append(aValue);
+ continue;
}
- else
- aSkippedValues.append(aValue);
+ if (theToValidate && !isValidInFilters(aValue))
+ anInvalidValues.append(aValue);
+ }
+ bool aHasInvalidValues = anInvalidValues.size() > 0;
+
+ for (anIt = theValues.begin(); anIt != aLast; anIt++) {
+ ModuleBase_ViewerPrsPtr aValue = *anIt;
+ bool aProcessed = false;
+ if ((aHasInvalidValues && anInvalidValues.contains(aValue)) ||
+ anAttributeValues.contains(aValue))
+ continue;
+ aProcessed = setSelectionCustom(aValue); /// it is not optimal as hasObject() is already checked
// if there is at least one set, the result is true
isDone = isDone || aProcessed;
}
//emit valuesChanged();
//}
+ if (aSelectionListAttr.get())
+ aSelectionListAttr->cashValues(false);
+
theValues.clear();
- if (!aSkippedValues.empty())
- theValues.append(aSkippedValues);
+ if (!anInvalidValues.empty())
+ theValues.append(anInvalidValues);
+
+ if (isDone) // may be the feature's result is not displayed, but attributes should be
+ myWorkshop->module()->customizeObject(myFeature, ModuleBase_IModule::CustomizeArguments,
+ true);/// hope that something is redisplayed by object updated
return isDone;
}
if (aValid) {
if (myFeature) {
// We can not select a result of our feature
- const std::list<ResultPtr>& aResList = myFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(myFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
bool isSkipSelf = false;
- for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
+ for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
if ((*aIt) == aResult) {
isSkipSelf = true;
break;
std::set<int> anAttributeIds;
getSelectedAttributeIndices(anAttributeIds);
+ QModelIndexList aIndexes = myListControl->selectionModel()->selectedIndexes();
+
// refill attribute by the items which indices are not in the list of ids
bool aDone = false;
DataPtr aData = myFeature->data();
restoreValue();
myWorkshop->setSelected(getAttributeSelection());
+
+ // may be the feature's result is not displayed, but attributes should be
+ myWorkshop->module()->customizeObject(myFeature, ModuleBase_IModule::CustomizeArguments,
+ true); /// hope that something is redisplayed by object updated
+ }
+
+ // Restore selection
+ int aRows = myListControl->model()->rowCount();
+ if (aRows > 0) {
+ foreach(QModelIndex aIndex, aIndexes) {
+ if (aIndex.row() < aRows)
+ myListControl->selectionModel()->select(aIndex, QItemSelectionModel::Select);
+ else {
+ QModelIndex aIdx = myListControl->model()->index(aRows - 1, 0);
+ myListControl->selectionModel()->select(aIdx, QItemSelectionModel::Select);
+ }
+ }
}
return aDone;
}
myWorkshop->setSelected(anEmptyList);
}
+//********************************************************************
+void ModuleBase_WidgetMultiSelector::onSelectionChanged()
+{
+ if (!myIsNeutralPointClear) {
+ QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
+ // do not clear selected object
+ if (aSelected.size() == 0) {
+ if (!getAttributeSelection().empty()) {
+ // Restore selection in the viewer by the attribute selection list
+ // it should be postponed to exit from the selectionChanged processing
+ static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION);
+ ModelAPI_EventCreator::get()->sendUpdated(myFeature, anEvent);
+ Events_Loop::loop()->flush(anEvent);
+ return;
+ }
+ }
+ }
+ ModuleBase_WidgetSelector::onSelectionChanged();
+}
+
void ModuleBase_WidgetMultiSelector::updateFocus()
{
// Set focus to List control in order to make possible
}
//********************************************************************
-QIntList ModuleBase_WidgetMultiSelector::getShapeTypes() const
+QIntList ModuleBase_WidgetMultiSelector::shapeTypes() const
{
QIntList aShapeTypes;
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);
- }
+ for (int i = 0, aCount = myTypeCombo->count(); i < aCount; i++)
+ aShapeTypes.append(ModuleBase_Tools::shapeType(myTypeCombo->itemText(i)));
}
return aShapeTypes;
}
//********************************************************************
-void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const TopAbs_ShapeEnum theShapeType)
+void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const int theShapeType)
{
QString aShapeTypeName;
for (int idx = 0; idx < myTypeCombo->count(); ++idx) {
aShapeTypeName = myTypeCombo->itemText(idx);
- TopAbs_ShapeEnum aRefType = ModuleBase_Tools::shapeType(aShapeTypeName);
+ int aRefType = ModuleBase_Tools::shapeType(aShapeTypeName);
if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) {
bool aWasActivated = activateSelectionAndFilters(false);
bool isBlocked = myTypeCombo->blockSignals(true);
}
void ModuleBase_WidgetMultiSelector::convertIndicesToViewerSelection(std::set<int> theAttributeIds,
- QList<ModuleBase_ViewerPrsPtr>& theValues) const
+ QList<ModuleBase_ViewerPrsPtr>& theValues) const
{
if(myFeature.get() == NULL)
return;
}
}
-void ModuleBase_WidgetMultiSelector::removeUnusedAttributeObjects
+bool ModuleBase_WidgetMultiSelector::removeUnusedAttributeObjects
(QList<ModuleBase_ViewerPrsPtr>& theValues)
{
+ bool isDone = false;
+
std::map<ObjectPtr, std::set<GeomShapePtr> > aGeomSelection = convertSelection(theValues);
DataPtr aData = myFeature->data();
AttributePtr anAttribute = aData->attribute(attributeID());
if (!aFound)
anIndicesToBeRemoved.insert(i);
}
+ isDone = anIndicesToBeRemoved.size() > 0;
aSelectionListAttr->remove(anIndicesToBeRemoved);
}
else if (aType == ModelAPI_AttributeRefList::typeId()) {
anIndicesToBeRemoved.insert(i);
}
}
+ isDone = anIndicesToBeRemoved.size() > 0;
aRefListAttr->remove(anIndicesToBeRemoved);
}
else if (aType == ModelAPI_AttributeRefAttrList::typeId()) {
std::set<AttributePtr> anAttributes;
- QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator
+ anIt = theValues.begin(), aLast = theValues.end();
ObjectPtr anObject;
GeomShapePtr aShape;
for (; anIt != aLast; anIt++) {
if (!aFound)
anIndicesToBeRemoved.insert(i);
}
+ isDone = anIndicesToBeRemoved.size() > 0;
aRefAttrListAttr->remove(anIndicesToBeRemoved);
}
+
+ return isDone;
}
std::map<ObjectPtr, std::set<GeomShapePtr> > ModuleBase_WidgetMultiSelector::convertSelection
