diff --git a/scripts/codemap.py b/scripts/codemap.py index e2ead92b..4c0371a6 100755 --- a/scripts/codemap.py +++ b/scripts/codemap.py @@ -717,6 +717,7 @@ def main(paths, *, title=None, padding=0, label=False, + no_label=False, **args): # figure out what color should be if color == 'auto': @@ -1100,7 +1101,7 @@ def main(paths, *, else chars_[0]), color=t.color if t.color is not None else colors_[0]) - if label: + if label or (labels and not no_label): if t.label is not None: label__ = t.label else: @@ -1315,6 +1316,10 @@ if __name__ == "__main__": '-l', '--label', action='store_true', help="Render labels.") + parser.add_argument( + '--no-label', + action='store_true', + help="Don't render any labels.") parser.add_argument( '--code-path', type=lambda x: x.split(), diff --git a/scripts/treemap.py b/scripts/treemap.py index 32eba3ca..9745e9bb 100755 --- a/scripts/treemap.py +++ b/scripts/treemap.py @@ -731,6 +731,7 @@ def main(csv_paths, *, title=None, padding=0, label=False, + no_label=False, **args): # figure out what color should be if color == 'auto': @@ -785,18 +786,16 @@ def main(csv_paths, *, file=sys.stderr) sys.exit(-1) - # if by not specified, guess it's anything not in fields/labels/defines + # if by not specified, guess it's anything not in fields/defines if not by: by = [k for k in fields_ if k not in (fields or []) - and k not in (labels or []) and not any(k == k_ for k_, _ in defines)] - # if fields not specified, guess it's anything not in by/labels/defines + # if fields not specified, guess it's anything not in by/defines if not fields: fields = [k for k in fields_ if k not in (by or []) - and k not in (labels or []) and not any(k == k_ for k_, _ in defines)] # then extract the requested dataset @@ -977,7 +976,7 @@ def main(csv_paths, *, else chars_[0]), color=t.color if t.color is not None else colors_[0]) - if label: + if label or (labels and not no_label): if t.label is not None: label__ = t.label else: @@ -1187,6 +1186,10 @@ if __name__ == "__main__": '-l', '--label', action='store_true', help="Render labels.") + parser.add_argument( + '--no-label', + action='store_true', + help="Don't render any labels.") sys.exit(main(**{k: v for k, v in vars(parser.parse_intermixed_args()).items() if v is not None})) diff --git a/scripts/treemapd3.py b/scripts/treemapd3.py index 49092153..7e5a4d69 100755 --- a/scripts/treemapd3.py +++ b/scripts/treemapd3.py @@ -619,14 +619,12 @@ def main(csv_paths, output, *, if not by: by = [k for k in fields_ if k not in (fields or []) - and k not in (labels or []) and not any(k == k_ for k_, _ in defines)] # if fields not specified, guess it's anything not in by/labels/defines if not fields: fields = [k for k in fields_ if k not in (by or []) - and k not in (labels or []) and not any(k == k_ for k_, _ in defines)] # then extract the requested dataset