Get bits

.github/workflows/build.yml

@@ -12,6 +12,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+           submodules: 'recursive'
+           token: ${{ secrets.SUBMODULE_PAT }}
 
       - name: Set up Python
         uses: actions/setup-python@v5

.github/workflows/coveralls.yml

@@ -12,6 +12,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+           submodules: 'recursive'
+           token: ${{ secrets.SUBMODULE_PAT }}
 
       - name: Set up Python
         uses: actions/setup-python@v5

.github/workflows/main.yml

@@ -17,6 +17,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+           submodules: 'recursive'
+           token: ${{ secrets.SUBMODULE_PAT }}
 
       - name: Set up Python
         uses: actions/setup-python@v5

.github/workflows/wheels.yml

@@ -13,6 +13,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+           submodules: 'recursive'
+           token: ${{ secrets.SUBMODULE_PAT }}
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v5

.gitignore

@@ -20,7 +20,7 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
+/lib/
 lib64/
 parts/
 sdist/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ext/libdeflate"]
+	path = ext/libdeflate
+	url = https://github.com/ebiggers/libdeflate

CMakeLists.txt

@@ -1,24 +1,26 @@
-cmake_minimum_required(VERSION 3.15...3.26)
-
-project(
-  ${SKBUILD_PROJECT_NAME}
-  LANGUAGES C
-  VERSION ${SKBUILD_PROJECT_VERSION})
+cmake_minimum_required(VERSION 3.26...3.29)
+project(${SKBUILD_PROJECT_NAME} LANGUAGES C VERSION ${SKBUILD_PROJECT_VERSION})
 
 find_package(
   Python
+  REQUIRED
   COMPONENTS
   Interpreter
   Development.Module
   ${SKBUILD_SABI_COMPONENT}
   NumPy
-  REQUIRED)
+  )
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(LIBDEFLATE_COMPRESSION_SUPPORT OFF)
+set(LIBDEFLATE_GZIP_SUPPORT OFF)
+set(LIBDEFLATE_BUILD_GZIP OFF)
+
+  # Add submodule libdeflate
+add_subdirectory(ext/libdeflate EXCLUDE_FROM_ALL)
 
-python_add_library(cutils
-                   MODULE
-                   src/asammdf/blocks/cutils.c
-                   WITH_SOABI USE_SABI 3.9)
+python_add_library(cutils MODULE WITH_SOABI USE_SABI 3.9 src/asammdf/blocks/cutils.c)
 
-target_link_libraries(cutils PRIVATE Python::NumPy)
+target_link_libraries(cutils PRIVATE Python::NumPy libdeflate::libdeflate_static)
 
 install(TARGETS cutils DESTINATION "asammdf/blocks")

LICENSE

@@ -163,3 +163,34 @@ whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
+
+--------------------------------------------------------------------------------
+
+3rdparty dependency libdeflate is statically linked. 
+libdeflate has the following license:
+
+
+Copyright 2016 Eric Biggers
+Copyright 2024 Google LLC
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--------------------------------------------------------------------------------

pyproject.toml

@@ -103,7 +103,7 @@ skip = ["pp*", "*_ppc64le", "*-musllinux*", "*_s390x"]
 
 [tool.ruff]
 target-version = "py39"
-extend-exclude = ["./src/asammdf/gui/ui"]
+extend-exclude = ["./src/asammdf/gui/ui", "./ext"]
 force-exclude = true
 
 [tool.ruff.lint]

src/asammdf/__init__.py

@@ -15,7 +15,7 @@
 from .blocks.utils import load_channel_names_from_file
 from .gui import plot
 from .mdf import MDF, SUPPORTED_VERSIONS
-from .signal import Signal
+from .signal import InvalidationArray, Signal
 from .version import __version__
 
 try:
@@ -28,6 +28,7 @@
 __all__ = [
     "MDF",
     "SUPPORTED_VERSIONS",
+    "InvalidationArray",
     "Signal",
     "Source",
     "__cextension__",

src/asammdf/blocks/bus_logging_utils.py

@@ -396,10 +396,16 @@ def extract_mux(
                 sig_name = sig.name
 
             try:
+                scale_ranges = getattr(sig, "scale_ranges", None)
+                if scale_ranges:
+                    unit = scale_ranges[0]["unit"] or ""
+                else:
+                    unit = sig.unit or ""
+
                 signals[sig_name] = {
                     "name": sig_name,
                     "comment": sig.comment or "",
-                    "unit": sig.unit or "",
+                    "unit": unit,
                     "samples": samples if raw else apply_conversion(samples, sig, ignore_value2text_conversion),
                     "conversion": get_conversion(sig) if raw else None,
                     "t": t_,
@@ -441,8 +447,24 @@ def get_conversion(signal: Signal) -> v4b.ChannelConversion | None:
 
     a, b = float(signal.factor), float(signal.offset)
 
-    if signal.values:
-        conv = {}
+    conv = {}
+
+    scale_ranges = getattr(signal, "scale_ranges", None)
+    if scale_ranges:
+        for i, scale_info in enumerate(scale_ranges):
+            conv[f"upper_{i}"] = scale_info["max"]
+            conv[f"lower_{i}"] = scale_info["min"]
+            conv[f"text_{i}"] = from_dict({"a": scale_info["factor"], "b": scale_info["offset"]})
+
+        for i, (val, text) in enumerate(signal.values.items(), len(scale_ranges)):
+            conv[f"upper_{i}"] = val
+            conv[f"lower_{i}"] = val
+            conv[f"text_{i}"] = text
+
+        conv["default"] = from_dict({"a": a, "b": b})
+
+    elif signal.values:
+
         for i, (val, text) in enumerate(signal.values.items()):
             conv[f"upper_{i}"] = val
             conv[f"lower_{i}"] = val