From: nri <nri@opencascade.com>
Date: Wed, 16 Jul 2003 11:39:04 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: V_02092003~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9635da77b73ee96a34309274718134a8e44240ea;p=modules%2Fsuperv.git

NRI : Merge from V1_2.
---

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 3c5125f..df21814 100755
--- 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 f4ce8b9..5158492 100644
--- 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 f5b65bb..5184f7c 100644
--- 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);