From 58293a972ca2e77a1661cf99cbfe3e968c7754cc 2012-11-27 21:18:13 From: Miguel Valdez Date: 2012-11-27 21:18:13 Subject: [PATCH] jroprocessing: -Se elimino el metodo setup de la clase VoltageProc debido a que no es usada. -Se agrego el metodo setInput y getOutput a la clase ProcesingUnit jrodataIO: -Se agrego el metodo getOutput a la clase JRODataIO --- diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py index cd62d20..41c259e 100644 --- a/schainpy/model/jrodataIO.py +++ b/schainpy/model/jrodataIO.py @@ -232,7 +232,9 @@ class JRODataIO: raise ValueError, "Not implemented" - + def getOuput(self): + + return self.dataOut class JRODataReader(JRODataIO): diff --git a/schainpy/model/jroprocessing.py b/schainpy/model/jroprocessing.py index 1524f38..324baac 100644 --- a/schainpy/model/jroprocessing.py +++ b/schainpy/model/jroprocessing.py @@ -138,6 +138,14 @@ class ProcessingUnit: if operationConf.type == 'other': self.callObject(operationConf.id, **kwargs) return + + def setInput(self, dataIn): + + self.dataIn = dataIn + + def getOutput(self): + + return self.dataOut class Operation(): @@ -184,18 +192,6 @@ class VoltageProc(ProcessingUnit): self.objectDict = {} self.dataOut = Voltage() - - - def setup(self, dataIn=None, dataOut=None): - - self.dataIn = dataIn - - if self.dataOut == None: - dataOut = Voltage() - - self.dataOut = dataOut - - return self.dataOut def init(self):