summaryrefslogtreecommitdiff
path: root/anim/tools
diff options
context:
space:
mode:
Diffstat (limited to 'anim/tools')
-rw-r--r--anim/tools/chart.py27
1 files changed, 16 insertions, 11 deletions
diff --git a/anim/tools/chart.py b/anim/tools/chart.py
index 9dd1314..78ba34d 100644
--- a/anim/tools/chart.py
+++ b/anim/tools/chart.py
@@ -12,26 +12,31 @@ import motion
W = motion.W
# The stage (design/README.md, "5. The frame"; theme.layout.split): the lens band across the
-# top, the program column (source over disassembly) and the state column (registers over
-# stack). A panel of n rows is 32 + 24 n. The clock is over the caption.
+# top as two panels, its drawing over the program column and its view over the state column;
+# the program column (source over disassembly) and the state column (registers over stack).
+# A panel of n rows is 32 + 24 n. The clock is over the caption.
def ph(rows):
return 32 + 24 * rows
-def split(band, source, disasm, slots, backtrace=0):
- top = 48 + (band + 12 if band else 0)
- out = {"band": (64, 48, 1792, band)} if band else {}
- out["source"] = (64, top, 880, ph(source))
- out["disasm"] = (64, top + ph(source) + 12, 880, ph(disasm))
- out["registers"] = (976, top, 880, ph(17))
- out["stack"] = (976, top + ph(17) + 12, 880, ph(slots))
+def split(drawing, view, source, disasm, slots, backtrace=0):
+ out = {}
+ if drawing:
+ out["drawing"] = (64, 48, 880, drawing)
+ out["view"] = (976, 48, 880, view)
+ left = 48 + (drawing + 12 if drawing else 0)
+ right = 48 + (view + 12 if view else 0)
+ out["source"] = (64, left, 880, ph(source))
+ out["disasm"] = (64, left + ph(source) + 12, 880, ph(disasm))
+ out["registers"] = (976, right, 880, ph(17))
+ out["stack"] = (976, right + ph(17) + 12, 880, ph(slots))
if backtrace:
- out["backtrace"] = (976, top + ph(17) + 12 + ph(slots) + 12, 880, ph(backtrace))
+ out["backtrace"] = (976, right + ph(17) + 12 + ph(slots) + 12, 880, ph(backtrace))
return out
# The clock is under the name the instrument gives to words that are not panels ("head"):
# its progress line moves with every step and must not count as a panel starting.
words = {"head": (0, 888, W, 46), "caption": (0, 934, W, 146)}
-none, beside, subject = split(0, 14, 17, 8, 4), split(152, 8, 17, 8), split(248, 10, 11, 4)
+none, beside, subject = split(0, 0, 14, 17, 8, 4), split(152, 152, 8, 17, 8), split(296, 200, 10, 9, 6)
motion.REGIONS.update({
"fib": {**subject, **words},
"sort": {**subject, **words},