v1.3.1

.gitignore

@@ -1,74 +1,9 @@
 .vscode/launch.json
 .vscode/.ropeproject/config.py
 .vscode/.ropeproject/objectdb
-sample_projects/achim_ns_1.qet
-sample_projects/achim_ns_2.qet
-sample_projects/achim_ns.qet
-sample_projects/achim_test_1.qet
-sample_projects/achim_test.qet
-sample_projects/Alimentacao e Moagem.qet
-sample_projects/CLAUGERV1.qet
-sample_projects/control_simple.qet
-sample_projects/control.qet
-sample_projects/Jaroslaw_schemat_revA.4_TBv1.7.qet
-sample_projects/Jaroslaw_schemat_revA.4.qet
-sample_projects/sample.qet
-sample_projects/THERMO_v0.8dev.qet
-sample_projects/achim_bugs/Basic_t.qet
-sample_projects/achim_bugs/basic.qet
-sample_projects/achim_bugs/tbgenerator.zip
-sample_projects/achim_bugs/Test1.qet
-sample_projects/achim_bugs/Test2.qet
-sample_projects/achim_bugs/Test3.qet
-sample_projects/achim_bugs/Test4.qet
-sample_projects/jaroslaw.qet
-sample_projects/schemat_revA.5.qet.zip
-sample_projects/achim2/Basis (copy).qet
-sample_projects/achim2/Basis_1.qet
-sample_projects/achim2/Basis_2.qet
-sample_projects/achim2/Basis_3.qet
-sample_projects/achim2/Basis.qet
-sample_projects/jaroslaw2/test__1.qet
-sample_projects/jaroslaw2/test__2.qet
-sample_projects/jaroslaw2/test__3.qet
-sample_projects/jaroslaw2/test__4.qet
-sample_projects/jaroslaw2/test_.qet
-sample_projects/jaroslaw2/qet2.zip
-build/lib/src/__init__.py
-build/lib/src/main.py
-build/lib/src/qetproject.py
-build/lib/src/scroll_sample.py
-build/lib/src/terminalblock.py
-build/run/Analysis-00.toc
-build/run/EXE-00.toc
-build/run/PKG-00.pkg
-build/run/PKG-00.toc
-build/run/PYZ-00.pyz
-build/run/PYZ-00.toc
-build/run/run.exe.manifest
-build/run/Tree-02.toc
-build/run/warn-run.txt
-build/run/xref-run.html
-__pycache__/qet_tb_generator.cpython-38.pyc
-__pycache__/run.cpython-38.pyc
-qet_tb_generator.egg-info/dependency_links.txt
-qet_tb_generator.egg-info/entry_points.txt
-qet_tb_generator.egg-info/PKG-INFO
-qet_tb_generator.egg-info/SOURCES.txt
-qet_tb_generator.egg-info/top_level.txt
-sample_projects/achim2/Basis_4.qet
-sample_projects/achim2/KaNeuDarchau_1.qet
-sample_projects/achim2/KaNeuDarchau_2.qet
-sample_projects/achim2/KaNeuDarchau_3.qet
-sample_projects/achim2/KaNeuDarchau.qet
-src/__pycache__/main.cpython-38.pyc
-src/__pycache__/qetproject.cpython-38.pyc
+sample_projects/
+build/
+bluid/run/
+__pycache__/
 .gitignore
-build/run/Analysis-00.toc
-build/run/EXE-00.toc
-build/run/PKG-00.pkg
-build/run/PKG-00.toc
-build/run/PYZ-00.pyz
-build/run/PYZ-00.toc
-build/run/warn-run.txt
-build/run/xref-run.html
+qet_tb_generator.egg-info/

CHANGES

@@ -1,6 +1,10 @@
 # Changelog
 
-ToDo: 32bitversion
+
+v1.3.1
+  * Sometime the XML <logo> tag of the diagram is not correctly formed. If exists a <logo> tag,
+    removes it, generate the XML inserting que  Terminal blocks, and finally add the original
+    tag again. It no logo is defined, do nothing.
 
 v1.2.7
   * QET now links cables using ther elements UUID instead of the terminal ID of the elements.

build/run/PYZ-00.toc

