X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_WorkshopListener.cpp;h=849466192813c7078634f398aa82845264f3d8b0;hb=176403004ff97696f3c0b5f8bdf48692177fb34a;hp=984388b5c6ac4b3d9850fa71431ec906c0da51c4;hpb=5b4e69308550c299e14f336d489dc0aefbc5d6f4;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_WorkshopListener.cpp b/src/XGUI/XGUI_WorkshopListener.cpp
index 984388b5c..849466192 100755
--- a/src/XGUI/XGUI_WorkshopListener.cpp
+++ b/src/XGUI/XGUI_WorkshopListener.cpp
@@ -85,7 +85,6 @@ void XGUI_WorkshopListener::initializeEventListening()
   //Initialize event listening
   Events_Loop* aLoop = Events_Loop::loop();
   aLoop->registerListener(this, Events_InfoMessage::errorID());  //!< Listening application errors.
-  aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
@@ -139,7 +138,8 @@ void XGUI_WorkshopListener::processEvent(const std::shared_ptr<Events_Message>&
   } else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION)) {
     ModuleBase_ModelWidget* aWidget = workshop()->propertyPanel()->activeWidget();
     if (aWidget) {
-      ModuleBase_WidgetSelector* aWidgetSelector = dynamic_cast<ModuleBase_WidgetSelector*>(aWidget);
+      ModuleBase_WidgetSelector* aWidgetSelector =
+        dynamic_cast<ModuleBase_WidgetSelector*>(aWidget);
       if (aWidgetSelector)
         myWorkshop->setSelected(aWidgetSelector->getAttributeSelection());
     }
@@ -158,26 +158,6 @@ void XGUI_WorkshopListener::processEvent(const std::shared_ptr<Events_Message>&
       QApplication::restoreOverrideCursor();
     }
   }
