#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_IViewer.h>
#include <ModuleBase_ISelection.h>
+#include <ModuleBase_WidgetSelectorStore.h>
+#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_AttributeValidator.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_Tools.h>
#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
#include <SelectMgr_EntityOwner.hxx>
ModuleBase_WidgetValidated::ModuleBase_WidgetValidated(QWidget* theParent,
ModuleBase_IWorkshop* theWorkshop,
- const Config_WidgetAPI* theData,
- const std::string& theParentId)
-: ModuleBase_ModelWidget(theParent, theData, theParentId),
+ const Config_WidgetAPI* theData)
+: ModuleBase_ModelWidget(theParent, theData),
myWorkshop(theWorkshop), myIsInValidate(false)
{
+ myAttributeStore = new ModuleBase_WidgetSelectorStore();
}
ModuleBase_WidgetValidated::~ModuleBase_WidgetValidated()
{
-}
-
-//********************************************************************
-bool ModuleBase_WidgetValidated::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
- const bool theToValidate)
-{
- if (theValues.empty())
- return false;
- // it removes the processed value from the parameters list
- ModuleBase_ViewerPrs aValue = theValues.takeFirst();
- bool isDone = false;
-
- if (!theToValidate || isValidInFilters(aValue)) {
- isDone = setSelectionCustom(aValue);
- // updateObject - to update/redisplay feature
- // it is commented in order to perfom it outside the method
- //updateObject(myFeature);
- // to storeValue()
- //emit valuesChanged();
- }
- return isDone;
+ delete myAttributeStore;
}
//********************************************************************
//********************************************************************
void ModuleBase_WidgetValidated::clearValidatedCash()
{
- myValidPrs.clear();
- myInvalidPrs.clear();
+#ifdef DEBUG_VALID_STATE
+ qDebug("clearValidatedCash");
+#endif
+ myValidPrs.Clear();
+ myInvalidPrs.Clear();
}
//********************************************************************
-void ModuleBase_WidgetValidated::storeAttributeValue()
+void ModuleBase_WidgetValidated::storeAttributeValue(const AttributePtr& theAttribute)
{
myIsInValidate = true;
+ myAttributeStore->storeAttributeValue(theAttribute, myWorkshop);
}
//********************************************************************
-void ModuleBase_WidgetValidated::restoreAttributeValue(const bool theValid)
+void ModuleBase_WidgetValidated::restoreAttributeValue(const AttributePtr& theAttribute,
+ const bool theValid)
{
myIsInValidate = false;
+ myAttributeStore->restoreAttributeValue(theAttribute, myWorkshop);
}
//********************************************************************
-bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrs& thePrs)
+bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& thePrs)
{
bool aValid = true;
- Handle(SelectMgr_EntityOwner) anOwner = thePrs.owner();
+ Handle(SelectMgr_EntityOwner) anOwner = thePrs->owner();
// if an owner is null, the selection happens in the Object browser.
// creates a selection owner on the base of object shape and the object AIS object
- if (anOwner.IsNull() && thePrs.owner().IsNull() && thePrs.object().get()) {
+ if (anOwner.IsNull() && thePrs->owner().IsNull() && thePrs->object().get()) {
ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
if (aResult.get() && aResult->shape().get()) {
// some results have no shape, e.g. the parameter one. So, they should not be validated
}
// removes created owner
- if (!anOwner.IsNull() && anOwner != thePrs.owner()) {
+ if (!anOwner.IsNull() && anOwner != thePrs->owner()) {
anOwner.Nullify();
myPresentedObject = ObjectPtr();
}
}
//********************************************************************
-bool ModuleBase_WidgetValidated::isValidSelection(const ModuleBase_ViewerPrs& theValue)
+AttributePtr ModuleBase_WidgetValidated::attribute() const
+{
+ return myFeature->attribute(attributeID());
+}
+
+//********************************************************************
+bool ModuleBase_WidgetValidated::isValidSelection(const ModuleBase_ViewerPrsPtr& theValue)
{
bool aValid = false;
if (getValidState(theValue, aValid)) {
return aValid;
}
-
aValid = isValidSelectionCustom(theValue);
- if (!aValid) {
- storeValidState(theValue, aValid);
- return aValid;
- }
+ if (aValid)
+ aValid = isValidSelectionForAttribute(theValue, attribute());
+
+ storeValidState(theValue, aValid);
+ return aValid;
+}
+
+//********************************************************************
+bool ModuleBase_WidgetValidated::isValidSelectionForAttribute(const ModuleBase_ViewerPrsPtr& theValue,
+ const AttributePtr& theAttribute)
+{
+ bool aValid = false;
// stores the current values of the widget attribute
bool isFlushesActived, isAttributeSetInitializedBlocked;
- blockAttribute(true, isFlushesActived, isAttributeSetInitializedBlocked);
- storeAttributeValue();
+ blockAttribute(theAttribute, true, isFlushesActived, isAttributeSetInitializedBlocked);
+
+ storeAttributeValue(theAttribute);
// saves the owner value to the widget attribute
aValid = setSelectionCustom(theValue);
if (aValid)
// checks the attribute validity
- aValid = isValidAttribute();
+ aValid = isValidAttribute(theAttribute);
// restores the current values of the widget attribute
- restoreAttributeValue(aValid);
+ restoreAttributeValue(theAttribute, aValid);
- blockAttribute(false, isFlushesActived, isAttributeSetInitializedBlocked);
+ blockAttribute(theAttribute, false, isFlushesActived, isAttributeSetInitializedBlocked);
// In particular case the results are deleted and called as redisplayed inside of this
// highlight-selection, to they must be flushed as soon as possible.
// Example: selection of group-vertices subshapes with shift pressend on body. Without
Events_Loop::loop()->flush(aDeletedEvent);
Events_Loop::loop()->flush(aRedispEvent);
- storeValidState(theValue, aValid);
return aValid;
}
//********************************************************************
-bool ModuleBase_WidgetValidated::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool ModuleBase_WidgetValidated::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
{
return true;
}
//********************************************************************
-bool ModuleBase_WidgetValidated::isValidAttribute() const
+bool ModuleBase_WidgetValidated::isValidAttribute(const AttributePtr& theAttribute) const
{
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- AttributePtr anAttribute = myFeature->attribute(attributeID());
std::string aValidatorID, anError;
- return aFactory->validate(anAttribute, aValidatorID, anError);
+ return aFactory->validate(theAttribute, aValidatorID, anError);
}
bool ModuleBase_WidgetValidated::isFilterActivated() const
return aViewer->hasSelectionFilter(aSelFilter);
}
-void ModuleBase_WidgetValidated::activateFilters(const bool toActivate)
+bool ModuleBase_WidgetValidated::activateFilters(const bool toActivate)
{
ModuleBase_IViewer* aViewer = myWorkshop->viewer();
Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter();
+ bool aHasSelectionFilter = aViewer->hasSelectionFilter(aSelFilter);
+
if (toActivate)
aViewer->addSelectionFilter(aSelFilter);
else {
aViewer->removeSelectionFilter(aSelFilter);
- clearValidState();
+ clearValidatedCash();
}
+
+ return aHasSelectionFilter;
}
//********************************************************************
-void ModuleBase_WidgetValidated::blockAttribute(const bool& theToBlock, bool& isFlushesActived,
+void ModuleBase_WidgetValidated::blockAttribute(const AttributePtr& theAttribute,
+ const bool& theToBlock,
+ bool& isFlushesActived,
bool& isAttributeSetInitializedBlocked)
{
Events_Loop* aLoop = Events_Loop::loop();
DataPtr aData = myFeature->data();
- AttributePtr anAttribute = myFeature->attribute(attributeID());
if (theToBlock) {
// blocks the flush signals to avoid the temporary objects visualization in the viewer
// they should not be shown in order to do not lose highlight by erasing them
isFlushesActived = aLoop->activateFlushes(false);
aData->blockSendAttributeUpdated(true);
- isAttributeSetInitializedBlocked = anAttribute->blockSetInitialized(true);
+ isAttributeSetInitializedBlocked = theAttribute->blockSetInitialized(true);
}
else {
aData->blockSendAttributeUpdated(false);
- anAttribute->blockSetInitialized(isAttributeSetInitializedBlocked);
+ theAttribute->blockSetInitialized(isAttributeSetInitializedBlocked);
aLoop->activateFlushes(isFlushesActived);
}
}
//********************************************************************
-void ModuleBase_WidgetValidated::storeValidState(const ModuleBase_ViewerPrs& theValue, const bool theValid)
+void ModuleBase_WidgetValidated::storeValidState(const ModuleBase_ViewerPrsPtr& theValue, const bool theValid)
{
- bool aValidPrs = myInvalidPrs.contains(theValue);
- bool anInvalidPrs = myInvalidPrs.contains(theValue);
-
if (theValid) {
- if (!aValidPrs)
+ GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr();
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool aValidPrsContains = aShape.get() && myValidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myValidPrs.Find(aTDShape).get());
+ if (!aValidPrsContains) {
+#ifdef LIST_OF_VALID_PRS
+
myValidPrs.append(theValue);
+#else
+ GeomShapePtr aShape = theValue->shape();
+ if (aShape.get()) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ myValidPrs.Bind(aTDShape, theValue);
+ }
+#endif
// the commented code will be useful when the valid state of the presentation
// will be changable between activate/deactivate. Currently it does not happen.
//if (anInvalidPrs)
// myInvalidPrs.removeOne(theValue);
+ }
}
else { // !theValid
- if (!anInvalidPrs)
+ GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr();
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool anIValidPrsContains = aShape.get() && myInvalidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myInvalidPrs.Find(aTDShape).get());
+
+ if (!anIValidPrsContains) {
+#ifdef LIST_OF_VALID_PRS
myInvalidPrs.append(theValue);
+#else
+ GeomShapePtr aShape = theValue->shape();
+ if (aShape.get()) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ myInvalidPrs.Bind(aTDShape, theValue);
+ }
+#endif
//if (!aValidPrs)
// myValidPrs.removeOne(theValue);
+ }
}
#ifdef DEBUG_VALID_STATE
qDebug(QString("storeValidState: myValidPrs.size() = %1, myInvalidPrs.size() = %2").arg(myValidPrs.count())
}
//********************************************************************
-bool ModuleBase_WidgetValidated::getValidState(const ModuleBase_ViewerPrs& theValue, bool& theValid)
+bool ModuleBase_WidgetValidated::getValidState(const ModuleBase_ViewerPrsPtr& theValue, bool& theValid)
{
- bool aValidPrs = myValidPrs.contains(theValue);
- bool anInvalidPrs = myInvalidPrs.contains(theValue);
+ if (!theValue.get())
+ return false;
+
+#ifdef LIST_OF_VALID_PRS
+ bool aValidPrsContains = myValidPrs.contains(theValue);
+ bool anInvalidPrsContains = myInvalidPrs.contains(theValue);
+#else
+ GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr();
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool aValidPrsContains = aShape.get() && myValidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myValidPrs.Find(aTDShape).get());
+ /*if (aShape.get() && myValidPrs.IsBound(aTDShape)) {
+ ModuleBase_ViewerPrs* aPrs1 = theValue.get();
+ ModuleBase_ViewerPrs* aPrs2 = myValidPrs.Find(aTDShape).get();
+
+ bool isEqual2 = aPrs1->isEqual(aPrs2);
+
+ bool aValue = 9;
+ }*/
+
+ bool anInvalidPrsContains = aShape.get() && myInvalidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myInvalidPrs.Find(aTDShape).get());
+ /*
+ bool aValidPrsContains = false, anInvalidPrsContains = false;
+ GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr();
+ if (aShape.get()) {
+ aValidPrsContains = myValidPrs.contains(aShape);
+ anInvalidPrsContains = myInvalidPrs.contains(aShape);
+
+ if (aValidPrsContains)
+ aValidPrsContains = theValue == myValidPrs[aShape];
+ else
+ anInvalidPrsContains = theValue == myInvalidPrs[aShape];*/
+#endif
- if (aValidPrs)
+ if (aValidPrsContains)
theValid = true;
- else if (anInvalidPrs)
+ else if (anInvalidPrsContains)
theValid = false;
- return aValidPrs || anInvalidPrs;
+ return aValidPrsContains || anInvalidPrsContains;
}
//********************************************************************
-void ModuleBase_WidgetValidated::clearValidState()
+QList<ModuleBase_ViewerPrsPtr> ModuleBase_WidgetValidated::getFilteredSelected()
{
-#ifdef DEBUG_VALID_STATE
- qDebug("clearValidState");
-#endif
- myValidPrs.clear();
- myInvalidPrs.clear();
-}
-
-//********************************************************************
-QList<ModuleBase_ViewerPrs> ModuleBase_WidgetValidated::getFilteredSelected()
-{
- QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected(
+ QList<ModuleBase_ViewerPrsPtr> aSelected = myWorkshop->selection()->getSelected(
ModuleBase_ISelection::Viewer);
- QList<ModuleBase_ViewerPrs> anOBSelected = myWorkshop->selection()->getSelected(
+ QList<ModuleBase_ViewerPrsPtr> anOBSelected = myWorkshop->selection()->getSelected(
ModuleBase_ISelection::Browser);
// filter the OB presentations
filterPresentations(anOBSelected);
if (!anOBSelected.isEmpty())
ModuleBase_ISelection::appendSelected(anOBSelected, aSelected);
+ filterCompSolids(aSelected);
+
return aSelected;
}
//********************************************************************
-void ModuleBase_WidgetValidated::filterPresentations(QList<ModuleBase_ViewerPrs>& theValues)
+void ModuleBase_WidgetValidated::filterPresentations(QList<ModuleBase_ViewerPrsPtr>& theValues)
{
- QList<ModuleBase_ViewerPrs> aValidatedValues;
+ QList<ModuleBase_ViewerPrsPtr> aValidatedValues;
- QList<ModuleBase_ViewerPrs>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
bool isDone = false;
for (; anIt != aLast; anIt++) {
if (isValidInFilters(*anIt))
theValues = aValidatedValues;
}
}
+
+//********************************************************************
+void ModuleBase_WidgetValidated::filterCompSolids(QList<ModuleBase_ViewerPrsPtr>& theValues)
+{
+ std::set<ResultCompSolidPtr> aCompSolids;
+ QList<ModuleBase_ViewerPrsPtr> aValidatedValues;
+
+ // Collect compsolids.
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
+ for (; anIt != aLast; anIt++) {
+ const ModuleBase_ViewerPrsPtr& aViewerPrs = *anIt;
+ ObjectPtr anObject = aViewerPrs->object();
+ ResultCompSolidPtr aResultCompSolid = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(anObject);
+ if(aResultCompSolid.get()) {
+ aCompSolids.insert(aResultCompSolid);
+ }
+ }
+
+ // Filter sub-solids of compsolids.
+ anIt = theValues.begin();
+ for (; anIt != aLast; anIt++) {
+ const ModuleBase_ViewerPrsPtr& aViewerPrs = *anIt;
+ ObjectPtr anObject = aViewerPrs->object();
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
+ ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aResult);
+ if(aResCompSolidPtr.get() && (aCompSolids.find(aResCompSolidPtr) != aCompSolids.end())) {
+ // Skip sub-solid of compsolid.
+ continue;
+ } else {
+ aValidatedValues.append(*anIt);
+ }
+ }
+
+ if (aValidatedValues.size() != theValues.size()) {
+ theValues.clear();
+ theValues = aValidatedValues;
+ }
+}
