[TD]Add welding symbol directory preference

FreeCAD · Aug 22, 2019 · 5a3de6c · 5a3de6c
1 parent f015505
commit 5a3de6c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 45 deletions.
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -454,6 +454,23 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateFile</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_11">
+          <property name="text">
+           <string>Welding Directory</string>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -468,7 +485,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2">
+        <item row="1" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
           <property name="mode">
            <enum>Gui::FileChooser::Directory</enum>
@@ -495,17 +512,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
-          <property name="prefEntry" stdset="0">
-           <cstring>TemplateFile</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Files</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
+        <item row="2" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
           <property name="toolTip">
            <string>Location of default svg/png fill file</string>
@@ -518,14 +525,14 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="5" column="0">
          <widget class="QLabel" name="label_9">
           <property name="text">
            <string>PAT File</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
+        <item row="5" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
           <property name="toolTip">
            <string>Default location for PAT file</string>
@@ -538,7 +545,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="3" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
           <property name="toolTip">
            <string>Alternate Line Group file</string>
@@ -551,6 +558,22 @@
           </property>
          </widget>
         </item>
+        <item row="4" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_Welding">
+          <property name="toolTip">
+           <string>Default directory for welding symbols</string>
+          </property>
+          <property name="mode">
+           <enum>Gui::FileChooser::Directory</enum>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>WeldingDir</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>

diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
@@ -68,6 +68,8 @@ void DlgPrefsTechDrawImp::saveSettings()
     pfc_DefDir->onSave();
     pfc_HatchFile->onSave();
     pfc_LineGroup->onSave();
+    pfc_Welding->onSave();
+
     pfc_FilePattern->onSave();
     le_NamePattern->onSave();
 }
@@ -97,6 +99,7 @@ void DlgPrefsTechDrawImp::loadSettings()
     pfc_DefDir->onRestore();
     pfc_HatchFile->onRestore();
     pfc_LineGroup->onRestore();
+    pfc_Welding->onRestore();
 
     pfc_FilePattern->onRestore();
     le_NamePattern->onRestore();

diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -69,6 +69,8 @@ void SymbolChooser::setUiPrimary()
         loadSymbolNames(m_symbolDir);
     } else {
         std::string resourceDir = App::Application::getResourceDir();
+        std::string defPath = "Mod/TechDraw/Symbols/Welding/AWS/";
+        resourceDir = resourceDir + defPath; 
         QString defDir = QString::fromUtf8(resourceDir.c_str());
         ui->fcSymbolDir->setFileName(defDir);
         loadSymbolNames(defDir);

diff --git a/src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg b/src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg