diff --git a/grum/descs/__init__.py b/grum/descs/__init__.py index 278a64b..d7ca373 100644 --- a/grum/descs/__init__.py +++ b/grum/descs/__init__.py @@ -1,4 +1,5 @@ +from .desc import Description from .imgdesc import ImageDescription from .plotdesc import PlotDescription diff --git a/grum/descs/desc.py b/grum/descs/desc.py new file mode 100644 index 0000000..0c52278 --- /dev/null +++ b/grum/descs/desc.py @@ -0,0 +1,8 @@ + +class Description: + + def to_dict(self): + return {k: v for k, v in self.__dict__.items() if not k.startswith("_") and k != "name" and v is not None} + + + diff --git a/grum/descs/imgdesc.py b/grum/descs/imgdesc.py index 5b171d5..be990ec 100644 --- a/grum/descs/imgdesc.py +++ b/grum/descs/imgdesc.py @@ -1,7 +1,8 @@ import numpy as np +from .desc import Description -class ImageDescription: +class ImageDescription(Description): def __init__(self, name, title=None, xlabel=None, ylabel=None, image=None): self.name = name @@ -41,8 +42,4 @@ class ImageDescription: return res - def to_dict(self): - return {k: v for k, v in self.__dict__.items() if not k.startswith("_") and k != "name" and v is not None} - - diff --git a/grum/descs/plotdesc.py b/grum/descs/plotdesc.py index 45832f3..86a399d 100644 --- a/grum/descs/plotdesc.py +++ b/grum/descs/plotdesc.py @@ -1,5 +1,7 @@ +from .desc import Description -class PlotDescription: + +class PlotDescription(Description): def __init__(self, name, title=None, xlabel=None, ylabel=None, xs=None, ys=None): self.name = name @@ -45,8 +47,4 @@ class PlotDescription: return res - def to_dict(self): - return {k: v for k, v in self.__dict__.items() if not k.startswith("_") and k != "name" and v is not None} - -