-  //An operation passed by message. Start it, process and commit.
-  else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
-    std::shared_ptr<Config_PointerMessage> aPartSetMsg =
-        std::dynamic_pointer_cast<Config_PointerMessage>(theMessage);
-    //myPropertyPanel->cleanContent();
-    ModuleBase_Operation* anOperation = (ModuleBase_Operation*) aPartSetMsg->pointer();
-    XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
-
-    if (anOperationMgr->startOperation(anOperation)) {
-      ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
-      if (aFOperation) {
-        workshop()->propertyPanel()->updateContentWidget(aFOperation->feature());
-        workshop()->propertyPanel()->createContentPanel(aFOperation->feature());
-      }
-      if (!anOperation->getDescription()->hasXmlRepresentation()) {
-        if (anOperation->commit())
-          workshop()->updateCommandStatus();
-      }
-    }
-  } 
   else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) {
     std::shared_ptr<Config_SelectionFilterMessage> aMsg = 
       std::dynamic_pointer_cast<Config_SelectionFilterMessage>(theMessage);
@@ -197,7 +177,8 @@ void XGUI_WorkshopListener::processEvent(const std::shared_ptr<Events_Message>&
     aDisplayer->enableUpdateViewer(true);
   } else {
     //Show error dialog if error message received.
-    std::shared_ptr<Events_InfoMessage> anIngfoMsg = std::dynamic_pointer_cast<Events_InfoMessage>(theMessage);
+    std::shared_ptr<Events_InfoMessage> anIngfoMsg = 
+      std::dynamic_pointer_cast<Events_InfoMessage>(theMessage);
     if (anIngfoMsg) {
       emit errorOccurred(anIngfoMsg);
     }
@@ -223,7 +204,8 @@ void XGUI_WorkshopListener::onFeatureUpdatedMsg(
     anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
   }
   QString anInfoStr = anInfo.join(";\t");
-  qDebug(QString("onFeatureUpdatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+  qDebug(QString("onFeatureUpdatedMsg: %1, %2")
+    .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
 #endif
   std::set<ObjectPtr> aFeatures = theMsg->objects();
   XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
@@ -249,7 +231,8 @@ void XGUI_WorkshopListener::onFeatureUpdatedMsg(
 }
 
 //******************************************************
-void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+void XGUI_WorkshopListener::
+  onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
 {
   std::set<ObjectPtr> anObjects = theMsg->objects();
   std::set<ObjectPtr>::const_iterator aIt;
@@ -260,13 +243,15 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
     anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
   }
   QString anInfoStr = anInfo.join(";\t");
-  qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+  qDebug(QString("onFeatureRedisplayMsg: %1, %2")
+    .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
 #endif
 
   XGUI_Workshop* aWorkshop = workshop();
   XGUI_Displayer* aDisplayer = aWorkshop->displayer();
-  bool aFirstVisualizedBody = false;
-
+  //bool aFirstVisualizedBody = false;
+  bool aDoFitAll = false;
+  int aNbOfShownObjects = workshop()->displayer()->objectsCount();
   bool aRedisplayed = false;
   //std::list<ObjectPtr> aHiddenObjects;
   for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
@@ -290,7 +275,8 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
     if (aRes.get()) {
       ResultCompSolidPtr aCompSolidRes = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aRes);
       if (aCompSolidRes.get()) {
-          qDebug(QString("COMPSOLID, numberOfSubs = %1").arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
+          qDebug(QString("COMPSOLID, numberOfSubs = %1")
+            .arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
       }
       if (ModelAPI_Tools::compSolidOwner(aRes))
         qDebug("COMPSOLID sub-object");
@@ -308,16 +294,16 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
       }
     #endif
     if (aHide) {
-      //we should provide objects which are hidden in the viewer, e.g. sketch always should visualizes
-      // all sub-features, if some features are to be hidden, sould be proposed may be to removed #1223
-      //aHiddenObjects.push_back(aObj);
+      //we should provide objects which are hidden in the viewer, e.g. sketch always should
+      // visualizes all sub-features, if some features are to be hidden, sould be proposed may 
+      // be to removed #1223 
+      // aHiddenObjects.push_back(aObj);
       aRedisplayed = aDisplayer->erase(aObj, false) || aRedisplayed;
       #ifdef DEBUG_FEATURE_REDISPLAY
         // Redisplay the visible object or the object of the current operation
         bool isVisibleObject = aDisplayer->isVisible(aObj);
 
         QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
-        //qDebug(QString("visible=%1 : erase  = %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
       #endif
     }
     else {
@@ -325,7 +311,6 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
       bool isVisibleObject = aDisplayer->isVisible(aObj);
       #ifdef DEBUG_FEATURE_REDISPLAY
         QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
-        //qDebug(QString("visible=%1 : display= %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
       #endif
 
       if (isVisibleObject)  { // redisplay visible object
@@ -342,7 +327,9 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
           aWorkshop->deactivateActiveObject(aObj, false);
         }
       } else { // display object if the current operation has it
-        if (displayObject(aObj, aFirstVisualizedBody)) {
+        if (displayObject(aObj)) {
+          aDoFitAll = aDoFitAll || neededFitAll(aObj, aNbOfShownObjects);
+
           aRedisplayed = true;
           // Deactivate object of current operation from selection
           aWorkshop->deactivateActiveObject(aObj, false);
@@ -359,8 +346,8 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
   if (aRedisplayed || isCustomized) {
     Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION));
 
-    //VSV FitAll updated viewer by it self
-    if (aFirstVisualizedBody)
+    //VSV FitAll updated viewer by itself
+    if (aDoFitAll)
       myWorkshop->viewer()->fitAll();
     else 
       aDisplayer->updateViewer();
@@ -368,7 +355,8 @@ void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI
 }
 
 //******************************************************
-void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+void XGUI_WorkshopListener::
+  onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
 {
   std::set<ObjectPtr> anObjects = theMsg->objects();
   std::set<ObjectPtr>::const_iterator aIt;
@@ -378,10 +366,12 @@ void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_O
     anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
   }
   QString anInfoStr = anInfo.join(";\t");
-  qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+  qDebug(QString("onFeatureCreatedMsg: %1, %2")
+    .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
 #endif
 
-  bool aFirstVisualizedBody = false;
+  bool aDoFitAll = false;
+  int aNbOfShownObjects = workshop()->displayer()->objectsCount();
 
   //bool aHasPart = false;
   bool aDisplayed = false;
@@ -393,7 +383,8 @@ void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_O
     if (aRes.get()) {
       ResultCompSolidPtr aCompSolidRes = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aRes);
       if (aCompSolidRes.get()) {
-          qDebug(QString("COMPSOLID, numberOfSubs = %1").arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
+          qDebug(QString("COMPSOLID, numberOfSubs = %1")
+            .arg(aCompSolidRes->numberOfSubs()).toStdString().c_str());
       }
       if (ModelAPI_Tools::compSolidOwner(aRes))
         qDebug("COMPSOLID sub-object");
@@ -419,7 +410,9 @@ void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_O
       // with list of displayed objects
       if (myWorkshop->module()->canDisplayObject(anObject)) {
         anObject->setDisplayed(true);
-        aDisplayed = displayObject(*aIt, aFirstVisualizedBody);
+        aDisplayed = displayObject(anObject);
+        if (aDisplayed)
+          aDoFitAll = aDoFitAll || neededFitAll(anObject, aNbOfShownObjects);
       } else 
         anObject->setDisplayed(false);
     }
@@ -431,8 +424,8 @@ void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_O
   //  myObjectBrowser->processEvent(theMsg);
   if (aDisplayed) {
     Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION));
-    //VSV FitAll updated viewer by it self
-    if (aFirstVisualizedBody)
+    //VSV FitAll updated viewer by itself
+    if (aDoFitAll)
       myWorkshop->viewer()->fitAll();
     else
       workshop()->displayer()->updateViewer();
@@ -454,7 +447,8 @@ void XGUI_WorkshopListener::onFeatureEmptyPresentationMsg(
     anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
   }
   QString anInfoStr = anInfo.join(";\t");
-  qDebug(QString("onFeatureEmptyPresentationMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
+  qDebug(QString("onFeatureEmptyPresentationMsg: %1, %2")
+    .arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
 #endif
 
   XGUI_Workshop* aWorkshop = workshop();
@@ -482,7 +476,7 @@ bool XGUI_WorkshopListener::event(QEvent * theEvent)
 }
 
 //**************************************************************
-bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj, bool& theFirstVisualizedBody)
+bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj)
 {
 #ifdef DEBUG_RESULT_COMPSOLID
   ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
@@ -503,18 +497,26 @@ bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj, bool& theFirstVisual
 
   XGUI_Displayer* aDisplayer = aWorkshop->displayer();
   int aNb = aDisplayer->objectsCount();
-  aDisplayed = aDisplayer->display(theObj, false);
-
-  ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
-  if (aNb == 0 && aResult.get()) {
-    std::string aResultGroupName = aResult->groupName();
-    if (aResultGroupName == ModelAPI_ResultBody::group() ||
-        aResultGroupName == ModelAPI_ResultGroup::group()) {
-      std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
-      theFirstVisualizedBody = aShapePtr.get() != NULL;
+  return aDisplayer->display(theObj, false);
+}
+
+//**************************************************************
+bool XGUI_WorkshopListener::neededFitAll(ObjectPtr theObj, const int theNbOfShownObjects)
+{
+  bool aFirstVisualizedBody = false;
+
+  if (theNbOfShownObjects == 0) {
+    ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
+    if (aResult.get()) {
+      std::string aResultGroupName = aResult->groupName();
+      if (aResultGroupName == ModelAPI_ResultBody::group() ||
+          aResultGroupName == ModelAPI_ResultGroup::group()) {
+        std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
+        aFirstVisualizedBody = aShapePtr.get() != NULL;
+      }
     }
   }
-  return aDisplayed;
+  return aFirstVisualizedBody;
 }
 
 bool XGUI_WorkshopListener::customizeCurrentObject(const std::set<ObjectPtr>& theObjects,