Issue #1854 Recover feature control update

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

diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp
index 35d09d0def4e24b791e1dccde7a602943a3d731f..a96d676e5fb28ea55f560b954a9d06ecaaedf8d1 100644 (file)
--- a/src/ModuleBase/ModuleBase_IModule.cpp
+++ b/src/ModuleBase/ModuleBase_IModule.cpp
@@ -9,6 +9,9 @@
 #include "ModuleBase_OperationDescription.h"
 #include "ModuleBase_OperationFeature.h"
 #include "ModuleBase_ModelWidget.h"
+#include "ModuleBase_WidgetFactory.h"
+#include "ModuleBase_PageWidget.h"
+#include "ModuleBase_Dialog.h"
 
 #include <Events_Loop.h>
 
@@ -22,9 +25,14 @@
 #include <Config_ModuleReader.h>
 
 #include <QAction>
+#include <QMainWindow>
+#include <QDialog>
+#include <QLayout>
+#include <QDialogButtonBox>
+#include <QPushButton>
 
 ModuleBase_IModule::ModuleBase_IModule(ModuleBase_IWorkshop* theParent)
-  : QObject(theParent), myWorkshop(theParent) 
+  : QObject(theParent), myWorkshop(theParent)
 {
   connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
 
@@ -41,34 +49,64 @@ ModuleBase_IModule::ModuleBase_IModule(ModuleBase_IWorkshop* theParent)
   //        SLOT(onMouseDoubleClick(QMouseEvent*)));
 }
 
+void ModuleBase_IModule::launchModal(const QString& theCmdId)
+{
+  if (!myWorkshop->canStartOperation(theCmdId))
+    return;
+
+  std::string aXmlCfg, aDescription;
+  getXMLRepresentation(theCmdId.toStdString(), aXmlCfg, aDescription);
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  aMgr->startOperation(theCmdId.toStdString());
+
+  ModuleBase_Dialog aDlg(myWorkshop, theCmdId, aXmlCfg);
+  if (aDlg.exec() == QDialog::Accepted)
+    aMgr->finishOperation();
+  else
+    aMgr->abortOperation();
+  myWorkshop->updateCommandStatus();
+}
+
+
 void ModuleBase_IModule::launchOperation(const QString& theCmdId)
 {
+  /// selection should be obtained from workshop before ask if the operation can be started as
+  /// the canStartOperation method performs commit/abort of previous operation.
+  /// Sometimes commit/abort may cause selection clear(Sketch operation) as a result
+  /// it will be lost and is not used for preselection.
+  ModuleBase_ISelection* aSelection = myWorkshop->selection();
+  QList<ModuleBase_ViewerPrsPtr> aPreSelected =
+    aSelection->getSelected(ModuleBase_ISelection::AllControls);
+
   if (!myWorkshop->canStartOperation(theCmdId))
     return;
 
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
                                              (createOperation(theCmdId.toStdString()));
   if (aFOperation) {
-    ModuleBase_ISelection* aSelection = myWorkshop->selection();
-    // Initialise operation with preliminary selection
-    aFOperation->initSelection(aSelection, myWorkshop->viewer());
-    sendOperation(aFOperation);
+    aFOperation->initSelection(aPreSelected);
+
+    workshop()->processLaunchOperation(aFOperation);
   }
 }
 
+Handle(AIS_InteractiveObject) ModuleBase_IModule::createPresentation(const ResultPtr& theResult)
+{
+  return Handle(AIS_InteractiveObject)();
+}
 
