fixed draw indent order issue

doc/example/report.md

@@ -1,8 +1,8 @@
 ![memory map diagram](report.png)
 |name|origin|size|remaining|collisions
 |:-|:-|:-|:-|:-|
-|<span style='color:deepskyblue'>kernel</span>|0x10|0x50|-0x10|{'rootfs': '0x50'}|
-|<span style='color:midnightblue'>uboot</span>|0xD0|0x50|-0x10|{'uboot-scr': '0x110'}|
-|<span style='color:darkblue'>rootfs</span>|0x50|0x30|0x10|{'kernel': '0x50'}|
-|<span style='color:dimgray'>dtb</span>|0x90|0x30|0x10|{}|
-|<span style='color:mediumseagreen'>uboot-scr</span>|0x110|0x30|0x2a8|{'uboot': '0x110'}|
+|<span style='color:gray'>kernel</span>|0x10|0x50|-0x10|{'rootfs': '0x50'}|
+|<span style='color:darkviolet'>uboot</span>|0xD0|0x50|-0x10|{'uboot-scr': '0x110'}|
+|<span style='color:aqua'>rootfs</span>|0x50|0x30|0x10|{'kernel': '0x50'}|
+|<span style='color:slateblue'>dtb</span>|0x90|0x30|0x10|{}|
+|<span style='color:lime'>uboot-scr</span>|0x110|0x30|0x2a8|{'uboot': '0x110'}|

mm/diagram.py

@@ -41,8 +41,17 @@ def __init__(self):
         logging.debug("")
         # create a list of region objects populated with input data
         self._region_list = self._process_input()
+
+        # temporarily sort by ascending origin attribute and assign the draw indent
+        self._region_list.sort(key=lambda x: x.origin, reverse=False)
+        region_indent = 0
+        for r in self._region_list:
+            r.draw_indent = region_indent
+            region_indent += 5
+
         # sort in descending order so largest regions are drawn first in z-order (background)
         self._region_list.sort(key=lambda x: x.size, reverse=True)
+
         # output image diagram
         self._create_diagram(self._region_list)
         # output markdown report (refs image)
@@ -53,10 +62,6 @@ def _create_diagram(self, region_list: List[mm.types.Region]):
         # init the main image
         img_main = PIL.Image.new("RGB", (MemoryMap.width, MemoryMap.height), color=MemoryMap.bgcolour)
 
-        # this is the x-axis drawing offset for each region
-        # we increment this each time we draw a region to clearly show overlaps
-        region_offset = 0
-
         # add a new layer (region_img) for each region block
         # to the main image object (img_main)
         for region in region_list:
@@ -66,8 +71,6 @@ def _create_diagram(self, region_list: List[mm.types.Region]):
                 logging.warning("Zero size region skipped")
                 continue
 
-            region_offset = region_offset + 5
-
             ### Region Blocks and text
             region_img = PIL.Image.new("RGBA", (MemoryMap.width - self._legend_width, region.size), color=(255, 255, 0, 5))
             region_canvas = PIL.ImageDraw.Draw(region_img)
@@ -120,7 +123,7 @@ def _create_diagram(self, region_list: List[mm.types.Region]):
             endaddr_text_img = endaddr_text_img.rotate(180)
 
             # paste all the layers onto the main image
-            img_main.paste(region_img, (self._legend_width + region_offset, region.origin), region_img)
+            img_main.paste(region_img, (self._legend_width + region.draw_indent, region.origin), region_img)
             img_main.paste(endaddr_text_img, (0, endaddr - 6))
             img_main.paste(origin_text_img, (0, region.origin - 4))
 

mm/types.py

@@ -26,6 +26,7 @@ def __init__(self, name: str, origin: str, size: str):
         """Number of bytes until next region block"""
         self.collisons: Dict(str, str) = {}
         """Map of collision regions by name (str) and distance (hex)"""
+        self.draw_indent = 0
 
         # both 'lightslategray' and 'lightslategrey' are the same colour
         # and we don't want duplicate colours in our diagram