fixes #758

danielhrisca · Aug 29, 2022 · 32a05be · 32a05be
1 parent 8e3669e
commit 32a05be
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/asammdf/blocks/mdf_v3.py b/asammdf/blocks/mdf_v3.py
@@ -538,15 +538,10 @@ def _prepare_record(self, group: Group) -> list:
 
                 if not new_ch.component_addr:
 
-                    if not new_ch.dtype_fmt:
-                        new_ch.dtype_fmt = dtype(
-                            get_fmt_v3(data_type, bit_count, byte_order)
-                        )
-
                     # adjust size to 1, 2, 4 or 8 bytes
                     size = bit_offset + bit_count
 
-                    byte_size, rem = size // 8, size % 8
+                    byte_size, rem = divmod(size, 8)
                     if rem:
                         byte_size += 1
                     bit_size = byte_size * 8
@@ -562,6 +557,11 @@ def _prepare_record(self, group: Group) -> list:
                         elif size > 8:
                             bit_offset += 16 - bit_size
 
+                    if not new_ch.dtype_fmt:
+                        new_ch.dtype_fmt = dtype(
+                            get_fmt_v3(data_type, size, byte_order)
+                        )
+
                     record.append(
                         (
                             new_ch.dtype_fmt,

diff --git a/asammdf/blocks/mdf_v4.py b/asammdf/blocks/mdf_v4.py
@@ -1671,15 +1671,10 @@ def _prepare_record(self, group: Group) -> list:
 
                 if ch_type not in v4c.VIRTUAL_TYPES and not dependency_list:
 
-                    if not new_ch.dtype_fmt:
-                        new_ch.dtype_fmt = dtype(
-                            get_fmt_v4(data_type, bit_count, ch_type)
-                        )
-
                     # adjust size to 1, 2, 4 or 8 bytes
                     size = bit_offset + bit_count
 
-                    byte_size, rem = size // 8, size % 8
+                    byte_size, rem = divmod(size, 8)
                     if rem:
                         byte_size += 1
                     bit_size = byte_size * 8
@@ -1695,6 +1690,11 @@ def _prepare_record(self, group: Group) -> list:
                         elif size > 8:
                             bit_offset += 16 - bit_size
 
+                    if not new_ch.dtype_fmt:
+                        new_ch.dtype_fmt = dtype(
+                            get_fmt_v4(data_type, size, ch_type)
+                        )
+
                     if (
                         bit_offset
                         or new_ch.dtype_fmt.kind in "ui"

diff --git a/asammdf/gui/widgets/plot.py b/asammdf/gui/widgets/plot.py
@@ -3932,23 +3932,25 @@ def keyPressEvent(self, event):
         else:
             handled = True
             if key == QtCore.Qt.Key_Y and modifier == QtCore.Qt.NoModifier:
-                if self.region is not None:
-                    if self.region_lock is not None:
-                        self.region_lock = None
-                        self.region.lines[0].pen.setStyle(QtCore.Qt.SolidLine)
-                        self.region.lines[1].pen.setStyle(QtCore.Qt.SolidLine)
-                        self.region.lines[0].setMovable(True)
-                        self.region.movable = True
-                    else:
-                        self.region_lock = self.region.getRegion()[0]
-                        self.region.lines[0].pen.setStyle(QtCore.Qt.DashDotDotLine)
-                        self.region.lines[0].setMovable(False)
-                        self.region.movable = False
-
-                    self.update()
+                if self.region is None:
+                    event_ = QtGui.QKeyEvent(
+                        QtCore.QEvent.KeyPress, QtCore.Qt.Key_R, QtCore.Qt.NoModifier
+                    )
+                    self.keyPressEvent(event_)
 
-                else:
+                if self.region_lock is not None:
                     self.region_lock = None
+                    self.region.lines[0].pen.setStyle(QtCore.Qt.SolidLine)
+                    self.region.lines[1].pen.setStyle(QtCore.Qt.SolidLine)
+                    self.region.lines[0].setMovable(True)
+                    self.region.movable = True
+                else:
+                    self.region_lock = self.region.getRegion()[0]
+                    self.region.lines[0].pen.setStyle(QtCore.Qt.DashDotDotLine)
+                    self.region.lines[0].setMovable(False)
+                    self.region.movable = False
+
+                self.update()
 
             elif key == QtCore.Qt.Key_X and modifier == QtCore.Qt.NoModifier:
                 if self.region is not None:

diff --git a/asammdf/version.py b/asammdf/version.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """ asammdf version module """
 
-__version__ = "7.1.2.dev4"
+__version__ = "7.2.0.dev1"