Merge branch 'terminal_strip'

* terminal_strip:
  Minor fix : wrong variable name

.github/workflows/publish-edge-snap.yml

@@ -0,0 +1,19 @@
+name: Publish Edge Snap
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish_amd64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: snapcore/action-build@v1
+      id: build
+    - uses: snapcore/action-publish@v1
+      with:
+        store_login: ${{ secrets.STORE_LOGIN }}
+        snap: ${{ steps.build.outputs.snap }}
+        release: edge

README.md

@@ -154,6 +154,52 @@ Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format im
 *   conductors num can be exported to csv file.
 *   ***
 
+Nomenclature
+
+A new nomenclature tool appears in the menu: project -> Add a nomenclature.
+The nomenclature is presented in the form of a configurable table separated into two parts: the display (the form) and the content (the background).  
+- Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.  
+- Content: the information to display in the table and the order in which it should be displayed.  
+
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
+
+In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.  
+
+Behind the scenes, an SQLite database does the work, so setting up the content is nothing more or less than an SQL query created using a dialog (screenshot by right).  
+The SQL query is configured as follows (from top to bottom in the screenshot):  
+- “Available information”: the information to display;  
+- "Filter": filter the information (is not empty, is empty, contains, does not contain, is equal to, is not equal to) only one filter can be applied per information, it is not possible combine several;  
+- "Type of elements": allows you to filter on what type of element you want to obtain information.  
+
+At the bottom, a checkmark "SQL query" allows you to edit a personalized query, if the basic options are not sufficient.  
+
+When a nomenclature is too large to be contained in a single folio, it is possible to separate it on several folios, the tables of each folio are then linked together. When creating a nomenclature, this option is activated by default, which has the effect of adding the necessary number of folios, adding a table in each of them and linking them together.  
+
+Finally two buttons are available in the property panel:    
+- "Fit the table to the folio": positions and adjusts the size and determines the number of rows in the table in relation to the folio;  
+- "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.  
+
+And to finish a table   
+![](https://download.tuxfamily.org/qet/images_depeche_linuxfr/08/tableau.png "table")
+
+
+Summary
+
+The old summary has been completely removed from the code in order to make room for the new one which is exactly the same as the nomenclature (a large amount of the code is common), with the exception of the SQL query (and its dialog to configure it) which offers specific information for editing a summary.  
+
+Export of the internal database  
+
+The database used by the nomenclature and the summary can be exported in a “.sqlite” file.  
+Currently this is irrelevant, as the function was created during development for debugging purposes, we left it.  
+Note that the database will become increasingly important in the future of Qet.  
+
+
+Export of the wiring list  
+
+In order to be able to use the wiring number printers more easily, the names of conductors can be exported in CSV format, the export respects the quantity of conductors in order to print the right quantity of numbers, for example a potential numbered 240 composed of 3 wires will give 6 × 240 (2 numbers per wire × 3 wires) in the CSV. 
+
+
+
 ### Story
 
 The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  

build-aux/flatpak/org.qelectrotech.QElectroTech.json

@@ -13,6 +13,8 @@
     "--socket=fallback-x11",
     "--device=dri",
     "--share=ipc",
+    "--share=network",
+    "--socket=cups",
     "--filesystem=host"
   ],
   "modules": [
@@ -78,18 +80,17 @@
       ]
     },
     {
-    "name": "python3.6.0",
+    "name": "python3-PySimpleGUI",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
+    ],
     "sources": [
         {
-            "type": "archive",
-            "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz",
-            "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622"
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
+            "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
         }
-    ],
-    "config-opts": ["--enable-shared"],
-    "post-install": [
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0",
-        "chmod +w ${FLATPAK_DEST}/lib/libpython3.so"
     ]
 },
     {
@@ -101,25 +102,10 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz",
-            "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed"
+            "url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
+            "sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
         }
     ]
-},
-    {
-      "name": "DXFtoQET-2020-1",
-      "buildsystem": "qmake",
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/qelectrotech/DXFtoQET-2020.git",
-          "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d"
-        }
-      ],
-      "post-install": [
-        "mkdir -p ${FLATPAK_DEST}/bin",
-        "cp DXFtoQET ${FLATPAK_DEST}/bin/"
-        ]
 }
   ]
 }

build-aux/snap/local/launchers/qelectrotech-launch

@@ -1,15 +1,5 @@
 #!/bin/sh
 
