schain Commit - r169:661bb8af254a · Jicamarca Repository

Se traslado el codigo antiguo a la carpeta old y se creo la estructura de directorios Model, Controller y GUI

Miguel Valdez - Tue, 20 Nov 2012 14:53:43

r169:661bb8af254a

parent child

Diff options:

Raw Diff | Patch Diff | Download Diff

Side by Side Unified

Hide whitespace changes

Show full context diff

Context file:

r169:661bb8af254a Loading diff...:

Expand all files

schainpy/old/Controller/Controller.py

¶ permalink

schainpy/old/Controller/Controller.py ~~schainpy/Controller/Controller.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Controller/Controller.py to schainpy/old/Controller/Controller.py

schainpy/old/Controller/experiment.cfg

¶ permalink

schainpy/old/Controller/experiment.cfg ~~schainpy/Controller/experiment.cfg~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Controller/experiment.cfg to schainpy/old/Controller/experiment.cfg

schainpy/old/Graphics/BaseGraph.py

¶ permalink

schainpy/old/Graphics/BaseGraph.py ~~schainpy/Graphics/BaseGraph.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/BaseGraph.py to schainpy/old/Graphics/BaseGraph.py

schainpy/old/Graphics/BaseGraph_mpl.py

¶ permalink

schainpy/old/Graphics/BaseGraph_mpl.py ~~schainpy/Graphics/BaseGraph_mpl.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/BaseGraph_mpl.py to schainpy/old/Graphics/BaseGraph_mpl.py

schainpy/old/Graphics/SpectraPlot.py

¶ permalink

schainpy/old/Graphics/SpectraPlot.py ~~schainpy/Graphics/SpectraPlot.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/SpectraPlot.py to schainpy/old/Graphics/SpectraPlot.py

schainpy/old/Graphics/SpectraPlot2.py

¶ permalink

schainpy/old/Graphics/SpectraPlot2.py ~~schainpy/Graphics/SpectraPlot2.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/SpectraPlot2.py to schainpy/old/Graphics/SpectraPlot2.py

schainpy/old/Graphics/VoltagePlot.py

¶ permalink

schainpy/old/Graphics/VoltagePlot.py ~~schainpy/Graphics/VoltagePlot.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/VoltagePlot.py to schainpy/old/Graphics/VoltagePlot.py

schainpy/old/Graphics/__init__.py

¶ permalink

schainpy/old/Graphics/__init__.py ~~schainpy/Graphics/__init__.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/__init__.py to schainpy/old/Graphics/__init__.py

schainpy/old/Graphics/schainPlot.py

¶ permalink

schainpy/old/Graphics/schainPlot.py ~~schainpy/Graphics/schainPlot.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/schainPlot.py to schainpy/old/Graphics/schainPlot.py

schainpy/old/Graphics/schainPlotLib.py

¶ permalink

schainpy/old/Graphics/schainPlotLib.py ~~schainpy/Graphics/schainPlotLib.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/schainPlotLib.py to schainpy/old/Graphics/schainPlotLib.py

schainpy/old/Graphics/schainPlotTypes.py

¶ permalink

schainpy/old/Graphics/schainPlotTypes.py ~~schainpy/Graphics/schainPlotTypes.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Graphics/schainPlotTypes.py to schainpy/old/Graphics/schainPlotTypes.py

schainpy/old/IO/CorrelationIO.py

¶ permalink

schainpy/old/IO/CorrelationIO.py ~~schainpy/IO/CorrelationIO.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/IO/CorrelationIO.py to schainpy/old/IO/CorrelationIO.py

schainpy/old/IO/JRODataIO.py

¶ permalink

schainpy/old/IO/JRODataIO.py ~~schainpy/IO/JRODataIO.py~~ renamed 0 0

Show file before | Show file after | Hide comments

	1	NO CONTENT: file renamed from schainpy/IO/JRODataIO.py to schainpy/old/IO/JRODataIO.py			NO CONTENT: file renamed from schainpy/IO/JRODataIO.py to schainpy/old/IO/JRODataIO.py

NO CONTENT: file renamed from schainpy/IO/JRODataIO.py to schainpy/old/IO/JRODataIO.py

schainpy/old/IO/SpectraIO.py

¶ permalink

schainpy/old/IO/SpectraIO.py ~~schainpy/IO/SpectraIO.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/IO/SpectraIO.py to schainpy/old/IO/SpectraIO.py

schainpy/old/IO/VoltageIO.py

¶ permalink

schainpy/old/IO/VoltageIO.py ~~schainpy/IO/VoltageIO.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/IO/VoltageIO.py to schainpy/old/IO/VoltageIO.py

schainpy/old/IO/__init__.py

¶ permalink

schainpy/old/IO/__init__.py ~~schainpy/IO/__init__.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/IO/__init__.py to schainpy/old/IO/__init__.py

schainpy/old/Model/Correlation.py

¶ permalink

schainpy/old/Model/Correlation.py ~~schainpy/Model/Correlation.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Model/Correlation.py to schainpy/old/Model/Correlation.py

schainpy/old/Model/JROData.py

¶ permalink

schainpy/old/Model/JROData.py ~~schainpy/Model/JROData.py~~ renamed +7 -7

