Issue #1664: In the Sketcher, add the function Split a segment. Split feature impleme...

[modules/shaper.git] / src / XGUI / XGUI_Workshop.cpp

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index d7f38883ae936c3c8119f71402b5da68859a3f7f..72574632fa5ce0246af994ff04b8de1eea16c478 100755 (executable)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -70,6 +70,7 @@
 #include <ModuleBase_PagedContainer.h>
 #include <ModuleBase_WidgetValidated.h>
 #include <ModuleBase_ModelWidget.h>
+#include <ModuleBase_ResultPrs.h>
 
 #include <Config_Common.h>
 #include <Config_FeatureMessage.h>
@@ -146,6 +147,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
   QString aPath = Config_XMLReader::pluginConfigFile().c_str();
   QDir aDir(aPath);
 
+  // Load translations
   QStringList aFilters;
   aFilters << "*_en.ts";
   QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files);
@@ -175,8 +177,6 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
 
   myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop);
 
-  connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), 
-          SLOT(onOperationStarted(ModuleBase_Operation*)));
   connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)),
           SLOT(onOperationResumed(ModuleBase_Operation*)));
   connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
@@ -197,7 +197,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
   //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
   //                                 Config_Prop::Color, "225,225,225");
 
-  Config_PropManager::registerProp("Visualization", "result_body_color", "Body color",
+  Config_PropManager::registerProp("Visualization", "result_body_color", "Result color",
                                    Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR());
   Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
                                    Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR());
@@ -212,6 +212,9 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
     myViewerSelMode.append(TopAbs_EDGE);
   if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "vertex-selection", true))
     myViewerSelMode.append(TopAbs_VERTEX);
+  //IMP: an attempt to use result selection with other selection modes
+  myViewerSelMode.append(ModuleBase_ResultPrs::Sel_Result);//TopAbs_VERTEX);
+  myViewerSelMode.append(TopAbs_COMPSOLID);
 }
 
 //******************************************************
@@ -483,7 +486,7 @@ bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature)
   return aHasNested;
 }
 
-void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation)
 {
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if (!aFOperation)
@@ -578,20 +581,13 @@ void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect)
   }
 }
 
-//******************************************************
-void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
-{
-  setGrantedFeatures(theOperation);
-  myModule->operationStarted(theOperation);
-}
-
 //******************************************************
 void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation)
 {
   setGrantedFeatures(theOperation);
 
   if (theOperation->getDescription()->hasXmlRepresentation()) {  //!< No need for property panel
-    setPropertyPanel(theOperation);
+    fillPropertyPanel(theOperation);
     connectToPropertyPanel(true);
   }
   updateCommandStatus();
@@ -626,7 +622,8 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
   if (aFeature.get()) { // feature may be not created (plugin load fail)
     if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature))
       anObjects.append(aFeature);
-    std::list<ResultPtr> aResults = aFeature->results();
+    std::list<ResultPtr> aResults;
+    ModelAPI_Tools::allResults(aFeature, aResults);
     std::list<ResultPtr>::const_iterator aIt;
     for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
       ResultPtr anObject = *aIt;
@@ -673,10 +670,7 @@ void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
   aFOperation->setGrantedOperationIds(aGrantedIds);
 }
 
