clearPreselection();
}
-void ModuleBase_OperationFeature::setEditOperation(const bool theRestartTransaction)
+void ModuleBase_OperationFeature::setEditOperation(const bool& isEditState
+ /*const bool theRestartTransaction*/)
{
- if (isEditOperation())
+ bool isCurrentEditState = isEditOperation();
+ if (isCurrentEditState == isEditState)
return;
- myIsEditing = true;
+ /*
+ // this case is obsolete as it was not approved for reentrant sketch operation
+ // it was implemented when isEditState did not exist and only edit operation can be set
if (theRestartTransaction) {
- FeaturePtr aPrevFeature = myPreviousCurrentFeature;
-
+ // finsh previous create operation
+ emit beforeCommitted();
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_Session::get()->finishOperation();
+ // start new edit operation
+ myIsEditing = true;
QString anId = getDescription()->operationId();
if (myIsEditing) {
anId = anId.append(EditSuffix());
}
ModelAPI_Session::get()->startOperation(anId.toStdString());
emit beforeStarted();
-
- myPreviousCurrentFeature = aPrevFeature;
- }
+ } else*/
+ myIsEditing = isEditState;
propertyPanel()->setEditingMode(isEditOperation());
}
return true; // rename operation
if (myFeature->isAction())
return true;
- //Get validators for the Id
- SessionPtr aMgr = ModelAPI_Session::get();
- ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- bool aValid = aFactory->validate(myFeature);
- // the feature exec state should be checked in order to do not apply features, which result can not
- // be built. E.g. extrusion on sketch, where the "to" is a perpendicular plane to the sketch
- bool isDone = ( myFeature->data()->execState() == ModelAPI_StateDone
- || myFeature->data()->execState() == ModelAPI_StateMustBeUpdated );
-
- return aValid && isDone;
+ std::string anError = ModelAPI_Tools::getFeatureError(myFeature);
+ return anError.empty();
}
void ModuleBase_OperationFeature::startOperation()
return myVisualizedObjects.find(theObject) != myVisualizedObjects.end();
}
-void ModuleBase_OperationFeature::start()
+bool ModuleBase_OperationFeature::start()
{
setIsModified(false);
QString anId = getDescription()->operationId();
// in order to update commands status in the workshop, to be exact the feature action
// to be unchecked
abort();
- return;
+ return false;
}
}
//Already called startOperation();
emit started();
-
+ return true;
}
void ModuleBase_OperationFeature::abort()
if (aPropertyPanel)
aPropertyPanel->cleanContent();
- myFeature->setStable(true);
+ if (myFeature.get())
+ myFeature->setStable(true);
abortOperation();
stopOperation();
bool ModuleBase_OperationFeature::commit()
{
+ ModuleBase_IPropertyPanel* aPanel = propertyPanel();
+ if (aPanel) {
+ ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
+ if (anActiveWidget && anActiveWidget->getValueState() == ModuleBase_ModelWidget::ModifiedInPP) {
+ anActiveWidget->storeValue();
+ }
+ }
if (canBeCommitted()) {
emit beforeCommitted();
// the widgets of property panel should not process any events come from data mode