ModuleBase_IWorkshop* theWorkshop,
const Config_WidgetAPI* theData)
: ModuleBase_ModelWidget(theParent, theData),
- myWorkshop(theWorkshop)
+ myWorkshop(theWorkshop), myIsInValidate(false)
{
myAttributeStore = new ModuleBase_WidgetSelectorStore();
}
void ModuleBase_WidgetValidated::clearValidatedCash()
{
#ifdef DEBUG_VALID_STATE
- qDebug("clearValidatedState");
+ qDebug("clearValidatedCash");
#endif
- myValidPrs.clear();
- myInvalidPrs.clear();
+ myValidPrs.Clear();
+ myInvalidPrs.Clear();
}
//********************************************************************
// creates a selection owner on the base of object shape and the object AIS object
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);
restoreAttributeValue(theAttribute, aValid);
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);
-
+ */
return aValid;
}
//********************************************************************
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_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;
}
//********************************************************************
