Merge branch 'development' of https://github.com/danielhrisca/asammdf …

…into development/shortcut_tests
danielhrisca · Apr 11, 2024 · 1338a68 · 1338a68
2 parents 7772d07 + 195a082
commit 1338a68
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/src/asammdf/blocks/mdf_v4.py b/src/asammdf/blocks/mdf_v4.py
@@ -6212,10 +6212,10 @@ def attach(
         creator_index = len(self.file_history)
         fh = FileHistory()
         fh.comment = """<FHcomment>
-<TX>Added new embedded attachment from {file_name}</TX>
-<tool_id>{tool}</tool_id>
-<tool_vendor>{vendor}</tool_vendor>
-<tool_version>{version}</tool_version>
+    <TX>Added new embedded attachment from {file_name}</TX>
+    <tool_id>{tool}</tool_id>
+    <tool_vendor>{vendor}</tool_vendor>
+    <tool_version>{version}</tool_version>
 </FHcomment>""".format(
             file_name=file_name if file_name else "bin.bin",
             version=tool.__version__,
@@ -9076,10 +9076,10 @@ def save(
         if add_history_block:
             fh = FileHistory()
             fh.comment = f"""<FHcomment>
-<TX>{comment}</TX>
-<tool_id>{tool.__tool__}</tool_id>
-<tool_vendor>{tool.__vendor__}</tool_vendor>
-<tool_version>{tool.__version__}</tool_version>
+    <TX>{comment}</TX>
+    <tool_id>{tool.__tool__}</tool_id>
+    <tool_vendor>{tool.__vendor__}</tool_vendor>
+    <tool_version>{tool.__version__}</tool_version>
 </FHcomment>"""
 
             self.file_history.append(fh)

diff --git a/src/asammdf/blocks/v2_v3_blocks.py b/src/asammdf/blocks/v2_v3_blocks.py
@@ -24,7 +24,7 @@
 
 import numpy as np
 
-from ..version import __version__
+from .. import tool
 from . import v2_v3_constants as v23c
 from .utils import (
     get_fields,
@@ -2591,7 +2591,9 @@ def __init__(self, **kwargs) -> None:
             version = kwargs["version"]
             self.file_identification = "MDF     ".encode("latin-1")
             self.version_str = version.encode("latin-1") + b"\0" * 4
-            self.program_identification = "amdf{}".format(__version__.replace(".", "")).encode("latin-1")
+            self.program_identification = "{}{}".format(tool.__tool_short__, tool.__version__.replace(".", "")).encode(
+                "latin-1"
+            )
             self.byte_order = v23c.BYTE_ORDER_INTEL if sys.byteorder == "little" else v23c.BYTE_ORDER_MOTOROLA
             self.float_format = 0
             self.mdf_version = int(version.replace(".", ""))

diff --git a/src/asammdf/blocks/v4_blocks.py b/src/asammdf/blocks/v4_blocks.py
@@ -40,7 +40,7 @@
 
 import numpy as np
 
-from ..version import __version__
+from .. import tool
 from . import v4_constants as v4c
 from .utils import (
     block_fields,
@@ -5301,7 +5301,9 @@ def __init__(self, **kwargs) -> None:
             version = kwargs.get("version", "4.00")
             self.file_identification = b"MDF     "
             self.version_str = f"{version}    ".encode()
-            self.program_identification = "amdf{}".format(__version__.replace(".", "")).encode("utf-8")
+            self.program_identification = "{}{}".format(tool.__tool_short__, tool.__version__.replace(".", "")).encode(
+                "utf-8"
+            )
             self.reserved0 = b"\0" * 4
             self.mdf_version = int(version.replace(".", ""))
             self.reserved1 = b"\0" * 30

diff --git a/src/asammdf/tool.py b/src/asammdf/tool.py
@@ -1,6 +1,8 @@
 """ asammdf tool module """
 
-from .version import __version__ as __version__
+from .version import __version__ as v__
 
 __tool__ = "asammdf"
+__tool_short__ = "amdf"
 __vendor__ = "asammdf"
+__version__ = v__