Merge branch 'V7_7_BR' into hydro/imps_2015

diff --git a/doc/salome/gui/input/setting_preferences.doc b/doc/salome/gui/input/setting_preferences.doc
index b1c6bea108e00e004b51986af5093012fcb8af8b..c953e355c696eaa7633b112a9f2b03e567734cb3 100644 (file)
--- a/doc/salome/gui/input/setting_preferences.doc
+++ b/doc/salome/gui/input/setting_preferences.doc
@@ -59,6 +59,9 @@ the whole GUI SALOME session.
     the SALOME platform. 
   - <b>ASCII save</b> - if checked in, your study will be saved in
     ASCII format file (or files).
+  - <b>Automatic loading of light modules when opening study</b> -  if checked in, 
+    Light Modules of the current study will be automatically loaded at the next study
+    opening, allowing completion of object browser.
   - <b>Store positions of windows</b> -  if checked in, positions of windows
     will be saved in a special file at the end of the current session and
     then restored for a new session.

diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index ac4065ec22dee34796f9218494ee049c28b0d5d8..b4746ba97aed1e4de0a6b2bc8b92b68e44089651 100755 (executable)
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -33,7 +33,7 @@ BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = NO
 ABBREVIATE_BRIEF       = 
 ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = YES
+INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@ @PROJECT_BINARY_DIR@
 STRIP_FROM_INC_PATH    = 
@@ -41,12 +41,12 @@ SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
 DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = NO
+INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 5
 ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = YES
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
 BUILTIN_STL_SUPPORT    = @DOXYGEN_SUPPORT_STL@
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
@@ -58,9 +58,9 @@ EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
+EXTRACT_LOCAL_METHODS  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
 HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = YES
@@ -68,16 +68,16 @@ CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
 INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
+SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
+SORT_BY_SCOPE_NAME     = YES
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 25
-SHOW_USED_FILES        = NO
+SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = NO
 FILE_VERSION_FILTER    = 
 
@@ -106,7 +106,7 @@ EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = YES
 IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/images
 INPUT_FILTER           = 
@@ -117,9 +117,9 @@ FILTER_SOURCE_FILES    = YES
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = YES
 STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
@@ -137,9 +137,9 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = @CMAKE_CURRENT_BINARY_DIR@/static/header.html
-HTML_FOOTER            = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html
-HTML_EXTRA_STYLESHEET  = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_EXTRA_STYLESHEET  = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 
@@ -237,12 +237,12 @@ CLASS_DIAGRAMS         = YES
 HIDE_UNDOC_RELATIONS   = NO
 HAVE_DOT               = YES
 CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = NO
-GROUP_GRAPHS           = NO
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 TEMPLATE_RELATIONS     = YES
 INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = NO
+INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
@@ -255,7 +255,7 @@ MAX_DOT_GRAPH_HEIGHT   = 1200
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = NO
+GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index f50576ea8d68e4be8a404d2945d9a90dcf2dbc87..fe0ef5cfac1f0b7ae88ba3f83b56382e766fae41 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -2238,6 +2238,7 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref )
   // .... -> ascii save mode
   pref->addPreference( tr( "PREF_ASCII_FILE" ), studyGroup, LightApp_Preferences::Bool, "Study", "ascii_file" );
   // .... -> store windows geometry
+  pref->addPreference( tr( "PREF_LOAD_LIGHT" ), studyGroup, LightApp_Preferences::Bool, "Study", "autoload_light_modules" );
   pref->addPreference( tr( "PREF_STORE_POS" ),  studyGroup, LightApp_Preferences::Bool, "Study", "store_positions" );
   pref->addPreference( "", studyGroup, LightApp_Preferences::Space );
   pref->addPreference( tr( "PREF_STORE_TOOL_POS" ),  studyGroup, LightApp_Preferences::Bool, "Study", "store_tool_positions" );

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index e8a0858e162a231fca81dced744f059a9ebdd555..38ddb3ccb7df2e5c3cc97883774e91f8c28d738f 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.xml
@@ -125,6 +125,7 @@
   </section>
   <section name="Study">
     <!-- General study settings -->
+    <parameter name="autoload_light_modules"    value="true" />
     <parameter name="store_positions"    value="true" />
     <parameter name="store_tool_positions"     value="true" />
     <parameter name="auto_save_interval" value="0" />

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index 9876572466807af52a3c7475865ce77ffb80aee1..3129ba0cf8afb6deca2e2a655a3081b245a7d8a1 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -155,6 +155,10 @@ The changes will be applied on the next application session.</translation>
         <source>PREF_GROUP_VTKVIEWER</source>
         <translation>VTK 3D Viewer</translation>
     </message>
+    <message>
+        <source>PREF_LOAD_LIGHT</source>
+        <translation>Automatic loading of light modules when opening study</translation>
+    </message>
     <message>
         <source>PREF_STORE_POS</source>
         <translation>Store positions of windows</translation>

diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
index 526ecd7d27362cce15c0e28db3b06d94943c863d..33cac5ea4cded709b91d814ee0b56367453a0cd5 100755 (executable)
--- a/src/LightApp/resources/LightApp_msg_fr.ts
+++ b/src/LightApp/resources/LightApp_msg_fr.ts
@@ -155,6 +155,10 @@ Les modifications seront appliquées à la prochaine session.</translation>
         <source>PREF_GROUP_VTKVIEWER</source>
         <translation>Scène VTK 3D</translation>
     </message>
+    <message>
+        <source>PREF_LOAD_LIGHT</source>
+        <translation>Chargement automatique des modules Light à l'ouverture d'étude</translation>
+    </message>
     <message>
         <source>PREF_STORE_POS</source>
         <translation>Enregistrer la position des fenêtres</translation>

diff --git a/src/LightApp/resources/LightApp_msg_ja.ts b/src/LightApp/resources/LightApp_msg_ja.ts
index 29a70c646d8dd8b8e4957b2eb89a2504175c4285..453155bad74a5508bf9cb929453b80ca3e88ea79 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_ja.ts
+++ b/src/LightApp/resources/LightApp_msg_ja.ts
@@ -155,6 +155,10 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
       <source>PREF_GROUP_VTKVIEWER</source>
       <translation>VTK 3D Viewer</translation>
     </message>
+    <message>
+      <source>PREF_LOAD_LIGHT</source>
+      <translation>Automatic loading of light modules when opening study</translation>
+    </message>
     <message>
       <source>PREF_STORE_POS</source>
       <translation>ウィンドウの位置を保存</translation>

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index a0e96792bba525452df09cffa38363629dd3dc4c..0852d0b29ee64b69ac6c25019e3e6871f7e8f9c7 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -1174,6 +1174,8 @@ void OCCViewer_ViewWindow::createActions()
     return;
 
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  if( !aResMgr )
+    return;
 
   QtxAction* aAction;
 
@@ -2111,7 +2113,7 @@ void OCCViewer_ViewWindow::onSwitchInteractionStyle( bool on )
 
   // update action state if method is called outside
   QtxAction* a = dynamic_cast<QtxAction*>( toolMgr()->action( SwitchInteractionStyleId ) );
-  if ( a->isChecked() != on )
+  if ( a && a->isChecked() != on )
     a->setChecked( on );
 }
 
@@ -2124,7 +2126,7 @@ void OCCViewer_ViewWindow::onSwitchZoomingStyle( bool on )
 
   // update action state if method is called outside
   QtxAction* a = dynamic_cast<QtxAction*>( toolMgr()->action( SwitchZoomingStyleId ) );
-  if ( a->isChecked() != on )
+  if ( a && a->isChecked() != on )
     a->setChecked( on );
 }
 

diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a4b004c096874ea58e63dce6b3c91119e8f4ca59..a1183d641e66d6d2ae5ca2a887a710f41826ba5f 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -26,7 +26,8 @@
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Application.h"
 
-//#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 #include <SUIT_ViewManager.h>
 #include <SUIT_ViewWindow.h>
 #include <QtxWorkstack.h>
@@ -174,13 +175,19 @@ int SalomeApp_VisualState::storeState()
   myApp->modules( mlist );
   QListIterator<CAM_Module*> itM( mlist );
   CAM_Module* module = 0;
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  bool loadLight = aResMgr->booleanValue( "Study", "autoload_light_modules", true );
+
   while ( itM.hasNext() ) {
     module = itM.next();
     if ( !module ) continue;
 
-    if ( SalomeApp_Module* sModule = dynamic_cast<SalomeApp_Module*>( module ) ) {
-      ip->append( "AP_MODULES_LIST", sModule->moduleName().toStdString() );
-      sModule->storeVisualParameters( savePoint );
+
+    if ( LightApp_Module* lModule = dynamic_cast<LightApp_Module*>( module ) ) {
+      if (loadLight)
+        ip->append( "AP_MODULES_LIST", lModule->moduleName().toStdString() );
+      if ( SalomeApp_Module* sModule = dynamic_cast<SalomeApp_Module*>( module ) )
+        sModule->storeVisualParameters( savePoint );
     }
   }
 

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index 20c6b4172a6352f83c3c9231b1d148265344534e..3fd82cba880d8f4f8a58018ffd3f05d05d3d40ea 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/resources/SalomeApp.xml
@@ -54,6 +54,7 @@
   </section>
   <section name="Study">
     <!-- General study settings -->
+    <parameter name="autoload_light_modules"     value="true" />
     <parameter name="store_positions"     value="true" />
     <parameter name="store_tool_positions"     value="true" />
     <parameter name="store_visual_state"  value="false" />

diff --git a/src/ViewerTools/ViewerTools_DialogBase.cxx b/src/ViewerTools/ViewerTools_DialogBase.cxx
index 8471a1e53717715bd17a785d87b2f47caad52029..c3114d8a1f7c295ac6b30b07892de51559c2f5d6 100644 (file)
--- a/src/ViewerTools/ViewerTools_DialogBase.cxx
+++ b/src/ViewerTools/ViewerTools_DialogBase.cxx
@@ -57,7 +57,7 @@ void
 ViewerTools_DialogBase
 ::onParentShow()
 {
-  if(myAction->isChecked())
+  if(myAction && myAction->isChecked())
     show();
   else
     hide();