Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI.cxx

diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx
index feb934f71f4218f105f270e5016ea833a46cfbb8..aced7fee3dae189f5d4a204c08d1993f7f734417 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI.cxx
+++ b/src/SUPERVGUI/SUPERVGUI.cxx
@@ -164,9 +164,9 @@ void SUPERVGUI::initialize( CAM_Application* app )
   createSupervAction( 309, "ADDNODE"       , "ICO_ADDNODE" );
   createSupervAction( 310, "STEPBYSTEP"    , "ICO_STEPBYSTEP" );
 
-  createSupervAction( 311, "POP_RENAME" );
+  createSupervAction( 311, "POP_RENAME", "", Key_F2 );
   createSupervAction( 312, "POP_DISPLAY" );
-  createSupervAction( 313, "POP_DELETE" );
+  createSupervAction( 313, "POP_DELETE", "", Key_Delete );
 
   // ----- create menu -----------------
   int fileId = createMenu( tr( "MEN_FILE" ), -1, -1 );
@@ -455,65 +455,76 @@ void SUPERVGUI::setMain( SUIT_ViewWindow* w) {
 }
 
 void SUPERVGUI::displayDataflow() {
-    Trace("SUPERVGUI::displayDataflow");
-    OB_Browser* aBrowser = (( SalomeApp_Application* )application())->objectBrowser();
-    SUPERV_Graph aDataFlow;
-    QString aIORName;
-
-    OB_ListItem* item = (OB_ListItem*)(aBrowser->listView()->currentItem());
-    _PTR(SObject) aObj
-      ( (( SalomeApp_Study* )(application()->activeStudy()))->studyDS()->FindObjectID(item->text(2).latin1()) );
-    _PTR(GenericAttribute) anAttr;
-    if (aObj->FindAttribute(anAttr, "AttributeIOR")) {
-      _PTR(AttributeIOR) anIOR ( anAttr );
-      aIORName = QString(anIOR->Value().c_str());
-      if (isContains(study, aIORName)) {
-        if (QMessageBox::warning(application()->desktop(), tr("WARNING"),
-                                 tr("MSG_GRAPH_DISPLAYED").arg(""),
-                                 QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
-          return;
-      }
-      //aDataFlow = engine->getStreamGraph(anIOR->Value().c_str());
-      aDataFlow = engine->getGraph(anIOR->Value().c_str());
-      if (SUPERV_isNull(aDataFlow)) {
-        QMessageBox::warning(0, tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
+  Trace("SUPERVGUI::displayDataflow");
+
+  OB_Browser* aBrowser = getApp()->objectBrowser();
+  OB_ListItem* item = (OB_ListItem*)(aBrowser->listView()->currentItem());
+
+  SalomeApp_Study* anAppStudy = (SalomeApp_Study*)(getApp()->activeStudy());
+  _PTR(SObject) aObj (anAppStudy->studyDS()->FindObjectID(item->text(2).latin1()));
+
+  SUPERV_Graph aDataFlow;
+  QString aIORName;
+
+  _PTR(GenericAttribute) anAttr;
+  if (aObj->FindAttribute(anAttr, "AttributeIOR")) {
+    _PTR(AttributeIOR) anIOR ( anAttr );
+    aIORName = QString(anIOR->Value().c_str());
+    if (isContains(study, aIORName)) {
+      if (QMessageBox::warning(application()->desktop(), tr("WARNING"),
+                               tr("MSG_GRAPH_DISPLAYED").arg(""),
+                               QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
         return;
-      }
-      /* ASV: 20.10.04: fix for 6896
-      if (aDataFlow->IsStreamGraph()) {
-        SUPERV_StreamGraph aDataFlowStream = aDataFlow->ToStreamGraph();
-        if (SUPERV_isNull(aDataFlowStream)) {
-          QMessageBox::warning(0, tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
-          return;
-        }
-        aDataFlow = aDataFlowStream;
-      }
-      */
     }
 
-    SUPERVGraph_ViewFrame* aViewFrame;
-    if ( !myInitialViewFrame ) {
-      // first case : create a ViewFrame object
-      aViewFrame = dynamic_cast<SUPERVGraph_ViewFrame*>( createGraph() );
-    }
-    else {
-      // second case : get empty initial view frame as new ViewFrame object
-      aViewFrame = myInitialViewFrame;
-      // mkr : PAL8237 : remove first "gag" Main from children
-      // srn: commented as it cases on application exit "X Windows error"
-      //aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() );
+    //SUPERV_Graph aDataFlow = engine->getStreamGraph(anIOR->Value().c_str());
+    aDataFlow = engine->getGraph(anIOR->Value().c_str());
+    if (SUPERV_isNull(aDataFlow)) {
+      QMessageBox::warning(0, tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
+      return;
     }
 
-    if( aViewFrame ) {
-      main = new SUPERVGUI_Main( aViewFrame, application()->desktop(), aDataFlow );
-      registerGraph( aIORName, main );
-      aViewFrame->show();
+    /* ASV: 20.10.04: fix for 6896
+    if (aDataFlow->IsStreamGraph()) {
+      SUPERV_StreamGraph aDataFlowStream = aDataFlow->ToStreamGraph();
+      if (SUPERV_isNull(aDataFlowStream)) {
+        QMessageBox::warning(0, tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
+        return;
+      }
+      aDataFlow = aDataFlowStream;
     }
+    */
+  }
 
-    if ( myInitialViewFrame ) {
-      myInitialViewFrame = 0;
-      myIVFBackgroundColor = QColor();
-    }
+  SUPERVGraph_ViewFrame* aViewFrame;
+  if ( !myInitialViewFrame ) {
+    // first case : create a ViewFrame object
+    aViewFrame = dynamic_cast<SUPERVGraph_ViewFrame*>( createGraph() );
+  }
+  else {
+    // second case : get empty initial view frame as new ViewFrame object
+    aViewFrame = myInitialViewFrame;
+    // mkr : IPAL12991 -->
+    SUPERVGraph_View* view = myInitialViewFrame->getViewWidget();
+    if (view)
+      unregisterGraph(dynamic_cast<SUPERVGUI_Main*>(view));
+    // mkr : IPAL12991 <--
+    // mkr : PAL8237 : remove first "gag" Main from children
+    // srn: commented as it cases on application exit "X Windows error"
+    //aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() );
+    delete view;
+  }
+
+  if ( aViewFrame ) {
+    main = new SUPERVGUI_Main( aViewFrame, application()->desktop(), aDataFlow );
+    registerGraph( aIORName, main );
+    aViewFrame->show();
+  }
+
+  if ( myInitialViewFrame ) {
+    myInitialViewFrame = 0;
+    myIVFBackgroundColor = QColor();
+  }
 }
 
 
@@ -562,8 +573,12 @@ void SUPERVGUI::renameDataflow() {
                 if ( !SUPERV_isNull(aStreamDataFlow) )
                   aStreamDataFlow->SetName( nm.latin1() );
               }
-              else
+              else {
                 aDataFlow->SetName( nm.latin1() );
+              }
+
+              // update "Save" icon and menu state, if dataflow is published
+              SUPERVGUI_Main::setModifiedFlag();  
             }
           }
          // mkr : PAL7037 <--
@@ -707,6 +722,13 @@ bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) {
   else {
     // 2. get empty initial view frame as new ViewFrame object
     aViewFrame = myInitialViewFrame;
+    // mkr : IPAL12991 -->
+    if ( myInitialViewFrame ) {
+      SUPERVGraph_View* view = myInitialViewFrame->getViewWidget();
+      if (view)
+       unregisterGraph(dynamic_cast<SUPERVGUI_Main*>(view));
+    }
+    // mkr : IPAL12991 <--
     // mkr : PAL8237 : remove first "gag" Main from children
     // srn: commented as it cases on application exit "X Windows error"
     //aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() );
@@ -904,7 +926,7 @@ void SUPERVGUI::deleteObject() {
   if (QMessageBox::warning(application()->desktop(),
                            tr("WARNING"),
                            tr("MSG_ASK_DELETE"),
-                           QMessageBox::No, QMessageBox::Yes) != QMessageBox::Yes)
+                           QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes)
     return;
 
   SALOME_ListIteratorOfListIO It( aList );
@@ -1039,12 +1061,8 @@ void SUPERVGUI::fillInterfaceNameMap() {
       //get component
       SALOME_ModuleCatalog::Acomponent_ptr aComponent = (*aModuleCatalog)->GetComponent(aCompList[ind1]);
       if ( aComponent != NULL ) {
-        //get interface list
-        SALOME_ModuleCatalog::ListOfInterfaces_var anIntList = aComponent->GetInterfaceList();
-        for (int ind2 = 0; ind2 < anIntList->length(); ind2++) {
-          const char* anIntName = anIntList[ind2];
-          myInterfaceNameMap.insert(QString(anIntName), QString(aComponent->componentname()));
-        }
+       // mkr : PAL13135
+       myInterfaceNameMap.insert(QString(aComponent->componentusername()), QString(aComponent->componentname()));
       }
     }
   }