Merge branch 'terminal_strip'

* terminal_strip: Minor fix : wrong variable name
Minor fix : wrong variable name
2025-12-18 05:00:33 +01:00 · 2022-04-09 16:35:02 +02:00 · 2022-04-09 16:34:30 +02:00 · 2022-04-09 13:07:47 +02:00 · 2022-04-09 12:46:07 +02:00 · 2022-04-09 11:54:58 +02:00
3139 changed files with 92306 additions and 50217 deletions
--- a/.github/workflows/publish-edge-snap.yml
+++ b/.github/workflows/publish-edge-snap.yml
@@ -12,8 +12,6 @@ jobs:
    - uses: actions/checkout@v2
    - uses: snapcore/action-build@v1
      id: build
-      with:
-        snapcraft-args: --enable-experimental-extensions
    - uses: snapcore/action-publish@v1
      with:
        store_login: ${{ secrets.STORE_LOGIN }}
--- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json
+++ b/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": [
--- a/build-aux/snap/local/launchers/qelectrotech-launch
+++ b/build-aux/snap/local/launchers/qelectrotech-launch
@@ -1,17 +1,5 @@
 #!/bin/sh

-# check if _only_ the correct framework snap is connected
-framework_name=$(grep "name:" $SNAP/kf5/meta/snap.yaml | cut -d" " -f2)
-if [ "$framework_name" != "kde-frameworks-5-qt-5-15-3-core20" ]; then
-  downloads_dir=$(xdg-user-dir DOWNLOAD)
-  test ! -d "$downloads_dir" && mkdir -p "$downloads_dir"
-  instructions_file="snap.qelectrotech.update-instructions.html"
-  target="$downloads_dir/$instructions_file"
-  cp "$SNAP/update-instructions/$instructions_file" "$target"
-  xdg-open "$target"
-  exit 1
-fi
-
 # migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
 from="$SNAP_USER_DATA/.qet"
 to="$SNAP_USER_COMMON/.qet"
--- a/build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html
+++ b/build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -56,12 +56,6 @@ parts:
    organize:
      '*': bin/

-  update-instructions:
-    plugin: dump
-    source: build-aux/snap/local/update-instructions
-    organize: 
-      '*': update-instructions/
-
  qet-tb-generator:
    plugin: python
    source: https://github.com/raulroda/qet_tb_generator-plugin.git
@@ -82,7 +76,7 @@ parts:
      - rsync
    override-build: |
      rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ /
-      
+
  dxf-to-qet:
    after: [kde-sdk-setup]
    plugin: nil
@@ -101,16 +95,14 @@ parts:
    build-packages:
      - git
      - libsqlite3-dev
-    override-pull: |
-      snapcraftctl pull
+    override-build: |
      displayed_version=$(grep "displayedVersion" sources/qet.h | tr -d "\";" | cut -d" " -f5)
