Study name is missing from SALOME title

when SALOME just launched

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index ba820d3063020633f3d21311935d3be8d3d64aab..f7380a299a55e697e6210d667cee9a038e84a7e3 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -128,7 +128,7 @@ protected:
 protected:
   virtual bool        openDataModel  ( const QString&, CAM_DataModel* );
   virtual CAM_ModuleObject* createModuleObject( LightApp_DataModel* theDataModel, 
-                                               SUIT_DataObject* theParent ) const;
+                                                SUIT_DataObject* theParent ) const;
 
 signals:
   void                saved  ( SUIT_Study* );

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 8f3b4673a8b4f13db14a4a916187420851e49261..a902c11e1bd26eb2cf754b919d9ea1d52001e004 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -432,7 +432,7 @@ QString SalomeApp_Study::studyName() const
   // it can be changed outside of GUI
   // TEMPORARILY SOLUTION: better to be implemented with help of SALOMEDS observers
   if ( studyDS() ) {
-    QString newName = QString::fromUtf8(studyDS()->URL().c_str());
+    QString newName = QString::fromUtf8(studyDS()->Name().c_str());
     if ( LightApp_Study::studyName() != newName ) {
       SalomeApp_Study* that = const_cast<SalomeApp_Study*>( this );
       that->setStudyName( newName );

diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 2284df8dbff6f083a71a9584c6c6bb737d19ff50..169265acbd72574e8cff03faa45bfb8a8e096f4b 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -104,7 +104,7 @@ protected:
   virtual bool        openDataModel( const QString&, CAM_DataModel* );
 
   virtual CAM_ModuleObject* createModuleObject( LightApp_DataModel* theDataModel, 
-                                               SUIT_DataObject* theParent ) const;
+                                                SUIT_DataObject* theParent ) const;
 protected slots:
   virtual void        updateModelRoot( const CAM_DataModel* );
 #ifndef DISABLE_PYCONSOLE