From 890b42a5d4d9327045b9d2f141401eb64e07097c Mon Sep 17 00:00:00 2001
From: vdwalts <vdwalts>
Date: Wed, 2 Nov 2016 18:08:58 +0100
Subject: [PATCH] FEM: Add split input writer option to preferences dialog GUI

---
 src/Mod/Fem/Gui/DlgSettingsFemCcx.ui     | 128 ++++++++++++-----------
 src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp |   2 +
 src/Mod/Fem/_FemSolverCalculix.py        |   4 +
 3 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index 708550139..25bc8b147 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -6,16 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>555</width>
-    <height>652</height>
+    <width>536</width>
+    <height>752</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>CalculiX</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QGroupBox" name="gb_01_ccx_param">
        <property name="sizePolicy">
@@ -33,26 +33,33 @@
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="sizeConstraint">
-         <enum>QLayout::SetNoConstraint</enum>
-        </property>
-        <item>
-         <layout class="QGridLayout" name="gl_ccx">
-          <item row="5" column="2">
-           <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
-            <property name="enabled">
-             <bool>false</bool>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_ccx_binary_std">
+            <property name="text">
+             <string>CalculiX binary</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
+            <property name="text">
+             <string>Use standard ccx binary path</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
             </property>
             <property name="prefEntry" stdset="0">
-             <cstring>ExternalEditorPath</cstring>
+             <cstring>UseStandardCcxLocation</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="l_ccx_binary_path">
             <property name="enabled">
              <bool>false</bool>
@@ -68,7 +75,7 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
+          <item row="1" column="1">
            <widget class="Gui::PrefFileChooser" name="fc_ccx_binary_path" native="true">
             <property name="enabled">
              <bool>false</bool>
@@ -108,7 +115,14 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
+          <item row="2" column="0">
+           <widget class="QLabel" name="l_editor">
+            <property name="text">
+             <string>Editor</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_int_editor">
             <property name="text">
              <string>Use internal editor for .inp files</string>
@@ -125,13 +139,6 @@
            </widget>
           </item>
           <item row="3" column="0">
-           <widget class="QLabel" name="l_editor">
-            <property name="text">
-             <string>Editor</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
            <widget class="QLabel" name="l_ext_editor">
             <property name="enabled">
              <bool>false</bool>
@@ -147,26 +154,42 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
-            <property name="text">
-             <string>Use standard ccx binary path</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
+          <item row="3" column="1">
+           <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
             <property name="prefEntry" stdset="0">
-             <cstring>UseStandardCcxLocation</cstring>
+             <cstring>ExternalEditorPath</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="l_ccx_binary_std">
+          <item row="4" column="0">
+           <widget class="QLabel" name="l_editor_2">
             <property name="text">
-             <string>CalculiX binary</string>
+             <string>Split .inp</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_split_inp_writer">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="text">
+             <string>Split writing of  .inp</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>SplitInputWriter</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
@@ -340,13 +363,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="l_non_lin_geom">
-            <property name="text">
-             <string>Non-linear geometry</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="l_ccx_numcpu">
             <property name="text">
@@ -354,6 +370,13 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="l_non_lin_geom">
+            <property name="text">
+             <string>Non-linear geometry</string>
+            </property>
+           </widget>
+          </item>
           <item row="4" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_use_iterations_param">
             <property name="text">
@@ -509,8 +532,8 @@
        <property name="title">
         <string>Frequency defaults</string>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
          <layout class="QGridLayout" name="gl_freuq">
           <item row="1" column="1">
            <widget class="Gui::PrefSpinBox" name="sb_eigenmode_number">
@@ -617,19 +640,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
index 0bf52e32e..872a2d64d 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
@@ -69,6 +69,8 @@ void DlgSettingsFemCcxImp::saveSettings()
     fc_ext_editor->onSave();
     cb_ccx_binary_std->onSave();
     fc_ccx_binary_path->onSave();
+    cb_split_inp_writer->onSave();
+    cb_split_inp_writer->onRestore();
 }
 
 void DlgSettingsFemCcxImp::loadSettings()
diff --git a/src/Mod/Fem/_FemSolverCalculix.py b/src/Mod/Fem/_FemSolverCalculix.py
index 954cd690a..f725a3c06 100644
--- a/src/Mod/Fem/_FemSolverCalculix.py
+++ b/src/Mod/Fem/_FemSolverCalculix.py
@@ -97,6 +97,10 @@ class _FemSolverCalculix():
         use_non_ccx_iterations_param = ccx_prefs.GetInt("UseNonCcxIterationParam", False)
         obj.IterationsControlParameterTimeUse = use_non_ccx_iterations_param
 
+        obj.addProperty("App::PropertyBool", "SplitInputWriter", "Fem", "Split writing of ccx input file")
+        split = ccx_prefs.GetBool("SplitInputWriter", False)
+        obj.SplitInputWriter = split
+
         ccx_default_time_incrementation_control_parameter = {
             # iteration parameter
             'I_0': 4,