From 661bb8af254a9566df54232f3645a67509f109e4 2012-11-20 14:53:43 From: Miguel Valdez Date: 2012-11-20 14:53:43 Subject: [PATCH] Se traslado el codigo antiguo a la carpeta old y se creo la estructura de directorios Model, Controller y GUI --- diff --git a/schainpy/Controller/Controller.py b/schainpy/old/Controller/Controller.py similarity index 100% rename from schainpy/Controller/Controller.py rename to schainpy/old/Controller/Controller.py diff --git a/schainpy/Controller/experiment.cfg b/schainpy/old/Controller/experiment.cfg similarity index 100% rename from schainpy/Controller/experiment.cfg rename to schainpy/old/Controller/experiment.cfg diff --git a/schainpy/Graphics/BaseGraph.py b/schainpy/old/Graphics/BaseGraph.py similarity index 100% rename from schainpy/Graphics/BaseGraph.py rename to schainpy/old/Graphics/BaseGraph.py diff --git a/schainpy/Graphics/BaseGraph_mpl.py b/schainpy/old/Graphics/BaseGraph_mpl.py similarity index 100% rename from schainpy/Graphics/BaseGraph_mpl.py rename to schainpy/old/Graphics/BaseGraph_mpl.py diff --git a/schainpy/Graphics/SpectraPlot.py b/schainpy/old/Graphics/SpectraPlot.py similarity index 100% rename from schainpy/Graphics/SpectraPlot.py rename to schainpy/old/Graphics/SpectraPlot.py diff --git a/schainpy/Graphics/SpectraPlot2.py b/schainpy/old/Graphics/SpectraPlot2.py similarity index 100% rename from schainpy/Graphics/SpectraPlot2.py rename to schainpy/old/Graphics/SpectraPlot2.py diff --git a/schainpy/Graphics/VoltagePlot.py b/schainpy/old/Graphics/VoltagePlot.py similarity index 100% rename from schainpy/Graphics/VoltagePlot.py rename to schainpy/old/Graphics/VoltagePlot.py diff --git a/schainpy/Graphics/__init__.py b/schainpy/old/Graphics/__init__.py similarity index 100% rename from schainpy/Graphics/__init__.py rename to schainpy/old/Graphics/__init__.py diff --git a/schainpy/Graphics/schainPlot.py b/schainpy/old/Graphics/schainPlot.py similarity index 100% rename from schainpy/Graphics/schainPlot.py rename to schainpy/old/Graphics/schainPlot.py diff --git a/schainpy/Graphics/schainPlotLib.py b/schainpy/old/Graphics/schainPlotLib.py similarity index 100% rename from schainpy/Graphics/schainPlotLib.py rename to schainpy/old/Graphics/schainPlotLib.py diff --git a/schainpy/Graphics/schainPlotTypes.py b/schainpy/old/Graphics/schainPlotTypes.py similarity index 100% rename from schainpy/Graphics/schainPlotTypes.py rename to schainpy/old/Graphics/schainPlotTypes.py diff --git a/schainpy/IO/CorrelationIO.py b/schainpy/old/IO/CorrelationIO.py similarity index 100% rename from schainpy/IO/CorrelationIO.py rename to schainpy/old/IO/CorrelationIO.py diff --git a/schainpy/IO/JRODataIO.py b/schainpy/old/IO/JRODataIO.py similarity index 100% rename from schainpy/IO/JRODataIO.py rename to schainpy/old/IO/JRODataIO.py diff --git a/schainpy/IO/SpectraIO.py b/schainpy/old/IO/SpectraIO.py similarity index 100% rename from schainpy/IO/SpectraIO.py rename to schainpy/old/IO/SpectraIO.py diff --git a/schainpy/IO/VoltageIO.py b/schainpy/old/IO/VoltageIO.py similarity index 100% rename from schainpy/IO/VoltageIO.py rename to schainpy/old/IO/VoltageIO.py diff --git a/schainpy/IO/__init__.py b/schainpy/old/IO/__init__.py similarity index 100% rename from schainpy/IO/__init__.py rename to schainpy/old/IO/__init__.py diff --git a/schainpy/Model/Correlation.py b/schainpy/old/Model/Correlation.py similarity index 100% rename from schainpy/Model/Correlation.py rename to schainpy/old/Model/Correlation.py diff --git a/schainpy/Model/JROData.py b/schainpy/old/Model/JROData.py similarity index 89% rename from schainpy/Model/JROData.py rename to schainpy/old/Model/JROData.py index 3f75c87..c6b8b15 100644 --- a/schainpy/Model/JROData.py +++ b/schainpy/old/Model/JROData.py @@ -39,11 +39,11 @@ class JROData(Data): classdocs ''' - m_RadarControllerHeader = RadarControllerHeader() + radarControllerHeaderObj = RadarControllerHeader() m_ProcessingHeader = ProcessingHeader() - m_SystemHeader = SystemHeader() + systemHeaderObj = SystemHeader() m_BasicHeader = BasicHeader() @@ -86,8 +86,8 @@ class JROData(Data): self.m_ProcessingHeader.deltaHeight = step self.m_ProcessingHeader.numHeights = self.nHeights - self.m_SystemHeader.numChannels = self.nChannels - self.m_SystemHeader.numProfiles = self.nProfiles + self.systemHeaderObj.numChannels = self.nChannels + self.systemHeaderObj.numProfiles = self.nProfiles def updateObjFromHeader(self): @@ -96,10 +96,10 @@ class JROData(Data): xf = xi + self.m_ProcessingHeader.numHeights*step self.heightList = numpy.arange(xi, xf, step) - self.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels) - self.channelList = numpy.arange(self.m_SystemHeader.numChannels) + self.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) + self.channelList = numpy.arange(self.systemHeaderObj.numChannels) self.nHeights = len(self.heightList) - self.nProfiles = self.m_SystemHeader.numProfiles + self.nProfiles = self.systemHeaderObj.numProfiles self.nChannels = len(self.channelList) \ No newline at end of file diff --git a/schainpy/Model/JROHeader.py b/schainpy/old/Model/JROHeader.py similarity index 100% rename from schainpy/Model/JROHeader.py rename to schainpy/old/Model/JROHeader.py diff --git a/schainpy/Model/Spectra.py b/schainpy/old/Model/Spectra.py similarity index 100% rename from schainpy/Model/Spectra.py rename to schainpy/old/Model/Spectra.py diff --git a/schainpy/Model/Voltage.py b/schainpy/old/Model/Voltage.py similarity index 100% rename from schainpy/Model/Voltage.py rename to schainpy/old/Model/Voltage.py diff --git a/schainpy/Model/__init__.py b/schainpy/old/Model/__init__.py similarity index 100% rename from schainpy/Model/__init__.py rename to schainpy/old/Model/__init__.py diff --git a/schainpy/Processing/CorrelationProcessor.py b/schainpy/old/Processing/CorrelationProcessor.py similarity index 100% rename from schainpy/Processing/CorrelationProcessor.py rename to schainpy/old/Processing/CorrelationProcessor.py diff --git a/schainpy/Processing/JRONoise.py b/schainpy/old/Processing/JRONoise.py similarity index 100% rename from schainpy/Processing/JRONoise.py rename to schainpy/old/Processing/JRONoise.py diff --git a/schainpy/Processing/SpectraProcessor.py b/schainpy/old/Processing/SpectraProcessor.py similarity index 93% rename from schainpy/Processing/SpectraProcessor.py rename to schainpy/old/Processing/SpectraProcessor.py index e9b9bae..ab92820 100644 --- a/schainpy/Processing/SpectraProcessor.py +++ b/schainpy/old/Processing/SpectraProcessor.py @@ -107,8 +107,8 @@ class SpectraProcessor: self.dataOutObj.channelIndexList = self.dataInObj.channelIndexList self.dataOutObj.m_BasicHeader = self.dataInObj.m_BasicHeader.copy() self.dataOutObj.m_ProcessingHeader = self.dataInObj.m_ProcessingHeader.copy() - self.dataOutObj.m_RadarControllerHeader = self.dataInObj.m_RadarControllerHeader.copy() - self.dataOutObj.m_SystemHeader = self.dataInObj.m_SystemHeader.copy() + self.dataOutObj.radarControllerHeaderObj = self.dataInObj.radarControllerHeaderObj.copy() + self.dataOutObj.systemHeaderObj = self.dataInObj.systemHeaderObj.copy() self.dataOutObj.dataType = self.dataInObj.dataType self.dataOutObj.nPairs = self.nPairs @@ -118,8 +118,8 @@ class SpectraProcessor: self.dataOutObj.nFFTPoints = self.nFFTPoints #self.dataOutObj.data = None - self.dataOutObj.m_SystemHeader.numChannels = self.nChannels - self.dataOutObj.m_SystemHeader.nProfiles = self.nFFTPoints + self.dataOutObj.systemHeaderObj.numChannels = self.nChannels + self.dataOutObj.systemHeaderObj.nProfiles = self.nFFTPoints self.dataOutObj.m_ProcessingHeader.totalSpectra = self.nChannels + self.nPairs self.dataOutObj.m_ProcessingHeader.profilesPerBlock = self.nFFTPoints @@ -199,8 +199,8 @@ class SpectraProcessor: self.dataOutObj.heightList self.dataOutObj.m_BasicHeader self.dataOutObj.m_ProcessingHeader - self.dataOutObj.m_RadarControllerHeader - self.dataOutObj.m_SystemHeader + self.dataOutObj.radarControllerHeaderObj + self.dataOutObj.systemHeaderObj self.profIndex self.buffer self.dataOutObj.flagNoData @@ -208,7 +208,7 @@ class SpectraProcessor: self.dataOutObj.nPairs self.dataOutObj.nChannels self.dataOutObj.nProfiles - self.dataOutObj.m_SystemHeader.numChannels + self.dataOutObj.systemHeaderObj.numChannels self.dataOutObj.m_ProcessingHeader.totalSpectra self.dataOutObj.m_ProcessingHeader.profilesPerBlock self.dataOutObj.m_ProcessingHeader.numHeights @@ -435,7 +435,7 @@ class SpectraProcessor: self.dataOutObj.nChannels self.dataOutObj.nPairs self.dataOutObj.m_ProcessingHeader.spectraComb - self.dataOutObj.m_SystemHeader.numChannels + self.dataOutObj.systemHeaderObj.numChannels self.dataOutObj.noise Return: @@ -494,7 +494,7 @@ class SpectraProcessor: self.dataOutObj.m_ProcessingHeader.spectraComb = spectraComb self.dataOutObj.m_ProcessingHeader.totalSpectra = nChannels + nPairs - self.dataOutObj.m_SystemHeader.numChannels = nChannels + self.dataOutObj.systemHeaderObj.numChannels = nChannels self.dataOutObj.nChannels = nChannels self.dataOutObj.m_ProcessingHeader.blockSize = blocksize @@ -565,7 +565,7 @@ class SpectraProcessor: self.dataOutObj.m_ProcessingHeader.numHeights self.dataOutObj.m_ProcessingHeader.blockSize self.dataOutObj.m_ProcessingHeader.firstHeight - self.dataOutObj.m_RadarControllerHeader.numHeights + self.dataOutObj.radarControllerHeaderObj.numHeights Return: None @@ -612,7 +612,7 @@ class SpectraProcessor: self.dataOutObj.m_ProcessingHeader.blockSize = blockSize self.dataOutObj.m_ProcessingHeader.numHeights = nHeights self.dataOutObj.m_ProcessingHeader.firstHeight = firstHeight - self.dataOutObj.m_RadarControllerHeader.numHeights = nHeights + self.dataOutObj.radarControllerHeaderObj.numHeights = nHeights self.dataOutObj.heightList = self.dataOutObj.heightList[minIndex:maxIndex+1] diff --git a/schainpy/Processing/VoltageProcessor.py b/schainpy/old/Processing/VoltageProcessor.py similarity index 96% rename from schainpy/Processing/VoltageProcessor.py rename to schainpy/old/Processing/VoltageProcessor.py index 0ede1d7..3cc32b0 100644 --- a/schainpy/Processing/VoltageProcessor.py +++ b/schainpy/old/Processing/VoltageProcessor.py @@ -252,7 +252,7 @@ class VoltageProcessor: return 0 if code == None: - code = self.dataOutObj.m_RadarControllerHeader.code + code = self.dataOutObj.radarControllerHeaderObj.code ncode, nbaud = code.shape if len(self.decoderObjList) <= self.decoderObjIndex: @@ -271,7 +271,7 @@ class VoltageProcessor: def filterByHei(self, window): if window == None: - window = self.dataOutObj.m_RadarControllerHeader.txA / self.dataOutObj.m_ProcessingHeader.deltaHeight[0] + window = self.dataOutObj.radarControllerHeaderObj.txA / self.dataOutObj.m_ProcessingHeader.deltaHeight[0] newdelta = self.dataOutObj.m_ProcessingHeader.deltaHeight[0] * window dim1 = self.dataOutObj.data.shape[0] @@ -310,7 +310,7 @@ class VoltageProcessor: self.dataOutObj.channelIndexList self.dataOutObj.nChannels self.dataOutObj.m_ProcessingHeader.totalSpectra - self.dataOutObj.m_SystemHeader.numChannels + self.dataOutObj.systemHeaderObj.numChannels self.dataOutObj.m_ProcessingHeader.blockSize Return: @@ -332,7 +332,7 @@ class VoltageProcessor: self.dataOutObj.nChannels = nChannels self.dataOutObj.m_ProcessingHeader.totalSpectra = 0 - self.dataOutObj.m_SystemHeader.numChannels = nChannels + self.dataOutObj.systemHeaderObj.numChannels = nChannels self.dataOutObj.m_ProcessingHeader.blockSize = data.size return 1 @@ -398,7 +398,7 @@ class VoltageProcessor: self.dataOutObj.m_ProcessingHeader.blockSize self.dataOutObj.m_ProcessingHeader.numHeights self.dataOutObj.m_ProcessingHeader.firstHeight - self.dataOutObj.m_RadarControllerHeader + self.dataOutObj.radarControllerHeaderObj Return: 1 si el metodo se ejecuto con exito caso contrario devuelve 0 @@ -425,7 +425,7 @@ class VoltageProcessor: self.dataOutObj.m_ProcessingHeader.blockSize = data.size self.dataOutObj.m_ProcessingHeader.numHeights = nHeights self.dataOutObj.m_ProcessingHeader.firstHeight = firstHeight - self.dataOutObj.m_RadarControllerHeader.numHeights = nHeights + self.dataOutObj.radarControllerHeaderObj.numHeights = nHeights return 1 def selectProfilesByValue(self,indexList, nProfiles): diff --git a/schainpy/Processing/__init__.py b/schainpy/old/Processing/__init__.py similarity index 100% rename from schainpy/Processing/__init__.py rename to schainpy/old/Processing/__init__.py diff --git a/schainpy/Utilities/FtpServer.py b/schainpy/old/Utilities/FtpServer.py similarity index 100% rename from schainpy/Utilities/FtpServer.py rename to schainpy/old/Utilities/FtpServer.py diff --git a/schainpy/Utilities/FtpServerList.py b/schainpy/old/Utilities/FtpServerList.py similarity index 100% rename from schainpy/Utilities/FtpServerList.py rename to schainpy/old/Utilities/FtpServerList.py diff --git a/schainpy/Utilities/__init__.py b/schainpy/old/Utilities/__init__.py similarity index 100% rename from schainpy/Utilities/__init__.py rename to schainpy/old/Utilities/__init__.py