#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>
: ModuleBase_ModelWidget(theParent, theData),
myWorkshop(theWorkshop), myIsInValidate(false)
{
+ myAttributeStore = new ModuleBase_WidgetSelectorStore();
}
ModuleBase_WidgetValidated::~ModuleBase_WidgetValidated()
{
+ delete myAttributeStore;
}
//********************************************************************
void ModuleBase_WidgetValidated::clearValidatedCash()
{
#ifdef DEBUG_VALID_STATE
- qDebug("clearValidatedState");
+ qDebug("clearValidatedCash");
#endif
- myValidPrs.clear();
- myInvalidPrs.clear();
+ 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
- GeomShapePtr aShape = aResult->shape();
+ GeomShapePtr aShape = aResult.get() ? aResult->shape() : GeomShapePtr();
+ // some results have no shape, e.g. the parameter one. So, they should not be validated
+ if (aShape.get()) {
const TopoDS_Shape aTDShape = aShape->impl<TopoDS_Shape>();
Handle(AIS_InteractiveObject) anIO = myWorkshop->selection()->getIO(thePrs);
anOwner = new StdSelect_BRepOwner(aTDShape, anIO);
}
// 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);
+ /// NDS: The following rows are commented for issue #1452 (to be removed after debug)
+ /// This is not correct to perform it here because it might cause update selection and
+ /// the selection mechanizm will be circled: use the scenario of the bug with preselected point.
// 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
// these 4 lines below the application crashes because of left presentations on
// removed results still in the viewer.
- static Events_ID aDeletedEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
+ /*static Events_ID aDeletedEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
static Events_ID aRedispEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
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
}
//********************************************************************
-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)
- myValidPrs.append(theValue);
- // 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)
- myInvalidPrs.append(theValue);
- //if (!aValidPrs)
- // myValidPrs.removeOne(theValue);
+ GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr();
+ if (aShape.get()) {
+ if (theValid) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool aValidPrsContains = myValidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myValidPrs.Find(aTDShape).get());
+ if (!aValidPrsContains) {
+ #ifdef LIST_OF_VALID_PRS
+ myValidPrs.append(theValue);
+ #else
+ 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 (aShape.get()) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool anIValidPrsContains = myInvalidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myInvalidPrs.Find(aTDShape).get());
+ if (!anIValidPrsContains) {
+ #ifdef LIST_OF_VALID_PRS
+ myInvalidPrs.append(theValue);
+ #else
+ 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())
- .arg(myInvalidPrs.count()).toStdString().c_str());
-#endif
+ #ifdef DEBUG_VALID_STATE
+ qDebug(QString("storeValidState: myValidPrs.size() = %1, myInvalidPrs.size() = %2").arg(myValidPrs.count())
+ .arg(myInvalidPrs.count()).toStdString().c_str());
+ #endif
}
//********************************************************************
-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();
+ if (!aShape.get())
+ return false;
+
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ bool aValidPrsContains = myValidPrs.IsBound(aTDShape) &&
+ theValue.get()->isEqual(myValidPrs.Find(aTDShape).get());
+
+ bool anInvalidPrsContains = 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;
}
//********************************************************************
-QList<ModuleBase_ViewerPrs> ModuleBase_WidgetValidated::getFilteredSelected()
+QList<ModuleBase_ViewerPrsPtr> 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);
}
//********************************************************************
-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))
}
//********************************************************************
-void ModuleBase_WidgetValidated::filterCompSolids(QList<ModuleBase_ViewerPrs>& theValues)
+void ModuleBase_WidgetValidated::filterCompSolids(QList<ModuleBase_ViewerPrsPtr>& theValues)
{
std::set<ResultCompSolidPtr> aCompSolids;
- QList<ModuleBase_ViewerPrs> aValidatedValues;
+ QList<ModuleBase_ViewerPrsPtr> aValidatedValues;
// Collect compsolids.
- QList<ModuleBase_ViewerPrs>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
for (; anIt != aLast; anIt++) {
- const ModuleBase_ViewerPrs& aViewerPrs = *anIt;
- ObjectPtr anObject = aViewerPrs.object();
+ 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_ViewerPrs& aViewerPrs = *anIt;
- ObjectPtr anObject = aViewerPrs.object();
+ 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())) {