-      snap_version="${displayed_version}~$(git rev-parse --short=8 HEAD)"
+      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
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable1.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable1.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable2.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable2.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable3.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable3.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable5.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable5.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable6.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable6.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/cable_3wires.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/cable_3wires.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/ecran_3p.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/ecran_3p.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/fil_de_cable.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/fil_de_cable.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/filerie.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/filerie.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/kabel3g.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/kabel3g.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/kabel4g.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/kabel4g.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/kabel7g.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/kabel7g.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/nomenclature_section.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/nomenclature_section.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/qet_directory
+++ b/elements/10_electric/10_allpole/120_cables_wiring/qet_directory
--- a/elements/10_electric/10_allpole/120_cables_wiring/section1conducteur.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/section1conducteur.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/section2-1conducteurs.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/section2-1conducteurs.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/section2conducteurs.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/section2conducteurs.elmt
--- a/elements/10_electric/10_allpole/120_cables_wiring/section3.elmt
+++ b/elements/10_electric/10_allpole/120_cables_wiring/section3.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0101.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0101.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0111.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0111.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0121.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0121.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0151.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0151.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0211.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0211.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0501.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0501.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0502.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0502.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0901.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-10-0901.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0001.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0001.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0002.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0002.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0011.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0011.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0012.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0012.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0013.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-20-0013.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0001.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0001.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0011.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0011.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0012.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0012.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0013.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-21-0013.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0001.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0001.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0010.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0010.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0011.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0011.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0101.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/90-30-0101.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/cable.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/cable.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/qet_directory
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/repartiteur.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/repartiteur.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_12g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_12g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_19g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_19g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_3g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_3g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_4g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_4g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_5g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_5g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_7g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/90_terminal_strips_diagram/terminal_7g1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/qet_directory
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-2-port.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-2-port.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-3-port.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-3-port.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-4-port.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-4-port.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-5-port.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-5-port.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-8-port.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-8-port.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-splitter-2-input-4-output.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-splitter-2-input-4-output.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-splitter-2-input-6-output.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/95_terminals_spring_box/wire-connector-splitter-2-input-6-output.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/barette_de_terre.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/barette_de_terre.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/barre_interconnexion_tn.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/barre_interconnexion_tn.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/barrette_connexion_f.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/barrette_connexion_f.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_2.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_2.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_21.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_21.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_3.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_3.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_31.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_31.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_5.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_5.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_continuite.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_continuite.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_continuite2.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_continuite2.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_finale.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_finale.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_finale1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_finale1.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_fusible_cablage.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/borne_fusible_cablage.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/bornedouble.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/bornedouble.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/bornier5x.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/bornier5x.elmt
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/qet_directory
--- a/elements/10_electric/10_allpole/130_terminals_terminal_strips/sec_fus_ferme1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals_terminal_strips/sec_fus_ferme1.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/24_pin_connector_male_female.elmt
+++ b/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>
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_3p_fem.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_3p_fem.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_3p_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_3p_male.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091a_male.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091d_fem.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c091d_fem.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_4p_f.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_4p_f.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_4p_m.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_4p_m.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_7p_fem.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_7p_fem.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_7p_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/c16_7p_male.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_f.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_f.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_m.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_m.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_mf.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/connecteur_mf.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/contact_prise_fiche.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/contact_prise_fiche.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/kon10pin_pravy.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/kon10pin_pravy.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/konektor10pin.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/konektor10pin.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/pin_m_fm.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/pin_m_fm.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/prise_fiche.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/prise_fiche.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/prise_multipolaire.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/prise_multipolaire.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/qet_directory
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/qet_directory
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/vidlice_5p.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/vidlice_5p.elmt
--- a/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/zas_schurter.elmt
+++ b/elements/10_electric/10_allpole/140_connectors_plugs/01_connectors_pins/zas_schurter.elmt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
joshua	1c52cd71a9	Merge branch 'terminal_strip' * terminal_strip: Minor fix : wrong variable name	2022-04-09 16:35:02 +02:00
joshua	898edb6c12	Minor fix : wrong variable name	2022-04-09 16:34:30 +02:00
joshua	de3fa988b1	Fix some clazy warning	2022-04-09 13:07:47 +02:00
joshua	b42aec7bdf	Minor Block database signal when a project is currently being deleted. Among other things, this avoid the multiple show of the dialog "table limitation".	2022-04-09 12:46:07 +02:00
joshua	ea46a92f3f	Merge branch 'terminal_strip' * terminal_strip: Several real terminal can be added to terminal strip in one shot Minor : avoid unnecessary multiple function call The free terminal properties can be edited by batch. Change made inside the free terminal table can be applied Hide/show apply/reset buttons according to current displayed widget Edited data of terminal strip can be applied Change terminal strip editor class Add free terminal editor widget Add toolbar and buttons Start to move terminal strip editor from QDialog to QMainWindow Add table widget and item model for free terminal Revamp code Improve undo command when add/move/remove terminal in/from/to terminal strip Revamp code. Revamp code, make it more simple Remove the real terminal uuid, and use instead the uuid of the terminal element itself RealTerminal is created by the TerminalElement itself Change relationship betwen classes RealTerminal PhysicalTerminald and TerminalElement QTreeWidget "terminal explorer" : improve item text minor : remove unused code	2022-04-09 11:54:58 +02:00
joshua	6197d0215a	Several real terminal can be added to terminal strip in one shot User can select several real terminals in the free terminal editor and add it with one operation on a terminal strip.	2022-04-08 20:48:32 +02:00
Laurent Trinques	6fd342e265	Fix typo	2022-04-07 17:01:23 +02:00
Laurent Trinques	395d968ab5	Minor	2022-04-07 16:48:37 +02:00
Laurent Trinques	e41b7f7d6c	Machine_info add disk and partition informations	2022-04-07 16:33:20 +02:00
Laurent Trinques	fabf0109ff	Remove element surpresseur_mono_hyd.elmt	2022-04-02 19:58:29 +02:00
Laurent Trinques	cabfdc0a54	Add reworked pneumatic symbols, thanks Vbxler	2022-04-02 19:52:17 +02:00
joshua	6f4122f65c	Fix a funny bug When we create a summary table and uncheck the option "adjust the size of the table to the folio" an infinity of new diagram are added to the project.	2022-04-01 20:41:07 +02:00
joshua	ce21a812c0	Fix bug 244 I was thinking that the commit `5a51f6bace` fix the bug 244, but not they only fix this bug : https://qelectrotech.org/forum/viewtopic.php?pid=16022#p16022 This commit really fix the bug 244	2022-04-01 20:04:17 +02:00
joshua	5a51f6bace	Fix crash See bug N°244 https://qelectrotech.org/bugtracker/view.php?id=244	2022-03-31 19:05:45 +02:00
joshua	a38d97896d	Minor : avoid unnecessary multiple function call TerminalStripTreeDockWidget::on_m_tree_view_currentItemChanged call setCurrentStrip only when current strip changed, and not every time when user click in another item on the tree view.	2022-03-30 20:30:57 +02:00
joshua	c4b0c1435c	The free terminal properties can be edited by batch.	2022-03-25 19:49:31 +01:00
joshua	a4445c411d	Change made inside the free terminal table can be applied	2022-03-25 19:25:46 +01:00
joshua	e92bd36f9b	Hide/show apply/reset buttons according to current displayed widget	2022-03-25 19:00:09 +01:00
Laurent Trinques	61ff8884e0	Minor	2022-03-24 06:25:28 +01:00
Laurent Trinques	b8af2e9d1d	Minor : add informations in aboutqetdialog widget	2022-03-24 06:13:03 +01:00
joshua	8084fa8f29	Edited data of terminal strip can be applied	2022-03-23 21:18:22 +01:00
plc-user	1066e55262	rework and new elements (Hager)	2022-03-21 05:19:01 +01:00
joshua	edfb23be23	Change terminal strip editor class Change parent class from QDialog to QWidget. Terminal strip editor is now embedded in TerminalStripEditorWindow.	2022-03-20 18:25:25 +01:00
plc-user	516a1a7826	more cleanup, rework and new elements	2022-03-19 15:18:29 +01:00
plc-user	be1d87c5d4	cleanup, rework and new elements	2022-03-17 08:38:38 +01:00
joshua	b48ba939de	Add free terminal editor widget	2022-03-16 22:44:08 +01:00
joshua	b1ad16d482	Add toolbar and buttons Add 'add terminal strip' button. Add 'remove terminal strip' button Add 'reload' button	2022-03-16 18:58:36 +01:00
joshua	ceb54fbc6a	Start to move terminal strip editor from QDialog to QMainWindow	2022-03-14 17:56:18 +01:00
plc-user	e42bcb5ec9	bugfix, rework and new elements	2022-03-12 22:01:25 +01:00
joshua	9cbc3a2265	Add table widget and item model for free terminal WIP, the change made in the table widget can't be applied.	2022-03-12 19:07:49 +01:00
plc-user	e93990a6e4	rework of some Elements and some new Terminals	2022-02-26 15:50:07 +01:00
Laurent Trinques	bb1a0767a3	Change & by undferscore in qet_labels.xml	2022-02-24 13:33:06 +01:00
Laurent Trinques	0b7afe4781	Flatpak & AppImage : restore Sqlite3 for database export	2022-02-21 13:45:55 +01:00
plc-user	9a3de1f780	rework of some Elements an some new ones	2022-02-21 13:36:09 +01:00
joshua	0ff099fb52	Revamp code Change the way to know who is the physical terminal of a real terminal when we got only the real terminal.	2022-02-20 13:13:29 +01:00
joshua	05a2e4b37b	Improve undo command when add/move/remove terminal in/from/to terminal strip	2022-02-19 12:34:38 +01:00
Laurent Trinques	830a70ac94	Add Linux pc.gpu.RAM informations, but need glxinfo dependency	2022-02-17 19:01:56 +01:00
Laurent Trinques	e63a8c8482	Minor	2022-02-16 13:57:04 +01:00
Laurent Trinques	855162bb03	Improve QElapsedTimer in seconds to compute time used for reload element collection	2022-02-16 12:34:04 +01:00
Ole Carlsen	d2c15cf57b	Update Danish translation	2022-02-14 19:37:51 +01:00
artgg7300	02ce65b3a9	little mod on element	2022-02-14 05:20:11 +01:00
pavelfric	0bf1f89c13	Updated Czech translations of elements.	2022-02-13 11:28:37 +01:00
joshua	74c3ab1b82	Fix can't resize QetGraphicsTableItem User can't grab the handler item.	2022-02-10 19:13:59 +01:00
joshua	062ae6e9eb	Fix intensive call of updateUi when move a QetGraphicsTableItem	2022-02-10 19:11:06 +01:00
joshua	dcc5a4dd0b	Revamp code. Remove a QVector member variable and use instead a function who return the same vector, but created on the fly	2022-02-09 19:15:45 +01:00
joshua	ba638f52e5	Revamp code, make it more simple	2022-02-09 18:57:27 +01:00
joshua	ffd904749e	Remove the real terminal uuid, and use instead the uuid of the terminal element itself	2022-02-09 18:13:35 +01:00
joshua	c037d3ea0a	RealTerminal is created by the TerminalElement itself	2022-02-09 18:08:20 +01:00
artgg7300	087c8980f0	little modif on element	2022-02-09 06:07:42 +01:00
joshua	70f50ff362	Change relationship betwen classes RealTerminal PhysicalTerminald and TerminalElement	2022-02-08 19:24:16 +01:00
artgg7300	904e805935	add new elements and remove a old	2022-02-08 06:27:36 +01:00
artgg7300	04d478882e	add new element Dahlander motor	2022-02-06 17:34:01 +01:00
joshua	35cd790c8f	Fix crash	2022-02-06 16:36:00 +01:00
joshua	1a26133a78	Add a QElapsedTimer to compute time used for reload element collection	2022-02-06 15:50:25 +01:00
joshua	a028b774bf	QTreeWidget "terminal explorer" : improve item text In the QTreeWidget "terminal explorer", when the physical terminal is composed by several real terminal, the text of the QTreeWidgetItem display the label of each real terminal.	2022-02-06 15:05:24 +01:00
Laurent Trinques	72b7bc210f	Minor	2022-02-06 14:03:49 +01:00
Laurent Trinques	5fe2efca1a	Minor	2022-02-05 15:36:44 +01:00
Laurent Trinques	3ce09775ac	Minor	2022-02-05 13:12:11 +01:00
joshua	3a53c2d53b	minor : remove unused code	2022-02-05 12:02:59 +01:00
joshua	7ba27ec9d9	Fix very weird bug see https://linuxfr.org/forums/programmation-c/posts/erreur-de-compilation-aucun-fichier-ou-dossier-de-ce-type	2022-02-05 11:40:47 +01:00
Laurent Trinques	d74dcdea6c	Minor	2022-02-04 16:16:34 +01:00
joshua	9cb86a7e54	Fix fail to build for older version of Qt	2022-02-01 11:29:06 +01:00
joshua	826991e6d6	Improve how real terminals are grouped	2022-02-01 11:13:23 +01:00
joshua	53157afd12	Minor : rebuild terminal vector everywhere is needed	2022-02-01 10:30:42 +01:00
joshua	a165a3cb28	When undo an ungroup terminal command, the terminal keep the same level.	2022-02-01 09:53:06 +01:00
joshua	1d20018a26	Merge branch 'terminal_strip' * terminal_strip: Terminal strip bridge are now save in .qet file Minor : don't push an undo command when change bridge color by the same color	2022-01-31 18:17:27 +01:00
joshua	c02238cab8	Terminal strip bridge are now save in .qet file	2022-01-31 18:11:21 +01:00
joshua	35a40f1aba	Fix fail to build from sources for some Qt version	2022-01-31 17:25:10 +01:00
Laurent Trinques	6e55a630b4	Rename Folder names containing the '&' character cause the PHP file _exist() function to fail.	2022-01-30 11:24:11 +01:00
Laurent Trinques	9a17c8f72c	Rename Folder names containing the '&' character cause the PHP file _exist() function to fail.	2022-01-30 11:21:59 +01:00
Laurent Trinques	04c17ac5ac	Rename Folder names containing the '&' character cause the PHP file _exist() function to fail.	2022-01-30 10:50:21 +01:00
Laurent Trinques	686bd8dff1	Rename Folder names containing the '&' character cause the PHP file _exist() function to fail.	2022-01-30 10:36:18 +01:00
joshua	bd635b8e43	Minor : don't push an undo command when change bridge color by the same color	2022-01-28 18:37:40 +01:00
joshua	0bd0476cb1	Merge branch 'terminal_strip' * terminal_strip: Fix fail to build from sources Minor improvement about undo/redo for bridge creation Minor Fix : undo command for unbridge strip don't work Minor : add undo text	2022-01-28 18:09:20 +01:00
joshua	d562ca8a39	Fix fail to build from sources	2022-01-28 18:08:16 +01:00
joshua	a31bd6eb0d	Minor improvement about undo/redo for bridge creation When a new bridge is created, an undo command is created for that. When undo the action and redo it, all terminals are bridged to a new bridge instead of the first one, who continue to exist but is now empty and 'lost' because he will never be reused. In addition of that, if a more recent undo command (we call it undo2) use this bridge, there is a unknown behavior, because the status of the bridge is not the same as when the undo2 was created.	2022-01-27 20:00:46 +01:00
joshua	d114b097bf	Minor Fix : undo command for unbridge strip don't work	2022-01-27 19:45:33 +01:00
joshua	993eb58d46	Minor : add undo text	2022-01-27 19:07:49 +01:00
joshua	7aa048740b	Merge branch 'terminal_strip' * terminal_strip: TerminalStripBridge color can be edited. Use QSharedPointer instead of QWeakPointer + remove unused include Change struct TerminalStripBridge to class Revamp terminalStrip feature code Revamp PhysicalTerminal class Revamp RealTerminal class...... again Improve bridge edition Improve code readability Fix copy constructo warning Make code less spaghetti Draw bridge pixmap in the tableview (wip) REmove unused method : levelCellCount Remove isXrefCell method... Add terminal bridge feature	2022-01-27 19:02:43 +01:00
Maximilian Federle	306f4c7b54	projectview: Only append .qet if not snap or flatpak	2022-01-27 12:02:08 +01:00
Laurent Trinques	4334c8ec8c	Add new symbols, thanks Vbxler	2022-01-26 11:47:16 +01:00
dlee99	7aabdd1781	modified: lang/qet_nl.qm modified: lang/qet_nl.ts	2022-01-21 21:55:02 +01:00
artgg7300	bb48c4607a	translated hungarian files	2022-01-20 10:49:33 +01:00
dlee99	0600b85e8a	modified: lang/qet_nl.qm modified: lang/qet_nl.ts	2022-01-19 22:30:42 +01:00
Maximilian Federle	688d9fe4c1	projectview: Re-enable appending qet suffix if not running as flatpak It was removed in `b121dad` for all platforms. Only disable appending the suffix for the flatpak platform by testing for the FLATPAK_ID environment variable.	2022-01-19 20:29:34 +01:00
joshua	683095173e	TerminalStripBridge color can be edited.	2022-01-18 11:24:07 +01:00
dlee99	0d70ed53a9	modified: lang/qet_nl.qm modified: lang/qet_nl.ts	2022-01-15 21:45:46 +01:00
joshua	7d33b48b3a	Merge branch 'master' into terminal_strip * master: BugFix : default element collection path is wrong snap: Remove framework snap prompt Update translation and add cn chinese ts files Danish translation updated Danish translation Danish translation Add new thumbnail element Flatpak add --share=network Flatpak : add --socket=cups see : https://github.com/flathub/org.libreoffice.LibreOffice/issues/90 Graphics item handler is bigger when overred Add toolbar widget for edit size of handler in diagram editor. Fix Multiple translation in elements Fix Multiple translation in elements Fix segfault. new Analog-In - Module cleanup and upgraded elements modified: lang/qet_nl.qm modified: lang/qet_nl.ts Add Russian translation, thanks "А.Разживин" little modification in hungarian language Fixed typo	2022-01-14 19:47:28 +01:00
joshua	d7e2ef283a	BugFix : default element collection path is wrong	2022-01-14 19:04:53 +01:00
Maximilian Federle	782eaff4d2	snap: Remove framework snap prompt Now that https://github.com/snapcore/snapcraft/pull/3596 has been released in snapcraft 6.0.1, drop the prompt that tells users to disconnect the old framework snap. Also drop --enable-experimental-extensions from CI because kde-neon has been declared stable for core20.	2022-01-14 18:12:45 +01:00
Laurent Trinques	9bd2ea22f3	Update translation and add cn chinese ts files	2022-01-11 10:03:22 +01:00
Ole Carlsen	ee4ce5db4e	Danish translation updated	2022-01-09 18:45:25 +01:00
Ole Carlsen	b90d06aa5c	Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet	2022-01-09 16:29:35 +01:00
Ole Carlsen	ba47a11282	Danish translation	2022-01-09 16:28:30 +01:00
Ole Carlsen	4041073c96	Danish translation	2022-01-09 16:24:53 +01:00
joshua	8830204c0c	Add new thumbnail element	2022-01-07 16:41:04 +01:00
Laurent Trinques	d932f8ea01	Flatpak add --share=network	2022-01-05 11:16:22 +01:00
Laurent Trinques	8cfa852077	Flatpak : add --socket=cups see : https://github.com/flathub/org.libreoffice.LibreOffice/issues/90	2022-01-05 07:24:56 +01:00
joshua	1a75eb19d0	Graphics item handler is bigger when overred	2022-01-04 18:41:46 +01:00
joshua	ae9faa2192	Add toolbar widget for edit size of handler in diagram editor. Add a combo box in the tool bar of diagram editor to quickly change the size of the graphics handler item. The sarto commit :D NOTE only available for diagram editor, element editor will come later.	2022-01-03 21:01:25 +01:00
Laurent Trinques	e087270b6d	Fix Multiple translation in elements	2021-12-31 13:29:17 +01:00
Laurent Trinques	b8263b03bc	Fix Multiple translation in elements	2021-12-31 13:23:03 +01:00
joshua	09694ddec9	Use QSharedPointer instead of QWeakPointer + remove unused include	2021-12-26 18:48:11 +01:00
joshua	1572fafabe	Change struct TerminalStripBridge to class And move it in a new file	2021-12-26 18:43:17 +01:00
joshua	5709f469fc	Revamp terminalStrip feature code Move RealTerminal class in a new file Move PhysicalTerminal class in a new file. Remove the use of QWeakPointer and use instead QSharedPointer in a big part of the revamp.	2021-12-26 17:26:00 +01:00
joshua	2ea9f8a2c6	Revamp PhysicalTerminal class	2021-12-23 22:17:37 +01:00
joshua	a2e5989f3b	Revamp RealTerminal class...... again I don't know what I want, I'm crazy :D. Next commit will also revamp PhysicalTerminal and TerminalStripBridge class, code will be more clear and easy to understand.	2021-12-23 18:37:17 +01:00
joshua	02b385e0b7	Improve bridge edition	2021-12-22 19:21:54 +01:00
joshua	e2454faa36	Improve code readability	2021-12-19 21:05:48 +01:00
joshua	57e80e7b5e	Fix copy constructo warning	2021-12-19 20:03:26 +01:00
joshua	6505330b5f	Make code less spaghetti Not finished yet.	2021-12-19 14:55:02 +01:00
joshua	cd914c8726	Merge branch 'master' into terminal_strip * master: (21 commits) Minor: remove spaces in filenames minor: remove capital letters Add new symbols Fibaro, thanks Bertus Update Hungarian translation, thanks Gubányi modified: lang/qet_nl.qm modified: lang/qet_nl.ts Add preprocessor to check Qt version Update *TS files Add possibility to user to choose hdpi round policy Minor improvement for function QETApp::customElementsDir() and QETApp::commonElementsDir() Add new GCE symbol Flatpak: update qet_tb_generator to version 1.3.1 Add new symbol nodemcu_v3, thanks Bertus Add new symbols ci: Build edge snaps on GitHub & release to store snap: Port to core20 Flatpak update qet_tb_generator to 1.3.0 version Fix typo in URL SNAP change Github source to https://github.com/raulroda/qet_tb_generator-plugin modified: lang/qet_nl.qm modified: lang/qet_nl.ts upgraded elements and renamed company ...	2021-12-11 21:27:34 +01:00
joshua	beee4a06c8	Draw bridge pixmap in the tableview (wip)	2021-12-11 21:25:40 +01:00
joshua	291e163ee2	REmove unused method : levelCellCount	2021-12-02 18:55:56 +01:00
joshua	6e68e6047a	Remove isXrefCell method... and use instead columnTypeForIndex method	2021-12-02 18:54:45 +01:00
joshua	ce8bd7fae3	Add terminal bridge feature	2021-12-01 21:27:04 +01:00