-# a KDE session forces the KDE Plasma platformtheme which is incompatible with QET
-# unset the ENV vars in that case to prevent loading of the theme
-if [ ! -z "$KDE_FULL_SESSION" ]; then
-  unset KDE_FULL_SESSION
-fi
-
-if echo "$XDG_CURRENT_DESKTOP" | grep -q KDE; then
-  unset XDG_CURRENT_DESKTOP
-fi
-
 # migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
 from="$SNAP_USER_DATA/.qet"
 to="$SNAP_USER_COMMON/.qet"
@@ -23,12 +13,4 @@ fi
 mkdir -p "$HOME/.qet"
 ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
 
-# start desktop portal. Open & save dialogs might fail if it is not running
-dbus-send --print-reply \
-  --dest=org.freedesktop.DBus \
-  /org/freedesktop/DBus \
-  org.freedesktop.DBus.StartServiceByName \
-  string:org.freedesktop.portal.Desktop \
-  uint32:0
-
 exec "${@}"

build-aux/snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: qelectrotech
 title: QElectroTech
-base: core18
+base: core20
 adopt-info: qelectrotech
 license: GPL-2.0
 summary: Electrical diagram editor
@@ -10,6 +10,7 @@ description: |
 
 grade: stable
 confinement: strict
+compression: lzo
 
 architectures:
   - build-on: amd64
@@ -30,15 +31,14 @@ apps:
     extensions: [kde-neon]
     plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
     environment: &env
-      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
       TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
-      QT_QPA_PLATFORMTHEME: gtk3
-      QT_AUTO_SCREEN_SCALE_FACTOR: 1
       HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
+      PYTHONPATH: $SNAP:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3.8:$SNAP/usr/lib/python3.8/lib-dynload
 
   qet-tb-generator:
-    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
+    command: bin/qet_tb_generator
+    command-chain:
+      - bin/qelectrotech-launch
     extensions: [kde-neon]
     plugs: *plugs
     environment: *env
@@ -58,8 +58,8 @@ parts:
 
   qet-tb-generator:
     plugin: python
-    python-version: python3
-    source: https://github.com/qelectrotech/qet_tb_generator.git
+    source: https://github.com/raulroda/qet_tb_generator-plugin.git
+    python-packages: [PySimpleGUI]
     stage-packages: 
       - python3-lxml
       - python3-tk
@@ -68,15 +68,15 @@ parts:
   kde-sdk-setup:
     plugin: nil
     build-snaps:
-      - kde-frameworks-5-core18-sdk
+      - kde-frameworks-5-qt-5-15-3-core20-sdk
     build-packages:
       - g++
       - mesa-common-dev
       - libglvnd-dev
       - rsync
     override-build: |
-      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
-      
+      rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ /
+
   dxf-to-qet:
     after: [kde-sdk-setup]
     plugin: nil
@@ -91,19 +91,18 @@ parts:
     after: [kde-sdk-setup]
     plugin: nil
     source: .
-    stage-packages: [ git, sqlite3 ]
+    stage-packages: [ git, sqlite3, xdg-user-dirs ]
     build-packages:
       - git
       - libsqlite3-dev
-    override-pull: |
-      snapcraftctl pull
-      snap_version=$(git describe --dirty)
-      modified_displayed_version=$snap_version".snap"
+    override-build: |
+      displayed_version=$(grep "displayedVersion" sources/qet.h | tr -d "\";" | cut -d" " -f5)
+      snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
+      modified_displayed_version="${snap_version}.snap"
       sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
       snapcraftctl set-version "$snap_version"
-    override-build: |
       qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
-      make -j$(nproc)
+      make -j${SNAPCRAFT_PARALLEL_BUILD_COUNT}
       make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
     override-stage: |
       snapcraftctl stage
@@ -114,11 +113,14 @@ parts:
   cleanup:
     after: [qelectrotech, dxf-to-qet, qet-tb-generator]
     plugin: nil
-    build-snaps: [core18, kde-frameworks-5-core18]
+    build-snaps: [kde-frameworks-5-qt-5-15-3-core20]
     override-prime: |
-      # Remove all files from snap that are already included in the base snap or in
-      # any connected content snaps
       set -eux
-      for snap in "core18" "kde-frameworks-5-core18"; do  # List all content-snaps and base snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      for snap in "kde-frameworks-5-qt-5-15-3-core20"; do  # List all content-snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
       done
+      for cruft in bug lintian man; do
+        rm -rf $SNAPCRAFT_PRIME/usr/share/$cruft
+      done
+      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
+      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete

