From 05e7474a3314b31fce7965d537009b99d4ec7241 Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Wed, 4 Apr 2018 16:02:35 +0200 Subject: [PATCH] LoadTIFF --- ld2dap/LoadTIFF.py | 32 ++++++++++++++++++++++++++++++++ ld2dap/core/Filter.py | 4 ++-- ld2dap/core/Node.py | 5 +++-- ld2dap/test.py | 9 +++++---- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 ld2dap/LoadTIFF.py diff --git a/ld2dap/LoadTIFF.py b/ld2dap/LoadTIFF.py new file mode 100644 index 0000000..e63830b --- /dev/null +++ b/ld2dap/LoadTIFF.py @@ -0,0 +1,32 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# \file LoadTIFF.py +# \brief TODO +# \author Florent Guiotte +# \version 0.1 +# \date 04 avril 2018 +# +# TODO details + +from core import Input +import numpy as np + +## TODO: dep +import sys +sys.path.append('../triskele/python') +import triskele + +class LoadTIFF(Input): + def __init__(self, tiffFiles): + super().__init__(self.__class__.__name__) + self.files = tiffFiles + + def _process(self, data, metadata): + layers = list() + + for file in self.files: + print('Loading {}'.format(file)) + layers.append(triskele.read(file)) + + return np.stack(layers, axis=2), self.files + diff --git a/ld2dap/core/Filter.py b/ld2dap/core/Filter.py index 916340e..d67334d 100644 --- a/ld2dap/core/Filter.py +++ b/ld2dap/core/Filter.py @@ -13,5 +13,5 @@ from .Output import Output class Filter(Output, Input): """Output should be first""" - def __init__(self): - super().__init__('Filter') + def __init__(self, name='__CHILD__'): + super().__init__('Filter:{}'.format(name)) diff --git a/ld2dap/core/Node.py b/ld2dap/core/Node.py index 6508dda..1a6ca27 100644 --- a/ld2dap/core/Node.py +++ b/ld2dap/core/Node.py @@ -9,7 +9,7 @@ # TODO details -class Node: +class Node(object): def __init__(self, name='A NODE HAS NO NAME'): self.name = name @@ -20,7 +20,8 @@ class Node: self._process(data) def _process(self, data, metadata=None): - raise NotImplementedError('{} should override _process()'.format(self)) + raise NotImplementedError( + '{} should override _process(self, data, metadata)'.format(self)) def _run(self): raise NotImplementedError('{} should override _run()'.format(self)) diff --git a/ld2dap/test.py b/ld2dap/test.py index 21065cd..cea299e 100644 --- a/ld2dap/test.py +++ b/ld2dap/test.py @@ -9,12 +9,13 @@ # TODO details from core import Input, Output, Filter +from LoadTIFF import LoadTIFF def main(): - i = Input() - o = Output() - n = Filter() - f = Filter() + i = LoadTIFF(['../Data/test.tiff']) + o = Output('o') + n = Filter('n') + f = Filter('f') print(n) #n.run() print(n.input)