added new GlueFaces feature

[modules/shaper.git] / src / ModuleBase / ModuleBase_Preferences.cpp

diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp
index d8d1c417a238bac26a17596c3a36de34feaedb43..ad53e4475b681d44c1360111f3b3c6ed063c5ffe 100644 (file)
--- a/src/ModuleBase/ModuleBase_Preferences.cpp
+++ b/src/ModuleBase/ModuleBase_Preferences.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2021  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -33,6 +33,10 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 
+#ifdef WIN32
+#pragma warning(disable : 4456) // for nested foreach
+#endif
+
 const QString ModuleBase_Preferences::VIEWER_SECTION = "Viewer";
 const QString ModuleBase_Preferences::MENU_SECTION = "Menu";
 const QString ModuleBase_Preferences::GENERAL_SECTION = "General";
@@ -156,57 +160,64 @@ void ModuleBase_Preferences::resetConfigPropPreferences(SUIT_PreferenceMgr* theP
 void ModuleBase_Preferences::createGeneralTab(ModuleBase_IPrefMgr* thePref, int thePageId)
 {
   int generalTab = thePref->addPreference(QObject::tr("General"), thePageId,
-                                          SUIT_PreferenceMgr::Auto, QString(), QString());
+    SUIT_PreferenceMgr::Auto, QString(), QString());
   thePref->setItemProperty("columns", 2, generalTab);
 
   QStringList actItemList;
   actItemList << QObject::tr("Last part")
-              << QObject::tr("All parts")
-              << QObject::tr("No activation");
+    << QObject::tr("All parts")
+    << QObject::tr("No activation");
 
   QList<QVariant> actIdList;
   actIdList << 0 << 1 << 2;
 
-  // Group related to opening a study
-  int group = thePref->addPreference(QObject::tr("Opening a study"), generalTab,
+  // Group related to creation of a study
+  int group = thePref->addPreference(QObject::tr("Creation a study"), generalTab,
                                      SUIT_PreferenceMgr::Auto, QString(), QString());
 
-  int actId = thePref->addPreference(QObject::tr("Activate"), group, SUIT_PreferenceMgr::Selector,
-                                     ModuleBase_Preferences::GENERAL_SECTION,
-                                     "part_activation_study");
-  thePref->setItemProperty("strings", actItemList, actId);
-  thePref->setItemProperty("indexes", actIdList, actId);
+  int actId = thePref->addPreference(QObject::tr("Create new part"), group, SUIT_PreferenceMgr::Bool,
+                                     ModuleBase_Preferences::GENERAL_SECTION, "create_init_part");
+
+  // Group related to running a python script
+  group = thePref->addPreference(QObject::tr("Launching a python script"), generalTab,
+                                 SUIT_PreferenceMgr::Auto, QString(), QString());
 
   QStringList visuItemList;
-  visuItemList << QObject::tr("As stored in HDF")
-               << QObject::tr("Last item in each folder")
+  visuItemList << QObject::tr("Last item in each folder")
                << QObject::tr("All items")
                << QObject::tr("No visualization");
 
   QList<QVariant> visuIdList;
-  visuIdList << 0 << 1 << 2 << 3;
+  visuIdList << 0 << 1 << 2;
 
   int visuId = thePref->addPreference(QObject::tr("Display"), group, SUIT_PreferenceMgr::Selector,
                                       ModuleBase_Preferences::GENERAL_SECTION,
-                                      "part_visualization_study");
+                                      "part_visualization_script");
   thePref->setItemProperty("strings", visuItemList, visuId);
   thePref->setItemProperty("indexes", visuIdList, visuId);
 
-  // Group related to running a python script
-  group = thePref->addPreference(QObject::tr("Launching a python script"), generalTab,
+  // Group related to opening a study
+  group = thePref->addPreference(QObject::tr("Opening a study"), generalTab,
                                  SUIT_PreferenceMgr::Auto, QString(), QString());
 
+  actId = thePref->addPreference(QObject::tr("Activate"), group, SUIT_PreferenceMgr::Selector,
+                                 ModuleBase_Preferences::GENERAL_SECTION,
+                                 "part_activation_study");
+  thePref->setItemProperty("strings", actItemList, actId);
+  thePref->setItemProperty("indexes", actIdList, actId);
+
   visuItemList.clear();
-  visuItemList << QObject::tr("Last item in each folder")
+  visuItemList << QObject::tr("As stored in HDF")
+               << QObject::tr("Last item in each folder")
                << QObject::tr("All items")
                << QObject::tr("No visualization");
 
   visuIdList.clear();
-  visuIdList << 0 << 1 << 2;
+  visuIdList << 0 << 1 << 2 << 3;
 
   visuId = thePref->addPreference(QObject::tr("Display"), group, SUIT_PreferenceMgr::Selector,
                                   ModuleBase_Preferences::GENERAL_SECTION,
-                                  "part_visualization_script");
+                                  "part_visualization_study");
   thePref->setItemProperty("strings", visuItemList, visuId);
   thePref->setItemProperty("indexes", visuIdList, visuId);
 }
@@ -452,32 +463,26 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId)
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_x_position");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 1, aItem);
-
   aItem = myPreferences->addItem(tr("Y position"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_y_position");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 1, aItem);
-
   aItem = myPreferences->addItem(tr("Width"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_width");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 1, aItem);
-
   aItem = myPreferences->addItem(tr("Height"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_height");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 1, aItem);
-
   aItem = myPreferences->addItem(tr("Intervals number"), colorScaleGroup,
     SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_nb_intervals");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 100, aItem);
-
   aItem = myPreferences->addItem(tr("Text height"), colorScaleGroup,
     SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_height");
   myPreferences->setItemProperty("min", 0, aItem);
   myPreferences->setItemProperty("max", 100, aItem);
-
   aItem = myPreferences->addItem(tr("Text color"), colorScaleGroup,
     SUIT_PreferenceMgr::Color, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_color");
 }