From 6361cb5c33cfab066e8797736c4fe398690914af Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 1 Aug 2018 16:32:47 +0300 Subject: [PATCH] Study name is missing from SALOME title when SALOME just launched --- src/LightApp/LightApp_Study.h | 2 +- src/SalomeApp/SalomeApp_Study.cxx | 2 +- src/SalomeApp/SalomeApp_Study.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h index ba820d306..f7380a299 100644 --- 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 8f3b4673a..a902c11e1 100644 --- 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( this ); that->setStudyName( newName ); diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h index 2284df8db..169265acb 100644 --- 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 -- 2.39.2