CTH9911

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index f788999e8fd24eda9b43765fd6239e1774fb64dc..12bc204fe23c570ab26b8709707a90ad6ab29321 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1745,6 +1745,9 @@ void LightApp_Application::currentViewManagers( QStringList& lst ) const
 /*!Update windows.*/
 void LightApp_Application::updateWindows()
 {
+  if ( !activeStudy() )
+    return;
+
   QMap<int, int> winMap;
   currentWindows( winMap );
 
@@ -1928,3 +1931,18 @@ void LightApp_Application::onRenameWindow()
   if( ok && !name.isEmpty() )
     w->setCaption( name );
 }
+
+/*! default name for an active study */
+void LightApp_Application::setDefaultStudyName( const QString& theName )
+{
+  QStringList anInfoList;
+  modules( anInfoList, false );
+
+  LightApp_Study* aStudy = (LightApp_Study*)activeStudy();
+  if( anInfoList.count() == 1 && // to avoid a conflict between different modules
+      !aStudy->isSaved() )
+  {
+    aStudy->setStudyName( theName );
+    updateDesktopTitle();
+  }
+}

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 26f9c30c99222bc950f696077591ac5985183fdb..a3d10532b7471fe33f3a1e760581c4fa6f840870 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -96,6 +96,8 @@ public:
 
   SUIT_Accel*                         accel() const;
 
+  void                                setDefaultStudyName( const QString& theName );
+
   static int                          studyId();
 
 signals:

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index 1280fd99a4d3eeb24d99c0c09193b2df21810397..2e0ac32260b04ab779b93fc8e28833fd673b62fe 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -16,76 +16,78 @@
 //
 // See http://www.salome-platform.org/
 //
-#ifndef LIGHTAPP_STUDY_H\r
-#define LIGHTAPP_STUDY_H\r
-\r
-#include <LightApp.h>\r
-#include <LightApp_Driver.h>\r
-\r
-#include <CAM_Study.h>\r
-#include <CAM_DataModel.h>\r
-#include <SUIT_Study.h>\r
-\r
-#include "string"\r
-#include "vector"\r
-\r
-class SUIT_Application;\r
-class CAM_DataModel;\r
-\r
-class LIGHTAPP_EXPORT LightApp_Study : public CAM_Study\r
-{\r
-  Q_OBJECT\r
-\r
-public:\r
-  LightApp_Study( SUIT_Application* );\r
-  virtual ~LightApp_Study();\r
-\r
-  virtual void        createDocument();\r
-  virtual bool        openDocument( const QString& );\r
-  virtual bool        loadDocument( const QString& ); \r
-\r
-  virtual bool        saveDocument();\r
-  virtual bool        saveDocumentAs( const QString& );\r
-\r
-  virtual void        closeDocument(bool permanently = true);\r
-\r
-  virtual bool        isSaved()  const;\r
-  virtual bool        isModified() const;\r
-\r
-  virtual void        addComponent   ( const CAM_DataModel* dm);\r
-\r
-  virtual std::string GetTmpDir      ( const char* theURL, const bool  isMultiFile );\r
-\r
-  virtual QString     componentDataType( const QString& ) const;\r
-  virtual QString     referencedToEntry( const QString& ) const;\r
-  virtual bool        isComponent( const QString& ) const;\r
-  virtual void        children( const QString&, QStringList& ) const;\r
-  virtual void        components( QStringList& ) const;\r
-\r
-protected:\r
-  virtual void        saveModuleData ( QString theModuleName, QStringList theListOfFiles );\r
-  virtual void        openModuleData ( QString theModuleName, QStringList& theListOfFiles );\r
-  virtual bool        saveStudyData  ( const QString& theFileName );\r
-  virtual bool        openStudyData  ( const QString& theFileName );\r
-\r
-  virtual std::vector<std::string> GetListOfFiles ( const char* theModuleName ) const;\r
-  virtual void        SetListOfFiles ( const char* theModuleName,\r
-                                       const std::vector<std::string> theListOfFiles );\r
-\r
-  virtual void        RemoveTemporaryFiles ( const char* theModuleName, const bool isMultiFile ) const;\r
-\r
-protected:\r
-  virtual bool        openDataModel  ( const QString&, CAM_DataModel* );\r
-\r
-signals:\r
-  void                saved  ( SUIT_Study* );\r
-  void                opened ( SUIT_Study* );\r
-  void                closed ( SUIT_Study* );\r
-  void                created( SUIT_Study* );\r
-\r
-\r
-private:\r
-  LightApp_Driver*    myDriver;\r
-};\r
-\r
-#endif \r
+#ifndef LIGHTAPP_STUDY_H
+#define LIGHTAPP_STUDY_H
+
+#include <LightApp.h>
+#include <LightApp_Driver.h>
+
+#include <CAM_Study.h>
+#include <CAM_DataModel.h>
+#include <SUIT_Study.h>
+
+#include "string"
+#include "vector"
+
+class SUIT_Application;
+class CAM_DataModel;
+
+class LIGHTAPP_EXPORT LightApp_Study : public CAM_Study
+{
+  Q_OBJECT
+
+public:
+  LightApp_Study( SUIT_Application* );
+  virtual ~LightApp_Study();
+
+  virtual void        createDocument();
+  virtual bool        openDocument( const QString& );
+  virtual bool        loadDocument( const QString& ); 
+
+  virtual bool        saveDocument();
+  virtual bool        saveDocumentAs( const QString& );
+
+  virtual void        closeDocument(bool permanently = true);
+
+  virtual bool        isSaved()  const;
+  virtual bool        isModified() const;
+
+  virtual void        addComponent   ( const CAM_DataModel* dm);
+
+  virtual std::string GetTmpDir      ( const char* theURL, const bool  isMultiFile );
+
+  virtual QString     componentDataType( const QString& ) const;
+  virtual QString     referencedToEntry( const QString& ) const;
+  virtual bool        isComponent( const QString& ) const;
+  virtual void        children( const QString&, QStringList& ) const;
+  virtual void        components( QStringList& ) const;
+
+protected:
+  virtual void        saveModuleData ( QString theModuleName, QStringList theListOfFiles );
+  virtual void        openModuleData ( QString theModuleName, QStringList& theListOfFiles );
+  virtual bool        saveStudyData  ( const QString& theFileName );
+  virtual bool        openStudyData  ( const QString& theFileName );
+
+  virtual std::vector<std::string> GetListOfFiles ( const char* theModuleName ) const;
+  virtual void        SetListOfFiles ( const char* theModuleName,
+                                       const std::vector<std::string> theListOfFiles );
+
+  virtual void        RemoveTemporaryFiles ( const char* theModuleName, const bool isMultiFile ) const;
+
+protected:
+  virtual bool        openDataModel  ( const QString&, CAM_DataModel* );
+
+signals:
+  void                saved  ( SUIT_Study* );
+  void                opened ( SUIT_Study* );
+  void                closed ( SUIT_Study* );
+  void                created( SUIT_Study* );
+
+
+private:
+  LightApp_Driver*    myDriver;
+
+  friend class LightApp_Application;
+};
+
+#endif