From 1227915de57c79f3a48d21e281f1526e3adc4438 Mon Sep 17 00:00:00 2001 From: KV Date: Tue, 23 Feb 2021 20:44:40 +0100 Subject: [PATCH] Add bgcolor option The same color value is used for html.body.style.background-color and gv.graph.bgcolor to make the diagram fit seamlessly in the HTML output. "bgcolor" is chosen as option name to avoid the dash in the CSS name "background-color". --- src/wireviz/DataClasses.py | 1 + src/wireviz/Harness.py | 2 +- src/wireviz/wv_html.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wireviz/DataClasses.py b/src/wireviz/DataClasses.py index 4eb4507..6be5c31 100644 --- a/src/wireviz/DataClasses.py +++ b/src/wireviz/DataClasses.py @@ -41,6 +41,7 @@ class Metadata: @dataclass class Options: fontname: PlainText = 'arial' + bgcolor: Color = 'WH' color_mode: ColorMode = 'SHORT' mini_bom_mode: bool = True diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 750e51a..b226eb5 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -92,7 +92,7 @@ class Harness: dot.body.append(f'// {APP_URL}') dot.attr('graph', rankdir='LR', ranksep='2', - bgcolor='white', + bgcolor=wv_colors.translate_color(self.options.bgcolor, "HEX"), nodesep='0.33', fontname=self.options.fontname) dot.attr('node', shape='record', diff --git a/src/wireviz/wv_html.py b/src/wireviz/wv_html.py index fe8d7b5..94c8d62 100644 --- a/src/wireviz/wv_html.py +++ b/src/wireviz/wv_html.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import List, Union import re -from wireviz import __version__, APP_NAME, APP_URL +from wireviz import __version__, APP_NAME, APP_URL, wv_colors from wireviz.DataClasses import Metadata, Options from wireviz.wv_helper import flatten2d, open_file_read, open_file_write @@ -16,7 +16,8 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]], file.write(' \n') file.write(f' \n') file.write(f' {metadata.title}\n') - file.write(f'\n') + file.write(f'\n') file.write(f'

{metadata.title}

\n') if metadata.description: