From a90d00a536cc58eae91ef84ead97e99e29786b24 Mon Sep 17 00:00:00 2001 From: Luke Campagnola <> Date: Mon, 18 Jun 2012 17:48:33 -0400 Subject: [PATCH] metaarray import fix for flowchart/Filters --- flowchart/library/Filters.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/flowchart/library/Filters.py b/flowchart/library/Filters.py index 051afb91..40c55f05 100644 --- a/flowchart/library/Filters.py +++ b/flowchart/library/Filters.py @@ -8,11 +8,7 @@ from . import functions from .common import * import numpy as np -try: - import metaarray - HAVE_METAARRAY = True -except: - HAVE_METAARRAY = False +import pyqtgraph.metaarray as metaarray class Downsample(CtrlNode): @@ -145,11 +141,11 @@ class Derivative(CtrlNode): nodeName = 'DerivativeFilter' def processData(self, data): - if HAVE_METAARRAY and (hasattr(data, 'implements') and data.implements('MetaArray')): + if hasattr(data, 'implements') and data.implements('MetaArray'): info = data.infoCopy() if 'values' in info[0]: info[0]['values'] = info[0]['values'][:-1] - return MetaArray(data[1:] - data[:-1], info=info) + return metaarray.MetaArray(data[1:] - data[:-1], info=info) else: return data[1:] - data[:-1]