Updoot stuff 🎺

This commit is contained in:
Florent Guiotte 2018-04-13 12:03:51 +02:00
parent f024ea8c45
commit 8e4e6e0ef4
4 changed files with 17 additions and 23 deletions

View File

@ -24,29 +24,20 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"load = ld2dap.LoadTIFF('../Data/test.tiff')\n", "load = ld2dap.LoadTIFF(('../Data/test.tiff', '../Data/test2.tiff'))\n",
"trsh = ld2dap.Treshold(1e4)\n", "trsh = ld2dap.Treshold(1e4)\n",
"aps = ld2dap.AttributeProfiles(area=[100, 1e3, 1e4])\n",
"aps2 = ld2dap.AttributeProfiles(area=[100, 1e3, 1e4])\n",
"\n",
"disp = ld2dap.ShowFig(fname=None)\n", "disp = ld2dap.ShowFig(fname=None)\n",
"out = ld2dap.RawOutput()" "out = ld2dap.RawOutput()\n",
] "\n",
}, "aps2.input = aps\n",
{ "out.input = aps\n",
"cell_type": "code", "disp.input = aps\n",
"execution_count": null, "aps.input = trsh\n",
"metadata": {},
"outputs": [],
"source": [
"disp.input = trsh\n",
"trsh.input = load\n", "trsh.input = load\n",
"out.input = trsh" "\n",
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"disp.run()" "disp.run()"
] ]
}, },

View File

@ -69,7 +69,10 @@ class AttributeProfiles(Filter):
raise NotImplementedError('Nested filtering not implemented yet') raise NotImplementedError('Nested filtering not implemented yet')
for att in ['area', 'sd', 'moi']: for att in ['area', 'sd', 'moi']:
stack_new = Stack(stack_offset * stack.begin, att_offset[att], if att_offset[att] == 0:
continue
stack_new = Stack(stack_offset * stack.begin, att_offset[att],
stack.desc[0], stack.symb[0]) stack.desc[0], stack.symb[0])
for old_desc, new_desc in zip(stack_new.desc, att_desc[att]): for old_desc, new_desc in zip(stack_new.desc, att_desc[att]):

View File

@ -19,7 +19,7 @@ import triskele
class LoadTIFF(Input): class LoadTIFF(Input):
def __init__(self, tiffFiles): def __init__(self, tiffFiles):
super().__init__(self.__class__.__name__) super().__init__(self.__class__.__name__)
self.files = tiffFiles if isinstance(tiffFiles, list) else [tiffFiles] self.files = tiffFiles if isinstance(tiffFiles, (tuple, list)) else [tiffFiles]
def _process(self, data, metadata): def _process(self, data, metadata):
layers = list() layers = list()

View File

@ -18,7 +18,7 @@ def main():
i = LoadTIFF(['Data/test.tiff', 'Data/test2.tiff']) i = LoadTIFF(['Data/test.tiff', 'Data/test2.tiff'])
t = Treshold(1e4) t = Treshold(1e4)
ap = APs(np.array([100,1e3,1e4])) ap = APs(np.array([100,1e3,1e4]))
o = SaveFig('test.png') o = SaveFig('Res/test.png')
s = ShowFig(None) s = ShowFig(None)
t.input = i t.input = i