cmake/qet_compilation_vars.cmake

@@ -113,9 +113,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/conductorsegmentprofile.h
   ${QET_DIR}/sources/configdialog.cpp
   ${QET_DIR}/sources/configdialog.h
-  ${QET_DIR}/sources/configpage.h
-  ${QET_DIR}/sources/configpages.cpp
-  ${QET_DIR}/sources/configpages.h
   ${QET_DIR}/sources/createdxf.cpp
   ${QET_DIR}/sources/createdxf.h
   ${QET_DIR}/sources/diagramcommands.cpp
@@ -161,8 +158,6 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/main.cpp
   ${QET_DIR}/sources/newelementwizard.cpp
   ${QET_DIR}/sources/newelementwizard.h
-  ${QET_DIR}/sources/projectconfigpages.cpp
-  ${QET_DIR}/sources/projectconfigpages.h
   ${QET_DIR}/sources/projectview.cpp
   ${QET_DIR}/sources/projectview.h
   ${QET_DIR}/sources/qetapp.cpp
@@ -581,9 +576,13 @@ set(QET_SRC_FILES
   ${QET_DIR}/sources/ui/titleblockpropertieswidget.h
   ${QET_DIR}/sources/ui/xrefpropertieswidget.cpp
   ${QET_DIR}/sources/ui/xrefpropertieswidget.h
+  ${QET_DIR}/sources/ui/configpage/configpage.h
+  ${QET_DIR}/sources/ui/configpage/configpages.cpp
+  ${QET_DIR}/sources/ui/configpage/configpages.h
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.cpp
-
   ${QET_DIR}/sources/ui/configpage/generalconfigurationpage.h
+  ${QET_DIR}/sources/ui/configpage/projectconfigpages.cpp
+  ${QET_DIR}/sources/ui/configpage/projectconfigpages.h
 
   ${QET_DIR}/sources/undocommand/addelementtextcommand.cpp
   ${QET_DIR}/sources/undocommand/addelementtextcommand.h

elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt

@@ -12,7 +12,7 @@
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
         <name lang="cs">Přípojnice 3f+PEN pravá</name>
-	<name lang="hu">3F + PEN</name>
+	    <name lang="hu">3F + PEN</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt

@@ -12,7 +12,7 @@
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
         <name lang="cs">Přípojnice 3f+N+PE pravá</name>
-	<name lang="hu">3F + N + PE</name>
+	    <name lang="hu">3F + N + PE</name>
     </names>
     <elementInformations/>
     <informations>Author: The QElectroTech team

elements/10_electric/10_allpole/110_network_supplies/ground1.elmt

@@ -14,7 +14,7 @@
         <name lang="es">Masa</name>
         <name lang="ar">هيكل معدني</name>
         <name lang="fr">Masse</name>
-	<name lang="hu">Test</name>
+	    <name lang="hu">Test</name>
     </names>
     <elementInformations>
         <elementInformation name="comment" show="1"></elementInformation>

elements/10_electric/10_allpole/110_network_supplies/masse.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Chassis</name>
         <name lang="fr">Masse</name>
         <name lang="ru">Шасси</name>
-	<name lang="hu">Vázszerkezet</name>
+	    <name lang="hu">Vázszerkezet</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.elmt

@@ -12,7 +12,7 @@
         <name lang="en">Single-pole source + PE +N</name>
         <name lang="fr">Source unipolaire + PE +N</name>
         <name lang="ru">Однополюсный + PE +N</name>
-	<name lang="hu">F + N + PE</name>
+	    <name lang="hu">F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_1p_pen.elmt

@@ -12,7 +12,7 @@
         <name lang="en">Single-pole source +PEN</name>
         <name lang="fr">Source unipolaire + PEN</name>
         <name lang="ru">Однополюсный + PEN</name>
-	<name lang="hu">F + PEN</name>
+	    <name lang="hu">F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Single-pole source + neutral</name>
         <name lang="fr">Source unipolaire + neutre</name>
         <name lang="ru">Однополюсный + нейтраль</name>
-	<name lang="hu">F + N</name>
+	    <name lang="hu">F + N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Three-pole source</name>
         <name lang="fr">Source tripolaire</name>
         <name lang="ru">Трёхполюсный</name>
-	<name lang="hu">3F</name>
+	    <name lang="hu">3F</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_3p_pe_n.elmt

@@ -12,7 +12,7 @@
         <name lang="en">Three-pole source + PE +N</name>
         <name lang="fr">Source tripolaire + PE +N</name>
         <name lang="ru">Трёхполюсный + PE +N</name>
-	<name lang="hu">3F + N + PE</name>
+	    <name lang="hu">3F + N + PE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_3p_pen.elmt

@@ -12,7 +12,7 @@
         <name lang="en">Three-pole source + PEN</name>
         <name lang="fr">Source tripolaire + PEN</name>
         <name lang="ru">Трёхполюсный + PEN</name>
-	<name lang="hu">3F + PEN</name>
+	    <name lang="hu">3F + PEN</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Three-pole source + neutral</name>
         <name lang="fr">Source tripolaire + neutre</name>
         <name lang="ru">Трёхполюсный + нейтраль</name>
-	<name lang="hu">3F + N</name>
+	    <name lang="hu">3F + N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_n.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Neutral source</name>
         <name lang="fr">Source neutre</name>
         <name lang="ru">Нейтраль</name>
-	<name lang="hu">N</name>
+	    <name lang="hu">N</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_p.elmt

@@ -13,7 +13,7 @@
         <name lang="en">Phase source</name>
         <name lang="fr">Source phase</name>
         <name lang="ru">Фаза</name>
-	<name lang="hu">F</name>
+	    <name lang="hu">F</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/110_network_supplies/src_tnc_tns.elmt

@@ -11,7 +11,7 @@
         <name lang="en">Distribution point TN-C >TN-S</name>
         <name lang="fr">Point de distribution TN-C >TN-S</name>
         <name lang="ru">Распределительный пункт TN-C >TN-S</name>
-	<name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
+	    <name lang="hu">3F + PEN szétválasztva TN-C-ről TN-S-re</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>

elements/10_electric/10_allpole/114_connections/bod.elmt

@@ -1,17 +1,23 @@
-<definition width="20" height="20" hotspot_y="9" type="element" link_type="simple" hotspot_x="9" version="0.60">
-    <uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
+<definition width="20" version="0.90" type="element" height="20" hotspot_y="9" link_type="simple" hotspot_x="9">
+    <uuid uuid="{1eefef79-1c23-413b-873a-3d84f4aa5c25}"/>
     <names>
+        <name lang="fr">connexion</name>
+        <name lang="en">connection</name>
         <name lang="cs">Bod</name>
         <name lang="de">Verbindung</name>
         <name lang="hu">Keresztezés pont alakzatban</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
-        <input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
-        <terminal orientation="e" y="0" x="2"/>
-        <terminal orientation="w" y="0" x="-2"/>
-        <terminal orientation="s" y="2" x="0"/>
-        <terminal orientation="n" y="-2" x="0"/>
+        <circle y="-2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" diameter="4" x="-2"/>
+        <dynamic_text y="-14.5" Valignment="AlignTop" keep_visual_rotation="false" text_from="ElementInfo" uuid="{2aef950d-c62d-4d3c-939b-3e81653d5244}" Halignment="AlignLeft" x="-11" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" z="2" text_width="-1" frame="false">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="0" type="Generic" uuid="{9cc2fc56-976f-49ac-a0f8-63eb85f716c2}" orientation="e" x="2" name=""/>
+        <terminal y="0" type="Generic" uuid="{3c4b4f5e-98a2-4daa-9a47-40b8e018166e}" orientation="w" x="-2" name=""/>
+        <terminal y="2" type="Generic" uuid="{8d99aa04-def0-4573-a0e8-41229ed2f1dc}" orientation="s" x="0" name=""/>
+        <terminal y="-2" type="Generic" uuid="{f2e49ff6-ee59-492e-a6ad-82708479afd6}" orientation="n" x="0" name=""/>
     </description>
 </definition>

elements/10_electric/10_allpole/114_connections/lphd.elmt

@@ -1,22 +1,24 @@
-<definition hotspot_x="14" height="30" link_type="simple" width="30" version="0.80" type="element" hotspot_y="12">
-    <uuid uuid="{0b6817fe-dd44-42a8-8e7c-3c110d13b8a2}"/>
+<definition type="element" width="30" hotspot_y="12" version="0.90" height="30" link_type="simple" hotspot_x="14">
+    <uuid uuid="{9b3513fd-694f-4fc7-8b7e-66b733b9b4e1}"/>
     <names>
-        <name lang="hu">Egyesítő négy vezetékhez</name>
         <name lang="de">Klemmstelle (3)</name>
         <name lang="cs">Všestranný spoj</name>
+        <name lang="hu">Egyesítő négy vezetékhez</name>
+        <name lang="fr">
+Connecteur pour quatre fils</name>
     </names>
     <elementInformations/>
     <informations></informations>
     <description>
-        <dynamic_text Valignment="AlignTop" x="-13" text_from="ElementInfo" text_width="-1" z="2" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" y="-12" rotation="0" frame="false" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
+        <dynamic_text frame="false" text_width="-1" rotation="0" Halignment="AlignLeft" y="-12" x="-13" keep_visual_rotation="true" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" Valignment="AlignTop" z="2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <polygon x1="-10" y5="0" x3="0" x5="10" y2="0" y3="5" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="5" x2="-5" antialias="false" y4="0" y1="0"/>
-        <line x1="0" end1="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" length1="1.5" antialias="false" end2="none" y1="-5" length2="1.5"/>
-        <terminal x="10" orientation="e" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" y="0" name=""/>
-        <terminal x="0" orientation="n" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" y="-5" name=""/>
-        <terminal x="-10" orientation="w" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" y="0" name=""/>
-        <terminal x="0" orientation="s" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" y="10" name=""/>
+        <polygon x1="-10" y2="0" x4="5" y3="5" x3="0" x5="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y4="0" antialias="false" x2="-5" y5="0" closed="false"/>
+        <line x1="0" y2="10" length2="1.5" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y1="-5" antialias="false" x2="0"/>
+        <terminal type="Generic" name="" y="0" x="10" uuid="{06bf5c9f-6986-45bf-b11f-02e876abc4b8}" orientation="e"/>
+        <terminal type="Generic" name="" y="-5" x="0" uuid="{33c03677-8555-4b42-ae2c-4b4308978086}" orientation="n"/>
+        <terminal type="Generic" name="" y="0" x="-10" uuid="{95bef6e9-343e-45d7-9705-4aa81f62bed0}" orientation="w"/>
+        <terminal type="Generic" name="" y="10" x="0" uuid="{e9329e22-255b-4763-9dc6-65da277e1ac7}" orientation="s"/>
     </description>
 </definition>

elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/24_pin_connector_male_female.elmt

@@ -0,0 +1,223 @@
+<definition type="element" width="550" hotspot_y="65" height="70" link_type="simple" version="0.90" hotspot_x="265">
+    <uuid uuid="{c99de07b-0296-4e75-8a90-3b5c533510e8}"/>
+    <names>
+        <name lang="en">24 pin connector female+male</name>
+        <name lang="hu">24 tűs csatlakozó anya+apa</name>
+    </names>
+    <elementInformations>
+        <elementInformation show="1" name="manufacturer">Weidmüller</elementInformation>
+        <elementInformation show="1" name="supplier"></elementInformation>
+        <elementInformation show="1" name="manufacturer_reference">HDC HE 24 MS 25-48</elementInformation>
+        <elementInformation show="1" name="quantity"></elementInformation>
+        <elementInformation show="1" name="description"></elementInformation>
+        <elementInformation show="1" name="label"></elementInformation>
+        <elementInformation show="1" name="comment"></elementInformation>
+        <elementInformation show="1" name="plant"></elementInformation>
+        <elementInformation show="1" name="designation"></elementInformation>
+        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
+        <elementInformation show="1" name="unity"></elementInformation>
+    </elementInformations>
+    <informations></informations>
+    <description>
+        <dynamic_text frame="false" z="1" text_from="ElementInfo" rotation="0" keep_visual_rotation="false" uuid="{c28b53eb-1e17-4e90-b9af-ff86d19d1a56}" Valignment="AlignTop" Halignment="AlignLeft" y="-90" text_width="-1" x="-270" font="Sans Serif,8,-1,5,50,0,0,0,0,0">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-240" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-240" length1="1.5"/>
+        <text rotation="0" color="#000000" text="12" y="-40" x="1" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="20" y="-40" x="161" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="4" y="-40" x="-159" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="8" y="-40" x="-79" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="3" y="-40" x="-179" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="2" y="-40" x="-199" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-20" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-160" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-160" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-200" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-200" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="0" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="0" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-80" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-80" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-240" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-240" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="260" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="260" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="160" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="160" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-120" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-120" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-40" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-3"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-40" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-161"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-201"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="260" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="260" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-243"/>
+        <text rotation="0" color="#000000" text="18" y="-40" x="121" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="240" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="240" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-241"/>
+        <text rotation="0" color="#000000" text="10" y="-40" x="-39" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="7" y="-40" x="-99" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="257"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-41"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-60" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-180" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-180" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="240" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="240" length1="1.5"/>
+        <text rotation="0" color="#000000" text="19" y="-40" x="141" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="6" y="-40" x="-119" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-121"/>
+        <text rotation="0" color="#000000" text="11" y="-40" x="-19" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="5" y="-40" x="-139" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-1"/>
+        <text rotation="0" color="#000000" text="24" y="-40" x="241" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-81"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="259"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="40" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-181"/>
+        <text rotation="0" color="#000000" text="16" y="-40" x="81" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-80" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-80" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="220" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="220" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-100" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-100" length1="1.5"/>
+        <line y1="-37" y2="-32" length2="1.5" antialias="false" x2="270" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="270" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-20" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-100" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-100" length1="1.5"/>
+        <text rotation="0" color="#000000" text="15" y="-40" x="61" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="23" y="-40" x="221" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-21"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-23"/>
+        <text rotation="0" color="#000000" text="22" y="-40" x="201" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="14" y="-40" x="41" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-32" y2="-32" length2="1.5" antialias="false" x2="274" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="266" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="80" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="80" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-101"/>
+        <line y1="-30" y2="-30" length2="1.5" antialias="false" x2="272" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="268" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="79"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-140" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-140" length1="1.5"/>
+        <text rotation="0" color="#000000" text="21" y="-40" x="181" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-60" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-60" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-43"/>
+        <text rotation="0" color="#000000" text="13" y="-40" x="21" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <text rotation="0" color="#000000" text="9" y="-40" x="-59" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-61"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-63"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-141"/>
+        <line y1="-28" y2="-28" length2="1.5" antialias="false" x2="271" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="269" length1="1.5"/>
+        <text rotation="0" color="#000000" text="17" y="-40" x="101" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="237"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-83"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="120" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="120" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="200" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="200" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-103"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="200" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="200" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="39"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="60" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="180" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="180" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="119"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="-220" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-220" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-120" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-120" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="199"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-140" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-140" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="160" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="160" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-160" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-160" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="59"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-180" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-180" length1="1.5"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="159"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="239"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-200" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-200" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="140" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="140" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="-220" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-220" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="220" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="220" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="140" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="140" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="217"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="139"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="219"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="100" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="100" length1="1.5"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="180" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="180" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-123"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="197"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-143"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-163"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="99"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="179"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-183"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="177"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-203"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="-223"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="157"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="-221"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="137"/>
+        <line y1="-25" y2="-14" length2="1.5" antialias="false" x2="20" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="120" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="120" length1="1.5"/>
+        <text rotation="0" color="#000000" text="1" y="-40" x="-219" font="Sans Serif,7,-1,5,50,0,0,0,0,0"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="100" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="100" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="80" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="80" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="60" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="60" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="40" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length1="1.5"/>
+        <line y1="-36" y2="-45" length2="1.5" antialias="false" x2="20" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length1="1.5"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="117"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="97"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="77"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="57"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="37"/>
+        <arc antialias="true" width="6" height="6" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35" x="17"/>
+        <rect rx="0" antialias="false" width="2" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-32" ry="0" x="19"/>
+        <line y1="-37" y2="-32" length2="1.5" antialias="false" x2="-250" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-250" length1="1.5"/>
+        <line y1="-32" y2="-32" length2="1.5" antialias="false" x2="-246" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-254" length1="1.5"/>
+        <line y1="-30" y2="-30" length2="1.5" antialias="false" x2="-248" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-252" length1="1.5"/>
+        <line y1="-28" y2="-28" length2="1.5" antialias="false" x2="-249" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-251" length1="1.5"/>
+        <line y1="-60" y2="-60" length2="1.5" antialias="false" x2="270" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-250" length1="1.5"/>
+        <line y1="-60" y2="-50" length2="1.5" antialias="false" x2="280" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="270" length1="1.5"/>
+        <line y1="-50" y2="-10" length2="1.5" antialias="false" x2="280" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="280" length1="1.5"/>
+        <line y1="-10" y2="0" length2="1.5" antialias="false" x2="270" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="280" length1="1.5"/>
+        <line y1="0" y2="0" length2="1.5" antialias="false" x2="-250" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="270" length1="1.5"/>
+        <line y1="0" y2="-10" length2="1.5" antialias="false" x2="-260" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-250" length1="1.5"/>
+        <line y1="-10" y2="-50" length2="1.5" antialias="false" x2="-260" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-260" length1="1.5"/>
+        <line y1="-50" y2="-60" length2="1.5" antialias="false" x2="-250" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-260" length1="1.5"/>
+        <terminal name="" type="Generic" uuid="{2fd7e019-01c1-4cf6-9c8c-e8adca3ce496}" orientation="s" y="-14" x="240"/>
+        <terminal name="" type="Generic" uuid="{6a39b490-3888-4356-91cc-0a6574a30788}" orientation="n" y="-45" x="-140"/>
+        <terminal name="" type="Generic" uuid="{30fe38ae-876f-478a-83d5-22342403d1bb}" orientation="n" y="-45" x="120"/>
+        <terminal name="" type="Generic" uuid="{6d000d02-1a83-4d64-816c-40b834beef4f}" orientation="s" y="-14" x="120"/>
+        <terminal name="" type="Generic" uuid="{7e0e49fe-4d0a-4560-9f78-a0e160283578}" orientation="s" y="-14" x="-200"/>
+        <terminal name="" type="Generic" uuid="{26db0fbd-62c0-4de4-97ac-5b0bf685cef4}" orientation="s" y="-14" x="-180"/>
+        <terminal name="" type="Generic" uuid="{9e7a5014-3d0f-4f58-880a-9517e77f17ee}" orientation="s" y="-14" x="-160"/>
+        <terminal name="" type="Generic" uuid="{98fdfeec-a022-4d30-bfb1-915a2bb00351}" orientation="s" y="-14" x="-80"/>
+        <terminal name="" type="Generic" uuid="{ed4b19f3-15b5-432c-a9c8-bee918a2429b}" orientation="s" y="-14" x="-60"/>
+        <terminal name="" type="Generic" uuid="{f3c3c49c-4170-46ff-a474-fd1fea020156}" orientation="n" y="-45" x="-100"/>
+        <terminal name="" type="Generic" uuid="{da25c11c-260c-4fb8-9a9b-ae8d11c96e6d}" orientation="n" y="-45" x="-240"/>
+        <terminal name="" type="Generic" uuid="{bcfc8484-a82a-4585-a428-a9ffc2a676d7}" orientation="n" y="-45" x="-160"/>
+        <terminal name="" type="Generic" uuid="{ab25a69a-5c8c-469e-9da7-b79e3ebeb4ba}" orientation="n" y="-45" x="-220"/>
+        <terminal name="" type="Generic" uuid="{ef7db529-e31c-4f39-b831-8c578fb43462}" orientation="s" y="-14" x="20"/>
+        <terminal name="" type="Generic" uuid="{a21c8338-b99c-44a6-9b42-e71b936344ea}" orientation="s" y="-14" x="200"/>
+        <terminal name="" type="Generic" uuid="{aacb7245-00e4-4588-8960-4c3aaea6085b}" orientation="n" y="-45" x="60"/>
+        <terminal name="" type="Generic" uuid="{b6143a32-a9c1-40aa-8e94-c64e0d217a8f}" orientation="s" y="-14" x="-40"/>
+        <terminal name="" type="Generic" uuid="{7ee9a07f-0bf2-42f4-bf51-cabae0875328}" orientation="n" y="-45" x="100"/>
+        <terminal name="" type="Generic" uuid="{b03f6f6e-658a-49fa-84bd-03243a44ff18}" orientation="s" y="-14" x="60"/>
+        <terminal name="" type="Generic" uuid="{a88754c9-bf2c-4e3d-aa45-95113c37c426}" orientation="s" y="-14" x="-140"/>
+        <terminal name="" type="Generic" uuid="{efb0a56a-20ec-49ab-a470-dec34ed12027}" orientation="n" y="-45" x="260"/>
+        <terminal name="" type="Generic" uuid="{8ad57bf7-4125-4268-9817-e0d84a3e80c7}" orientation="s" y="-14" x="100"/>
+        <terminal name="" type="Generic" uuid="{66764cb9-b07b-4d38-bea0-4caefd955b61}" orientation="n" y="-45" x="-120"/>
+        <terminal name="" type="Generic" uuid="{bfaa681e-3fc9-4806-8b32-36af6ae51932}" orientation="s" y="-14" x="180"/>
+        <terminal name="" type="Generic" uuid="{4607cb5a-db47-40aa-9cfe-e22de405bf88}" orientation="s" y="-14" x="-20"/>
+        <terminal name="" type="Generic" uuid="{951d1e08-5f4d-4034-aecb-b6b8033d0dcf}" orientation="n" y="-45" x="-40"/>
+        <terminal name="" type="Generic" uuid="{f28988c9-363c-4486-a22f-a5365a15da8a}" orientation="n" y="-45" x="-180"/>
+        <terminal name="" type="Generic" uuid="{31805e67-1014-4ed3-83d0-6e15db99bbb7}" orientation="s" y="-14" x="-220"/>
+        <terminal name="" type="Generic" uuid="{bdb67495-8137-4c88-9986-671070320ce6}" orientation="n" y="-45" x="0"/>
+        <terminal name="" type="Generic" uuid="{434fcf9a-7e51-481d-a6c7-9269d6d99b29}" orientation="s" y="-14" x="-100"/>
+        <terminal name="" type="Generic" uuid="{7fede45b-d5cf-468a-9cca-52aff95a1c78}" orientation="s" y="-14" x="80"/>
+        <terminal name="" type="Generic" uuid="{c7897fc8-739e-4c72-b524-a8d7ba6f2b6b}" orientation="n" y="-45" x="-60"/>
+        <terminal name="" type="Generic" uuid="{bef0d722-d69f-4489-b8f1-2afb03de1784}" orientation="s" y="-14" x="220"/>
+        <terminal name="" type="Generic" uuid="{9ae10c41-be73-4e99-9423-568ff93475fd}" orientation="n" y="-45" x="-200"/>
+        <terminal name="" type="Generic" uuid="{8a60a879-ccf3-4c21-a0ab-3a2ae2d01dbe}" orientation="n" y="-45" x="200"/>
+        <terminal name="" type="Generic" uuid="{24426091-f2ec-4154-aba3-6bdaec485c4f}" orientation="n" y="-45" x="20"/>
+        <terminal name="" type="Generic" uuid="{ba1e41da-e37c-4f54-8237-618421d1e344}" orientation="s" y="-14" x="0"/>
+        <terminal name="" type="Generic" uuid="{b28694f6-eac6-4eb9-9c3c-ed0cc49328e6}" orientation="n" y="-45" x="40"/>
+        <terminal name="" type="Generic" uuid="{2481d2c4-d913-4d55-a48a-20eef116dc46}" orientation="s" y="-14" x="-120"/>
+        <terminal name="" type="Generic" uuid="{1e6a6de8-1126-4ec0-a8dc-833a14913da6}" orientation="n" y="-45" x="-20"/>
+        <terminal name="" type="Generic" uuid="{24d3c3fe-8549-4e16-b8b3-dc2fa1675be6}" orientation="n" y="-45" x="80"/>
+        <terminal name="" type="Generic" uuid="{5dbff03f-b71c-4f41-81e4-5093fafce82f}" orientation="s" y="-14" x="160"/>
+        <terminal name="" type="Generic" uuid="{da4a5bbe-5aa7-4493-99b6-e87b73d6b858}" orientation="n" y="-45" x="-80"/>
+        <terminal name="" type="Generic" uuid="{071a2b7e-4a5a-465a-b040-0e3579f36665}" orientation="s" y="-14" x="260"/>
+        <terminal name="" type="Generic" uuid="{fe47517f-462b-4a9a-a2c3-ae756dbfefe8}" orientation="n" y="-45" x="140"/>
+        <terminal name="" type="Generic" uuid="{1f24bdb1-cc99-4d89-8d89-8e104aaf498e}" orientation="n" y="-45" x="220"/>
+        <terminal name="" type="Generic" uuid="{2738bb7b-c6be-4aa4-81c9-31e4e457cf31}" orientation="s" y="-14" x="-240"/>
+        <terminal name="" type="Generic" uuid="{4d909e53-50b1-4b45-b8c3-262038f6c247}" orientation="n" y="-45" x="160"/>
+        <terminal name="" type="Generic" uuid="{0e87f452-86a3-45ef-a66b-8ed92e08899d}" orientation="n" y="-45" x="180"/>
+        <terminal name="" type="Generic" uuid="{1c6e1ab1-d98f-4322-bc2b-def58fefbea7}" orientation="s" y="-14" x="40"/>
+        <terminal name="" type="Generic" uuid="{1f0b7ff5-9f52-4517-b749-018b5bfa59dd}" orientation="n" y="-45" x="240"/>
+        <terminal name="" type="Generic" uuid="{8adac905-77b9-471f-8822-4ac63d3f6cf6}" orientation="s" y="-14" x="140"/>
+    </description>
+</definition>