warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Image.gv_dir an InitVar

Browse Source 
It is only used during initialization in the __post_init__() function
and does not need to be a proper attribute of the Image dataclass.
https://docs.python.org/3/library/dataclasses.html#init-only-variables
This commit is contained in:
KV 2020-08-29 20:00:49 +02:00
parent c0a11d0dfe
commit ede29cbc95
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wireviz/DataClasses.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from typing import Optional, List, Any, Union from typing import Optional, List, Any, Union
from dataclasses import dataclass, field from dataclasses import dataclass, field, InitVar
from pathlib import Path from pathlib import Path
from wireviz.wv_helper import int2tuple, aspect_ratio from wireviz.wv_helper import int2tuple, aspect_ratio
from wireviz import wv_colors from wireviz import wv_colors
@ -10,7 +10,7 @@ from wireviz import wv_colors
@dataclass @dataclass
class Image: class Image:
gv_dir: Path # Directory of .gv file injected as context during parsing gv_dir: InitVar[Path] # Directory of .gv file injected as context during parsing
# Attributes of the image object <img>: # Attributes of the image object <img>:
src: str src: str
scale: Optional[str] = None # false | true | width | height | both scale: Optional[str] = None # false | true | width | height | both
@ -22,7 +22,7 @@ class Image:
caption: Optional[str] = None caption: Optional[str] = None
# See also HTML doc at https://graphviz.org/doc/info/shapes.html#html # See also HTML doc at https://graphviz.org/doc/info/shapes.html#html
def __post_init__(self): def __post_init__(self, gv_dir):
if self.fixedsize is None: if self.fixedsize is None:
# Default True if any dimension specified unless self.scale also is specified. # Default True if any dimension specified unless self.scale also is specified.
@ -38,10 +38,10 @@ class Image:
# because Graphviz requires both when fixedsize=True. # because Graphviz requires both when fixedsize=True.
if self.height: if self.height:
if not self.width: if not self.width:
self.width = self.height * aspect_ratio(self.gv_dir.joinpath(self.src)) self.width = self.height * aspect_ratio(gv_dir.joinpath(self.src))
else: else:
if self.width: if self.width:
self.height = self.width / aspect_ratio(self.gv_dir.joinpath(self.src)) self.height = self.width / aspect_ratio(gv_dir.joinpath(self.src))
@dataclass @dataclass