-void ModuleBase_IModule::sendOperation(ModuleBase_Operation* theOperation)
+bool ModuleBase_IModule::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const
 {
-  static Events_ID aModuleEvent = Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED);
-  std::shared_ptr<Config_PointerMessage> aMessage =
-      std::shared_ptr<Config_PointerMessage>(new Config_PointerMessage(aModuleEvent, this));
-  aMessage->setPointer(theOperation);
-  Events_Loop::loop()->send(aMessage);
+  return true;
 }
 
 QString ModuleBase_IModule::getFeatureError(const FeaturePtr& theFeature)
 {
-  return ModelAPI_Tools::getFeatureError(theFeature).c_str();
+  std::string aMsg = ModelAPI_Tools::getFeatureError(theFeature);
+  ModuleBase_Tools::translate(theFeature->getKind(), aMsg);
+
+  return aMsg.c_str();
 }
 
 void ModuleBase_IModule::grantedOperationIds(ModuleBase_Operation* theOperation,
@@ -81,7 +119,9 @@ ModuleBase_Operation* ModuleBase_IModule::getNewOperation(const std::string& the
   return new ModuleBase_OperationFeature(theFeatureId.c_str(), this);
 }
 
-bool ModuleBase_IModule::customizeObject(ObjectPtr theObject, const bool theUpdateViewer)
+bool ModuleBase_IModule::customizeObject(ObjectPtr theObject,
+                              const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag,
+                              const bool theUpdateViewer)
 {
   return false;
 }
@@ -103,12 +143,8 @@ ModuleBase_Operation* ModuleBase_IModule::createOperation(const std::string& the
     }
   }
 
-  std::string aPluginFileName = myFeaturesInFiles[theFeatureId];
-  Config_WidgetReader aWdgReader = Config_WidgetReader(aPluginFileName);
-  aWdgReader.readAll();
-  std::string aXmlCfg = aWdgReader.featureWidgetCfg(theFeatureId);
-  std::string aDescription = aWdgReader.featureDescription(theFeatureId);
-
+  std::string aXmlCfg, aDescription;
+  getXMLRepresentation(theFeatureId, aXmlCfg, aDescription);
   aFOperation->getDescription()->setDescription(QString::fromStdString(aDescription));
   aFOperation->getDescription()->setXmlRepresentation(QString::fromStdString(aXmlCfg));
 
@@ -161,14 +197,20 @@ void ModuleBase_IModule::onFeatureTriggered()
   if (aCmd->isCheckable() && !aCmd->isChecked()) {
     ModuleBase_Operation* anOperation = myWorkshop->findStartedOperation(aCmd->data().toString());
     if (myWorkshop->canStopOperation(anOperation))
-      myWorkshop->abortOperation(anOperation);
+      myWorkshop->stopOperation(anOperation);
     else {
       aCmd->setChecked(true);
     }
   }
   else {
-    launchOperation(aCmd->data().toString());
-    emit operationLaunched();
+    QString aCmdId = aCmd->data().toString();
+    std::shared_ptr<Config_FeatureMessage> aInfo = myWorkshop->featureInfo(aCmdId);
+    if (aInfo.get() && aInfo->isModal()) {
+      launchModal(aCmdId);
+    } else {
+      launchOperation(aCmdId);
+      emit operationLaunched();
+    }
   }
 }
 
@@ -182,7 +224,7 @@ void ModuleBase_IModule::editFeature(FeaturePtr theFeature)
                                                          (createOperation(aFeatureId));
   if (aFOperation) {
     aFOperation->setFeature(theFeature);
-    sendOperation(aFOperation);
+    workshop()->processLaunchOperation(aFOperation);
   }
 }
 
@@ -193,7 +235,18 @@ bool ModuleBase_IModule::canActivateSelection(const ObjectPtr& theObject) const
   return !aFOperation || !aFOperation->hasObject(theObject);
 }
 
-void ModuleBase_IModule::operationResumed(ModuleBase_Operation* theOperation) 
+void ModuleBase_IModule::operationResumed(ModuleBase_Operation* theOperation)
 {
   emit resumed(theOperation);
 }
+
+void ModuleBase_IModule::getXMLRepresentation(const std::string& theFeatureId,
+                                              std::string& theXmlCfg, std::string& theDescription)
+{
+  std::string aPluginFileName = myFeaturesInFiles[theFeatureId];
+  Config_WidgetReader aWdgReader = Config_WidgetReader(aPluginFileName);
+  aWdgReader.readAll();
+
+  theXmlCfg = aWdgReader.featureWidgetCfg(theFeatureId);
+  theDescription = aWdgReader.featureDescription(theFeatureId);
+}