@@ -1,4 +1,4 @@
-('/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/build/run/PYZ-00.pyz',
+('/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/build/run/PYZ-00.pyz',
  [('os', '/usr/lib/python3.8/os.py', 'PYMODULE'),
   ('subprocess', '/usr/lib/python3.8/subprocess.py', 'PYMODULE'),
   ('selectors', '/usr/lib/python3.8/selectors.py', 'PYMODULE'),
@@ -18,7 +18,6 @@
    '/usr/lib/python3.8/importlib/machinery.py',
    'PYMODULE'),
   ('importlib', '/usr/lib/python3.8/importlib/__init__.py', 'PYMODULE'),
-  ('importlib.abc', '/usr/lib/python3.8/importlib/abc.py', 'PYMODULE'),
   ('importlib._bootstrap',
    '/usr/lib/python3.8/importlib/_bootstrap.py',
    'PYMODULE'),
@@ -28,6 +27,7 @@
   ('importlib.metadata',
    '/usr/lib/python3.8/importlib/metadata.py',
    'PYMODULE'),
+  ('importlib.abc', '/usr/lib/python3.8/importlib/abc.py', 'PYMODULE'),
   ('configparser', '/usr/lib/python3.8/configparser.py', 'PYMODULE'),
   ('pathlib', '/usr/lib/python3.8/pathlib.py', 'PYMODULE'),
   ('urllib.parse', '/usr/lib/python3.8/urllib/parse.py', 'PYMODULE'),
@@ -343,13 +343,13 @@
   ('posixpath', '/usr/lib/python3.8/posixpath.py', 'PYMODULE'),
   ('stat', '/usr/lib/python3.8/stat.py', 'PYMODULE'),
   ('stringprep', '/usr/lib/python3.8/stringprep.py', 'PYMODULE'),
-  ('_py_abc', '/usr/lib/python3.8/_py_abc.py', 'PYMODULE'),
   ('tracemalloc', '/usr/lib/python3.8/tracemalloc.py', 'PYMODULE'),
+  ('_py_abc', '/usr/lib/python3.8/_py_abc.py', 'PYMODULE'),
   ('src.terminalblock',
-   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/terminalblock.py',
+   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/terminalblock.py',
    'PYMODULE'),
   ('src',
-   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/__init__.py',
+   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/__init__.py',
    'PYMODULE'),
   ('uuid', '/usr/lib/python3.8/uuid.py', 'PYMODULE'),
   ('ctypes.util', '/usr/lib/python3.8/ctypes/util.py', 'PYMODULE'),
@@ -368,13 +368,13 @@
    'PYMODULE'),
   ('xml.etree', '/usr/lib/python3.8/xml/etree/__init__.py', 'PYMODULE'),
   ('src.qetproject',
-   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/qetproject.py',
+   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/qetproject.py',
    'PYMODULE'),
   ('src.main',
-   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/main.py',
+   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/main.py',
    'PYMODULE'),
   ('src.PySimpleGUI',
-   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/PySimpleGUI.py',
+   '/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/PySimpleGUI.py',
    'PYMODULE'),
   ('site',
    '/usr/local/lib/python3.8/dist-packages/PyInstaller/fake-modules/site.py',

build/run/warn-run.txt

@@ -34,7 +34,7 @@ missing module named java - imported by platform (delayed)
 missing module named _winreg - imported by platform (delayed, optional)
 missing module named org - imported by pickle (optional)
 missing module named winreg - imported by importlib._bootstrap_external (conditional), platform (delayed, optional), mimetypes (optional), urllib.request (delayed, conditional, optional)
-missing module named nt - imported by shutil (conditional), importlib._bootstrap_external (conditional), ntpath (optional), pathlib (conditional), ctypes (delayed, conditional), os (delayed, conditional, optional)
+missing module named nt - imported by os (delayed, conditional, optional), ntpath (optional), shutil (conditional), importlib._bootstrap_external (conditional), pathlib (conditional), ctypes (delayed, conditional)
 missing module named pyimod03_importers - imported by /usr/local/lib/python3.8/dist-packages/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py (top-level)
 missing module named 'ctypes.macholib' - imported by ctypes.util (conditional)
 missing module named netbios - imported by uuid (delayed)

build/run/xref-run.html

@@ -92,7 +92,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="run.py"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/run.py" type="text/plain"><tt>run.py</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/run.py" type="text/plain"><tt>run.py</tt></a>
 <span class="moduletype">Script</span>  <div class="import">
 imports:
     <a href="#_bootlocale">_bootlocale</a>
@@ -7084,7 +7084,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
  &#8226;   <a href="#importlib">importlib</a>
  &#8226;   <a href="#importlib._bootstrap">importlib._bootstrap</a>
  &#8226;   <a href="#importlib._bootstrap_external">importlib._bootstrap_external</a>
- &#8226;   <a href="#importlib.abc">importlib.abc</a>
+ &#8226;   <a href="#importlib.machinery">importlib.machinery</a>
  &#8226;   <a href="#sys">sys</a>
  &#8226;   <a href="#types">types</a>
  &#8226;   <a href="#warnings">warnings</a>
@@ -7176,8 +7176,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
   </div>
   <div class="import">
 imported by:
-    <a href="#importlib">importlib</a>
- &#8226;   <a href="#importlib.metadata">importlib.metadata</a>
+    <a href="#importlib.metadata">importlib.metadata</a>
  &#8226;   <a href="#importlib.util">importlib.util</a>
  &#8226;   <a href="#zipimport">zipimport</a>
 
@@ -7199,6 +7198,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
   <div class="import">
 imported by:
     <a href="#ctypes.util">ctypes.util</a>
+ &#8226;   <a href="#importlib">importlib</a>
  &#8226;   <a href="#importlib.abc">importlib.abc</a>
  &#8226;   <a href="#inspect">inspect</a>
  &#8226;   <a href="#pkgutil">pkgutil</a>
@@ -9758,7 +9758,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="src"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/__init__.py" type="text/plain"><tt>src</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/__init__.py" type="text/plain"><tt>src</tt></a>
 <span class="moduletype">Package</span>  <div class="import">
 imported by:
     <a href="#src.PySimpleGUI">src.PySimpleGUI</a>
@@ -9772,7 +9772,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="src.PySimpleGUI"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/PySimpleGUI.py" type="text/plain"><tt>src.PySimpleGUI</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/PySimpleGUI.py" type="text/plain"><tt>src.PySimpleGUI</tt></a>
 <span class="moduletype">SourceModule</span>  <div class="import">
 imports:
     <a href="#base64">base64</a>
@@ -9824,7 +9824,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="src.main"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/main.py" type="text/plain"><tt>src.main</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/main.py" type="text/plain"><tt>src.main</tt></a>
 <span class="moduletype">SourceModule</span>  <div class="import">
 imports:
     <a href="#functools">functools</a>
@@ -9851,7 +9851,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="src.qetproject"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/qetproject.py" type="text/plain"><tt>src.qetproject</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/qetproject.py" type="text/plain"><tt>src.qetproject</tt></a>
 <span class="moduletype">SourceModule</span>  <div class="import">
 imports:
     <a href="#collections">collections</a>
@@ -9875,7 +9875,7 @@ <h1>modulegraph cross reference for pyi_rth__tkinter.py, pyi_rth_inspect.py, pyi
 
 <div class="node">
   <a name="src.terminalblock"></a>
-  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current_v1.2.7/src/terminalblock.py" type="text/plain"><tt>src.terminalblock</tt></a>
+  <a target="code" href="/home/raul/Nextcloud/Proyectos/QET_Terminal_Block/current/src/terminalblock.py" type="text/plain"><tt>src.terminalblock</tt></a>
 <span class="moduletype">SourceModule</span>  <div class="import">
 imports:
     <a href="#logging">logging</a>

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="qet_tb_generator",
-    version="1.3.0",
+    version="1.3.1",
     description="Script that generates terminal blocks & connectors for QElectroTech",
     long_description = """Allows to generate terminal blocks and connectors for QElectroTech electrical diagram software.""",
     author="Raul Roda",

src/main.py

@@ -107,7 +107,7 @@
 # CONSTANTS
 ALL = '-- ALL --'
 THEME = 'SystemDefaultForReal'  # pysimplegui
-VERSION = '1.3.0'
+VERSION = '1.3.1'
 FECHA = 'Nov, 2021'
 TITLE = 'QET Terminal Block Generator - v{}'.format(VERSION)
 STRIP_LONG = 30

src/qetproject.py

@@ -100,7 +100,7 @@ def __init__(self, project_file, fromPage='', \
             self.original_logo_section = logo
             xml = re.sub(regex_logos, '<logos />', xml, 1)  #replaces first ocurrence
         else:
-            self.original_logo_section = '<logos/>'
+            self.original_logo_section = ''
         tmpf = tempfile.NamedTemporaryFile(mode='w', encoding='utf8', delete=False)
         tmpf.write(xml)
         log.info ("Generate temp file {}".format(tmpf.name))