Merge branch 'occ/shaper2smesh'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI.cxx

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index c5404494a9bb390a259e578a6e29e0d0fe70f7e9..ba08d51011a880d5e2c693412a918a8823586cb7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -5115,9 +5115,9 @@ bool SMESHGUI::activateModule( SUIT_Study* study )
   if ( aDesk ) {
     QList<SUIT_ViewWindow*> wndList = aDesk->windows();
     SUIT_ViewWindow* wnd;
   if ( aDesk ) {
     QList<SUIT_ViewWindow*> wndList = aDesk->windows();
     SUIT_ViewWindow* wnd;

-    foreach(wnd, wndList)
+    foreach ( wnd, wndList )

     {
     {

-      connectView(wnd);
+      connectView( wnd );

 
       // remove actors whose objects are removed in GetSMESHGen()->UpdateStudy()
       SMESH::UpdateActorsAfterUpdateStudy(wnd);
 
       // remove actors whose objects are removed in GetSMESHGen()->UpdateStudy()
       SMESH::UpdateActorsAfterUpdateStudy(wnd);


@@ -5404,6 +5404,7 @@ void SMESHGUI::createPreferences()
                              "SMESH", "nb_segments_per_edge" );
   setPreferenceProperty( nbSeg, "min", 1 );
   setPreferenceProperty( nbSeg, "max", 10000000 );
                              "SMESH", "nb_segments_per_edge" );
   setPreferenceProperty( nbSeg, "min", 1 );
   setPreferenceProperty( nbSeg, "max", 10000000 );

+  addPreference( tr( "PREF_USE_MESHGEMS_HYPOSET" ), segGroup, LightApp_Preferences::Bool, "SMESH", "use-meshgems-hypo-sets" );

 
   int loadGroup = addPreference( tr( "SMESH_PREF_MESH_LOADING" ), genTab );
   addPreference( tr( "PREF_FORGET_MESH_AT_HYP_MODIF" ), loadGroup, LightApp_Preferences::Bool,
 
   int loadGroup = addPreference( tr( "SMESH_PREF_MESH_LOADING" ), genTab );
   addPreference( tr( "PREF_FORGET_MESH_AT_HYP_MODIF" ), loadGroup, LightApp_Preferences::Bool,