Imagelibrary/littlefs
1
0
Fork 1
mirror of https://github.com/littlefs-project/littlefs.git synced 2025-12-26 01:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: maps: Fixed some aspect ratio issues, limited scope

Browse Source 
Replacing -R/--aspect-ratio, --to-ratio now calculates the width/height
_before_ adding decoration such as headers, stack info, etc.

I toying around with generalizing -R/--aspect-ratio to include
decorations, but when Wolfram Alpha spit this mess for the post-header
formula:

      header*r - sqrt(4*v*r + padding^2*r)
  w = ------------------------------------
                        2

I decided maybe a generalized -R/--aspect-ratio is a _bit_ too
complicated for what are supposed to be small standalone Python
scripts...

---

Also fixed the scaling formula, which should've taken the sqrt _after_
multiplying by the aspect ratio:

  w = sqrt(v*r)

I only noticed while trying to solve for the more complicated
post-decoration formula, the difference is pretty minor.
This commit is contained in:
Christopher Haster
2025-04-11 00:53:12 -05:00
parent cb5cbb9241
commit 61ce23ce7e
7 changed files with 170 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/dbgbmap.py
View File

@@ -4350,7 +4350,7 @@ def main_(f, disk, mroots=None, *,
lebesgue=False,
contiguous=False,
to_scale=None,
aspect_ratio=(1,1),
to_ratio=1/1,
tiny=False,
title=None,
title_littlefs=False,
@@ -4542,17 +4542,23 @@ def main_(f, disk, mroots=None, *,
# scale width/height if requested
if (to_scale is not None
and (width is None or height is None)):
# don't include header in scale
width__ = width_
height__ = height_ - (1 if not no_header else 0)
# scale width only
if height is not None:
width_ = mt.ceil((len(bmap) * to_scale) / height_)
width__ = mt.ceil((len(bmap) * to_scale) / max(height__, 1))
# scale height only
elif width is not None:
height_ = mt.ceil((len(bmap) * to_scale) / width_)
height__ = mt.ceil((len(bmap) * to_scale) / max(width__, 1))
# scale based on aspect-ratio
else:
width_ = mt.ceil(mt.sqrt(len(bmap) * to_scale)
* (aspect_ratio[0] / aspect_ratio[1]))
height_ = mt.ceil((len(bmap) * to_scale) / width_)
width__ = mt.ceil(mt.sqrt(len(bmap) * to_scale * to_ratio))
height__ = mt.ceil((len(bmap) * to_scale) / max(width__, 1))
width_ = width__
height_ = height__ + (1 if not no_header else 0)
# create a canvas
canvas = Canvas(
@@ -5048,13 +5054,13 @@ if __name__ == "__main__":
(lambda a, b: a / b)(*(float(v) for v in x.split(':', 1)))
if ':' in x else float(x)),
const=1,
help="Scale the resulting map such that 1 pixel ~= 1/scale "
help="Scale the resulting map such that 1 char ~= 1/scale "
"blocks. Defaults to scale=1. ")
parser.add_argument(
'-R', '--aspect-ratio',
'--to-ratio',
type=lambda x: (
tuple(float(v) for v in x.split(':', 1))
if ':' in x else (float(x), 1)),
(lambda a, b: a / b)(*(float(v) for v in x.split(':', 1)))
if ':' in x else float(x)),
help="Aspect ratio to use with --to-scale. Defaults to 1:1.")
parser.add_argument(
'-t', '--tiny',