Show file before | Show file after | Hide comments

                 classdocs
                 '''
-                m_RadarControllerHeader = RadarControllerHeader()
+                radarControllerHeaderObj = RadarControllerHeader()
                 m_ProcessingHeader = ProcessingHeader()
-                m_SystemHeader = SystemHeader()
+                systemHeaderObj = SystemHeader()
                 m_BasicHeader = BasicHeader()
                     self.m_ProcessingHeader.deltaHeight = step
                     self.m_ProcessingHeader.numHeights = self.nHeights
-                    self.m_SystemHeader.numChannels = self.nChannels
+                    self.systemHeaderObj.numChannels = self.nChannels
-                    self.m_SystemHeader.numProfiles = self.nProfiles
+                    self.systemHeaderObj.numProfiles = self.nProfiles
                 def updateObjFromHeader(self):
                     xf = xi + self.m_ProcessingHeader.numHeights*step
                     self.heightList = numpy.arange(xi, xf, step)
-                    self.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels)
+                    self.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
-                    self.channelList = numpy.arange(self.m_SystemHeader.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

schainpy/old/Model/JROHeader.py

¶ permalink

schainpy/old/Model/JROHeader.py ~~schainpy/Model/JROHeader.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Model/JROHeader.py to schainpy/old/Model/JROHeader.py

schainpy/old/Model/Spectra.py

¶ permalink

schainpy/old/Model/Spectra.py ~~schainpy/Model/Spectra.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Model/Spectra.py to schainpy/old/Model/Spectra.py

schainpy/old/Model/Voltage.py

¶ permalink

schainpy/old/Model/Voltage.py ~~schainpy/Model/Voltage.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Model/Voltage.py to schainpy/old/Model/Voltage.py

schainpy/old/Model/__init__.py

¶ permalink

schainpy/old/Model/__init__.py ~~schainpy/Model/__init__.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Model/__init__.py to schainpy/old/Model/__init__.py

schainpy/old/Processing/CorrelationProcessor.py

¶ permalink

schainpy/old/Processing/CorrelationProcessor.py ~~schainpy/Processing/CorrelationProcessor.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Processing/CorrelationProcessor.py to schainpy/old/Processing/CorrelationProcessor.py

schainpy/old/Processing/JRONoise.py

¶ permalink

schainpy/old/Processing/JRONoise.py ~~schainpy/Processing/JRONoise.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Processing/JRONoise.py to schainpy/old/Processing/JRONoise.py

schainpy/old/Processing/SpectraProcessor.py

¶ permalink

schainpy/old/Processing/SpectraProcessor.py ~~schainpy/Processing/SpectraProcessor.py~~ renamed +11 -11

Show file before | Show file after | Hide comments

                     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.radarControllerHeaderObj = self.dataInObj.radarControllerHeaderObj.copy()
-                    self.dataOutObj.m_SystemHeader = self.dataInObj.m_SystemHeader.copy()
+                    self.dataOutObj.systemHeaderObj = self.dataInObj.systemHeaderObj.copy()
                     self.dataOutObj.dataType = self.dataInObj.dataType
                     self.dataOutObj.nPairs = self.nPairs
                     self.dataOutObj.nFFTPoints = self.nFFTPoints
                     #self.dataOutObj.data = None
-                    self.dataOutObj.m_SystemHeader.numChannels = self.nChannels
+                    self.dataOutObj.systemHeaderObj.numChannels = self.nChannels
-                    self.dataOutObj.m_SystemHeader.nProfiles = self.nFFTPoints
+                    self.dataOutObj.systemHeaderObj.nProfiles = self.nFFTPoints
                     self.dataOutObj.m_ProcessingHeader.totalSpectra = self.nChannels + self.nPairs
                     self.dataOutObj.m_ProcessingHeader.profilesPerBlock = self.nFFTPoints
                         self.dataOutObj.heightList
                         self.dataOutObj.m_BasicHeader
                         self.dataOutObj.m_ProcessingHeader
-                        self.dataOutObj.m_RadarControllerHeader
+                        self.dataOutObj.radarControllerHeaderObj
-                        self.dataOutObj.m_SystemHeader
+                        self.dataOutObj.systemHeaderObj
                         self.profIndex
                         self.buffer
                         self.dataOutObj.flagNoData
                         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
                         self.dataOutObj.nChannels
                         self.dataOutObj.nPairs
                         self.dataOutObj.m_ProcessingHeader.spectraComb
-                        self.dataOutObj.m_SystemHeader.numChannels
+                        self.dataOutObj.systemHeaderObj.numChannels
                         self.dataOutObj.noise
                     Return:
                     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
                         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
                     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]

schainpy/old/Processing/VoltageProcessor.py

¶ permalink

schainpy/old/Processing/VoltageProcessor.py ~~schainpy/Processing/VoltageProcessor.py~~ renamed +6 -6

Show file before | Show file after | Hide comments

                         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:
                 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]
                         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:
                     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
                         self.dataOutObj.m_ProcessingHeader.blockSize
                         self.dataOutObj.m_ProcessingHeader.numHeights
                         self.dataOutObj.m_ProcessingHeader.firstHeight
-                        self.dataOutObj.m_RadarControllerHeader
+                        self.dataOutObj.radarControllerHeaderObj
                     Return:
 si el metodo se ejecuto con exito caso contrario devuelve 0
                     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):

schainpy/old/Processing/__init__.py

¶ permalink

schainpy/old/Processing/__init__.py ~~schainpy/Processing/__init__.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Processing/__init__.py to schainpy/old/Processing/__init__.py

schainpy/old/Utilities/FtpServer.py

¶ permalink

schainpy/old/Utilities/FtpServer.py ~~schainpy/Utilities/FtpServer.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Utilities/FtpServer.py to schainpy/old/Utilities/FtpServer.py

schainpy/old/Utilities/FtpServerList.py

¶ permalink

schainpy/old/Utilities/FtpServerList.py ~~schainpy/Utilities/FtpServerList.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Utilities/FtpServerList.py to schainpy/old/Utilities/FtpServerList.py

schainpy/old/Utilities/__init__.py

¶ permalink

schainpy/old/Utilities/__init__.py ~~schainpy/Utilities/__init__.py~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from schainpy/Utilities/__init__.py to schainpy/old/Utilities/__init__.py

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages