if (!myOperationMgr->hasOperation())
return;
- ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
- FeaturePtr anActiveFeature = anOperation->feature();
- if(!anActiveFeature.get())
+ QStringList aIdList = myOperationMgr->operationList();
+ //ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ //FeaturePtr anActiveFeature = anOperation->feature();
+ //if(!anActiveFeature.get())
+ if (aIdList.isEmpty())
return;
- QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
+ //QString aFeatureId = QString::fromStdString(anActiveFeature->getKind());
XGUI_Selection* aSelection = myWorkshop->selector()->selection();
- if (aSelection->getSelected().size() == 0) {
- foreach(QString aId, nestedCommands(aFeatureId)) {
- setActionEnabled(aId, true);
- }
+ // only viewer selection is processed
+ if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) {
+ // it seems that this code is not nesessary anymore. It leads to incorrect case:
+ // sketch operation start, click in any place in the viewer. The result is all nested
+ // entities are enabled(but the sketch plane is not selected yet). Any sketch operation
+ // can be started but will be incorrect on preview build before it uses the sketch unset plane.
+ /*foreach(QString aFeatureId, aIdList) {
+ foreach(QString aId, nestedCommands(aFeatureId)) {
+ setActionEnabled(aId, true);
+ }
+ }*/
} else {
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- foreach(QString aId, nestedCommands(aFeatureId)) {
- std::list<ModelAPI_Validator*> aValidators;
- std::list<std::list<std::string> > anArguments;
- aFactory->validators(aId.toStdString(), aValidators, anArguments);
- std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
- std::list<std::list<std::string> >::iterator aValidatorArgs = anArguments.begin();
- for (; aValidator != aValidators.end(); aValidator++, aValidatorArgs++) {
- if (!(*aValidator))
- continue;
- const ModuleBase_SelectionValidator* aSelValidator =
- dynamic_cast<const ModuleBase_SelectionValidator*>(*aValidator);
- if (!aSelValidator)
- continue;
- setActionEnabled(aId, aSelValidator->isValid(aSelection, *aValidatorArgs));
-
+ foreach(QString aFeatureId, aIdList) {
+ foreach(QString aId, nestedCommands(aFeatureId)) {
+ ModelAPI_ValidatorsFactory::Validators aValidators;
+ aFactory->validators(aId.toStdString(), aValidators);
+ ModelAPI_ValidatorsFactory::Validators::iterator aValidatorIt = aValidators.begin();
+ for (; aValidatorIt != aValidators.end(); ++aValidatorIt) {
+ const ModuleBase_SelectionValidator* aSelValidator =
+ dynamic_cast<const ModuleBase_SelectionValidator*>(aFactory->validator(aValidatorIt->first));
+ if (!aSelValidator)
+ continue;
+ setActionEnabled(aId, aSelValidator->isValid(aSelection, aValidatorIt->second));
+ }
}
}
}
return;
FeaturePtr aFeature = theOperation->feature();
QString aFeatureId = QString::fromStdString(aFeature->getKind());
+ setActionEnabled(aFeatureId, true);
setNestedCommandsEnabled(true, aFeatureId);
setNestedStackEnabled(myOperationMgr->previousOperation(theOperation));
{
static Events_ID aStateRequestEventId = Events_Loop::loop()->eventByName(
EVENT_FEATURE_STATE_REQUEST);
- std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg =
- std::make_shared<ModelAPI_FeatureStateMessage>(aStateRequestEventId, this);
+ std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg(
+ new ModelAPI_FeatureStateMessage(aStateRequestEventId, this));
aMsg->setFeature(anActiveFeature);
Events_Loop::loop()->send(aMsg, false);
}