Issue #236: Avoid empty shape types definition

[modules/shaper.git] / src / ModuleBase / ModuleBase_Operation.cpp

diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index a28d62d88e7dcc089b03b95b41beaf2412c84254..b3bf0b07572308f26b62a2fc2c177a4ae2eb24dc 100644 (file)
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -221,7 +221,13 @@ bool ModuleBase_Operation::commit()
     disconnect(myPropertyPanel, 0, this, 0);
 
     stopOperation();
-    ModelAPI_Session::get()->finishOperation();
+    // check whether there are modifications performed during the current operation
+    // in the model
+    // in case if there are no modifications, do not increase the undo/redo stack
+    if (ModelAPI_Session::get()->isModified())
+      ModelAPI_Session::get()->finishOperation();
+    else
+      ModelAPI_Session::get()->abortOperation();
 
     emit stopped();
 
@@ -248,7 +254,7 @@ bool ModuleBase_Operation::activateByPreselection()
   if (aWidgets.empty())
     return false;
   
-  ModuleBase_ModelWidget* aWgt;
+  ModuleBase_ModelWidget* aWgt, *aFilledWgt = 0;
   ModuleBase_ViewerPrs aPrs;
   QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
   QList<ModuleBase_ViewerPrs>::const_iterator aPIt;
@@ -266,14 +272,23 @@ bool ModuleBase_Operation::activateByPreselection()
     if (!aWgt->setValue(&aValue)) {
       isSet = false;
       break;
-    } else 
+    } else {
       isSet = true;
+      aFilledWgt = aWgt;
+    }
   }
   if (isSet && canBeCommitted()) {
     // if all widgets are filled with selection
     commit();
     return true;
   }
+  else {
+    //activate next widget
+    if (aFilledWgt) {
+      myPropertyPanel->activateNextWidget(aFilledWgt);
+      return true;
+    }
+  }
 
   //ModuleBase_ModelWidget* aActiveWgt = myPropertyPanel->activeWidget();
   //if ((myPreSelection.size() > 0) && aActiveWgt) {