NRI : Merge from V1_2.

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 3c5125f57ead2e28337cc953a2f6a572c69dde6b..df2181474e55f00c0d5c1544fcef1452b5296305 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO - SUPERV - v.1.1a"
+PROJECT_NAME           = "SALOME PRO - SUPERV - v.1.2"
 PROJECT_NUMBER         = id#1.0
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx
index f4ce8b91951c254c4535154ff138802a41e6ac31..5158492d978f22422cca46d16327940701772fad 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI.cxx
+++ b/src/SUPERVGUI/SUPERVGUI.cxx
@@ -112,7 +112,7 @@ QAD_StudyFrame* SUPERVGUI::createGraph() {
 void SUPERVGUI::loadEngine(SALOME_NamingService* namingService) {
     Trace("SUPERVGUI::loadEngine")
     SALOME_LifeCycleCORBA LCC(namingService);
-    Engines::Component_var objComponent = LCC.FindOrLoad_Component("SuperVisionContainer", "Supervision");
+    Engines::Component_var objComponent = LCC.FindOrLoad_Component("SuperVisionContainer", "SUPERV");
     if (CORBA::is_nil(objComponent)) {
         QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_LOAD_SUPERV"));
         return;
@@ -120,7 +120,7 @@ void SUPERVGUI::loadEngine(SALOME_NamingService* namingService) {
 
     SUPERV::SuperG_var aSuperVisionComponent;
     aSuperVisionComponent = SUPERV::SuperG::_narrow(objComponent);
-    if (CORBA::is_nil(aSuperVisionComponent)) {
+    if (CORBA::is_nil(aSuperVisionComponent)) { 
         QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_NARROW_SUPERV"));
         return;
     };

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index f5b65bb3a14673717536b8dff31cda43df9550e2..5184f7cc629905b37f65b36f9c0b34bcc8baf7ad 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -175,7 +175,10 @@ void SUPERVGUI_Main::init(QAD_Desktop* theDesktop) {
         father = builder->NewComponent(STUDY_SUPERVISION);
        anAttr = builder->FindOrCreateAttribute(father, "AttributeName");
        aName = SALOMEDS::AttributeName::_narrow(anAttr);
-       aName->SetValue("Supervision");
+       //      aName->SetValue("Supervision");
+       aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
+       
+
        
        anAttr = builder->FindOrCreateAttribute(father, "AttributePixMap");
        aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);