if (!aFeature.get() || !isEditOperation())
return;
+ if (aFeature.get() && isEditOperation())
+ aFeature->setStable(false);
+
myVisualizedObjects.clear();
// store hidden result features
std::list<ResultPtr> aResults = aFeature->results();
if (myVisualizedObjects.find(aFeature) != myVisualizedObjects.end()) {
aFeature->setDisplayed(false);
}
- aFeature->setStable(true);
if (myVisualizedObjects.size() > 0)
Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
- void ModuleBase_OperationFeature::resumeOperation()
- {
- ModuleBase_Operation::resumeOperation();
- //if (!myIsEditing)
- setCurrentFeature(feature());
- //SessionPtr aMgr = ModelAPI_Session::get();
- //DocumentPtr aDoc = aMgr->activeDocument();
- //aDoc->setCurrentFeature(feature(), false);
- }
-
FeaturePtr ModuleBase_OperationFeature::createFeature(const bool theFlushMessage)
{
if (myParentFeature.get()) {
void ModuleBase_OperationFeature::setFeature(FeaturePtr theFeature)
{
myFeature = theFeature;
- myFeature->setStable(false);
myIsEditing = true;
}
}
ModelAPI_Session::get()->startOperation(anId.toStdString());
+ emit beforeStarted();
startOperation();
if (!myIsEditing) {
return;
}
}
- /// Set current feature and remeber old current feature
- if (myIsEditing) {
- SessionPtr aMgr = ModelAPI_Session::get();
- DocumentPtr aDoc = aMgr->activeDocument();
- // the parameter of current feature should be false, we should use all feature, not only visible
- // in order to correctly save the previous feature of the nested operation, where the
- // features can be not visible in the tree. The problem case is Edit sketch entitity(line)
- // in the Sketch, created in ExtrusionCut operation. The entity disappears by commit.
- // When sketch entity operation started, the sketch should be cashed here as the current.
- // Otherwise(the flag is true), the ExtrusionCut is cashed, when commit happens, the sketch
- // is disabled, sketch entity is disabled as extrusion cut is created earliest then sketch.
- // As a result the sketch disappears from the viewer. However after commit it is displayed back.
- myPreviousCurrentFeature = aDoc->currentFeature(false);
- aDoc->setCurrentFeature(feature(), false);
- }
-
- startOperation();
+ //Already called startOperation();
emit started();
}
void ModuleBase_OperationFeature::abort()
{
+ emit beforeAborted();
+
// the viewer update should be blocked in order to avoid the features blinking before they are
// hidden
std::shared_ptr<Events_Message> aMsg = std::shared_ptr<Events_Message>(
if (aPropertyPanel)
aPropertyPanel->cleanContent();
- SessionPtr aMgr = ModelAPI_Session::get();
- if (myIsEditing) {
- DocumentPtr aDoc = aMgr->activeDocument();
- bool aIsOp = aMgr->isOperation();
- if (!aIsOp)
- aMgr->startOperation();
- aDoc->setCurrentFeature(myPreviousCurrentFeature, false);//true);
- if (!aIsOp)
- aMgr->finishOperation();
- myPreviousCurrentFeature = FeaturePtr();
- }
+ myFeature->setStable(true);
+
abortOperation();
-
stopOperation();
+ SessionPtr aMgr = ModelAPI_Session::get();
aMgr->abortOperation();
emit stopped();
// the viewer update should be unblocked in order to avoid the features blinking before they are
ModuleBase_IPropertyPanel* aPropertyPanel = propertyPanel();
if (aPropertyPanel)
aPropertyPanel->cleanContent();
+
+ myFeature->setStable(true);
SessionPtr aMgr = ModelAPI_Session::get();
/// Set current feature and remeber old current feature
- if (myIsEditing) {
- setCurrentFeature(myPreviousCurrentFeature);
- /*DocumentPtr aDoc = aMgr->activeDocument();
- bool aIsOp = aMgr->isOperation();
- if (!aIsOp)
- aMgr->startOperation();
- aDoc->setCurrentFeature(myPreviousCurrentFeature, true);
- if (!aIsOp)
- aMgr->finishOperation();*/
- myPreviousCurrentFeature = FeaturePtr();
- }
- else {
- /*CompositeFeaturePtr aCompositeFeature = ModelAPI_Tools::compositeOwner(feature());
- if (aCompositeFeature.get())
- setCurrentFeature(aCompositeFeature);//myPreviousCurrentFeature);
- //else
- // setCurrentFeature(feature());*/
- }
+ emit beforeCommitted();
commitOperation();
aMgr->finishOperation();
return false;
}
- void ModuleBase_OperationFeature::setCurrentFeature(const FeaturePtr& theFeature)
- {
- SessionPtr aMgr = ModelAPI_Session::get();
- DocumentPtr aDoc = aMgr->activeDocument();
- bool aIsOp = aMgr->isOperation();
- if (!aIsOp)
- aMgr->startOperation();
- aDoc->setCurrentFeature(theFeature, false);//true);
- if (!aIsOp)
- aMgr->finishOperation();
- }
-
void ModuleBase_OperationFeature::activateByPreselection()
{
if (myPreSelection.empty())
return myParentFeature;
}
+ void ModuleBase_OperationFeature::setPreviousCurrentFeature(const FeaturePtr& theFeature)
+ {
+ myPreviousCurrentFeature = theFeature;
+ }
+
+ FeaturePtr ModuleBase_OperationFeature::previousCurrentFeature()
+ {
+ return myPreviousCurrentFeature;
+ }
+
void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelection,
ModuleBase_IViewer* theViewer)
{