-
-/*
- * Saves document with given name.
- */
+//******************************************************
 void XGUI_Workshop::saveDocument(const QString& theName, std::list<std::string>& theFileNames)
 {
   QApplication::restoreOverrideCursor();
@@ -685,11 +679,24 @@ void XGUI_Workshop::saveDocument(const QString& theName, std::list<std::string>&
   QApplication::restoreOverrideCursor();
 }
 
+//******************************************************
 bool XGUI_Workshop::abortAllOperations()
 {
   return myOperationMgr->abortAllOperations();
 }
 
+//******************************************************
+void XGUI_Workshop::operationStarted(ModuleBase_Operation* theOperation)
+{
+  setGrantedFeatures(theOperation);
+  if (!theOperation->getDescription()->hasXmlRepresentation()) {  //!< No need for property panel
+    updateCommandStatus();
+  }
+  else {
+    myModule->operationStarted(theOperation);
+  }
+}
+
 //******************************************************
 void XGUI_Workshop::onOpen()
 {
@@ -712,16 +719,26 @@ void XGUI_Workshop::onOpen()
   }
 
   //show file dialog, check if readable and open
-  myCurrentDir = QFileDialog::getExistingDirectory(desktop(), tr("Select directory"));
+  QString aDirectory = QFileDialog::getExistingDirectory(desktop(), tr("Select directory"));
+  openDirectory(aDirectory);
+}
+
+//******************************************************
+void XGUI_Workshop::openDirectory(const QString& theDirectory)
+{
+  myCurrentDir = theDirectory;
   if (myCurrentDir.isEmpty())
     return;
+
   QFileInfo aFileInfo(myCurrentDir);
   if (!aFileInfo.exists() || !aFileInfo.isReadable()) {
     QMessageBox::critical(desktop(), tr("Warning"), tr("Unable to open the file."));
     myCurrentDir = "";
     return;
   }
+
   QApplication::setOverrideCursor(Qt::WaitCursor);
+  SessionPtr aSession = ModelAPI_Session::get();
   aSession->closeAll();
   aSession->load(myCurrentDir.toLatin1().constData());
   myObjectBrowser->rebuildDataTree();
@@ -1252,7 +1269,10 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
   } else if (theId == "SELECT_FACE_CMD") {
     setViewerSelectionMode(TopAbs_FACE);
   } else if (theId == "SELECT_RESULT_CMD") {
-    setViewerSelectionMode(-1);
+    //setViewerSelectionMode(-1);
+    //IMP: an attempt to use result selection with other selection modes
+    setViewerSelectionMode(ModuleBase_ResultPrs::Sel_Result);
+    setViewerSelectionMode(TopAbs_COMPSOLID);
   } else if (theId == "SHOW_RESULTS_CMD") {
     highlightResults(aObjects);
   } else if (theId == "SHOW_FEATURE_CMD") {
@@ -1297,9 +1317,6 @@ void XGUI_Workshop::deleteObjects()
   QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
   if (!abortAllOperations())
     return;
-  // check whether the object can be deleted. There should not be parts which are not loaded
-  if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
-    return;
 
   bool hasResult = false;
   bool hasFeature = false;
@@ -1498,20 +1515,21 @@ void XGUI_Workshop::moveObjects()
   // moving and negative consequences connected with processing of already moved items
   mySelector->clearSelection();
   // check whether the object can be moved. There should not be parts which are not loaded
-  if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
+  std::set<FeaturePtr> aFeatures;
+  ModuleBase_Tools::convertToFeatures(anObjects, aFeatures);
+  if (!XGUI_Tools::canRemoveOrRename(desktop(), aFeatures))
     return;
 
   DocumentPtr anActiveDocument = aMgr->activeDocument();
   FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true);
-  foreach (ObjectPtr aObject, anObjects) {
-    if (!myModule->canApplyAction(aObject, anActionId))
+  std::set<FeaturePtr>::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end();
+  for (; anIt != aLast; anIt++) {
+    FeaturePtr aFeature = *anIt;
+    if (!aFeature.get() || !myModule->canApplyAction(aFeature, anActionId))
       continue;
 
-    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
-    if (aFeature.get()) {
-      anActiveDocument->moveFeature(aFeature, aCurrentFeature);
-      aCurrentFeature = anActiveDocument->currentFeature(true);
-    }
+    anActiveDocument->moveFeature(aFeature, aCurrentFeature);
+    aCurrentFeature = anActiveDocument->currentFeature(true);
   }
   aMgr->finishOperation();
 }
@@ -1553,7 +1571,9 @@ std::list<FeaturePtr> allFeatures(const DocumentPtr& theDocument)
     // The order of appending features of the part and the part itself is important
 
     // Append features from a part feature
-    foreach (const ResultPtr& aResult, aFeature->results()) {
+    std::list<ResultPtr> aResults;
+    ModelAPI_Tools::allResults(aFeature, aResults);
+    foreach (const ResultPtr& aResult, aResults) {
       ResultPartPtr aResultPart =
           std::dynamic_pointer_cast<ModelAPI_ResultPart>(aResult);
       if (aResultPart.get() && aResultPart->partDoc().get()) {
@@ -1958,7 +1978,8 @@ void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects)
   foreach(ObjectPtr aObj, theObjects) {
     aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
     if (aFeature.get()) {
-      aResList = aFeature->results();
+      std::list<ResultPtr> aResults;
+      ModelAPI_Tools::allResults(aFeature, aResults);
       std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
       for(aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
         aHasHidden |= (*aIt)->isConcealed();