Merge branch 'master' into flake8_config

FreeCAD · May 28, 2020 · 64b9186 · 64b9186
2 parents cad6eb2 + 99a99f4
commit 64b9186
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
@@ -240,6 +240,9 @@
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
            <widget class="Gui::PrefCheckBox" name="cb_overwrite_solver_working_directory">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
@@ -272,8 +275,11 @@
          <layout class="QGridLayout" name="gl_2">
           <item row="0" column="0">
            <widget class="Gui::PrefCheckBox" name="cb_analysis_group_meshing">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
-             <string>Create mesh groups for analysis reference shapes</string>
+             <string>Create mesh groups for analysis reference shapes (highly experimental)</string>
             </property>
             <property name="checked">
              <bool>true</bool>

diff --git a/src/Mod/Fem/femmesh/gmshtools.py b/src/Mod/Fem/femmesh/gmshtools.py
@@ -338,7 +338,10 @@ def get_group_data(self):
             "User parameter:BaseApp/Preferences/Mod/Fem/General"
         ).GetBool("AnalysisGroupMeshing", False)
         if self.analysis and analysis_group_meshing:
-            Console.PrintMessage("  Group meshing for analysis.\n")
+            Console.PrintWarning(
+                "  Group meshing for analysis is set to true in FEM General Preferences. "
+                "Are you really sure about this? You could run into trouble!\n"
+            )
             self.group_nodes_export = True
             new_group_elements = meshtools.get_analysis_group_elements(
                 self.analysis,