From fb9ede38dd50c274452dc5bc457a22807ef2ebea 2012-02-27 14:35:09
From: Miguel Valdez <miguel.urco@jro.igp.gob.pe>
Date: 2012-02-27 14:35:09
Subject: [PATCH] Grafico de espectros actualizado

---

diff --git a/schainpy/Graphics/BaseGraph.py b/schainpy/Graphics/BaseGraph.py
index c6186f8..3118976 100644
--- a/schainpy/Graphics/BaseGraph.py
+++ b/schainpy/Graphics/BaseGraph.py
@@ -211,7 +211,7 @@ class BaseGraph:
         self.ylabel = ylabel
         self.__colormap = colormap
           
-    def plotBox(self, xmin, xmax, ymin, ymax, xopt=None, yopt=None):
+    def plotBox(self, xmin, xmax, ymin, ymax, xopt=None, yopt=None, nolabels=False):
         """
         
         """
@@ -230,7 +230,8 @@ class BaseGraph:
         
         plplot.plbox(xopt, 0.0, 0, yopt, 0.0, 0)
         
-        plplot.pllab(self.xlabel, self.ylabel, self.title)
+        if not(nolabels):
+            plplot.pllab(self.xlabel, self.ylabel, self.title)
 
     
     def colorbarPlot(self, xmin=0., xmax=1., ymin=0., ymax=1.):
@@ -457,7 +458,7 @@ class ColorPlot():
         self.__showColorbar = False
         self.__showPowerProfile = True
         
-        self.__szchar = 0.7
+        self.__szchar = 0.65
         self.__xrange = None
         self.__yrange = None
         self.__zrange = None
@@ -486,7 +487,7 @@ class ColorPlot():
             
             cmapObj = BaseGraph()
             cmapObj.setName(key)
-            cmapObj.setOpt("bc","bcmt")
+            cmapObj.setOpt("bc","bcmtv")
             cmapObj.setup(title="dBs",
                           xlabel="",
                           ylabel="",
@@ -534,10 +535,10 @@ class ColorPlot():
     def setScreenPos(self, width='small'):
         
         if width == 'small':
-            xi = 0.13; yi = 0.12; xw = 0.86; yw = 0.70; xcmapw = 0.05; xpoww = 0.26; deltaxcmap = 0.02; deltaxpow = 0.05
+            xi = 0.13; yi = 0.12; xw = 0.86; yw = 0.70; xcmapw = 0.04; xpoww = 0.25; deltaxcmap = 0.02; deltaxpow = 0.06
         
         if width == 'medium':
-            xi = 0.07; yi = 0.10; xw = 0.90; yw = 0.60; xcmapw = 0.05; xpoww = 0.24; deltaxcmap = 0.02; deltaxpow = 0.06
+            xi = 0.07; yi = 0.10; xw = 0.90; yw = 0.60; xcmapw = 0.04; xpoww = 0.24; deltaxcmap = 0.02; deltaxpow = 0.06
         
         if self.__showColorbar:
             xw -= xcmapw + deltaxcmap
@@ -594,12 +595,18 @@ class ColorPlot():
         if zmin == None: zmin = numpy.nanmin(data)
         if zmax == None: zmax = numpy.nanmax(data)
         
+        plplot.plschr(0.0, self.__szchar)
+        
         self.m_BaseGraph.plotBox(xmin, xmax, ymin, ymax)
         self.m_BaseGraph.basicPcolorPlot(data, x, y, xmin, xmax, ymin, ymax, zmin, zmax)
         
         if self.__showColorbar:
+            
+            
             key = "colorbar"
             cmapObj = self.graphObjDict[key]
+            
+            plplot.plschr(0.0, self.__szchar-0.05)
             cmapObj.plotBox(0., 1., zmin, zmax)
             cmapObj.colorbarPlot(0., 1., zmin, zmax)
         
@@ -613,9 +620,13 @@ class ColorPlot():
             powObj = self.graphObjDict[key]
             
             plplot.pllsty(2)
-            powObj.plotBox(zmin, zmax, ymin, ymax)
+            plplot.plschr(0.0, self.__szchar-0.05)
+            powObj.plotBox(zmin, zmax, ymin, ymax, nolabels=True)
+            
             plplot.pllsty(1)
+            plplot.plschr(0.0, self.__szchar)
             powObj.plotBox(zmin, zmax, ymin, ymax, xopt='bc', yopt='bc')
+            
             plplot.plcol0(9)
             powObj.basicXYPlot(power, heis)
             plplot.plcol0(1)
diff --git a/schainpy/Graphics/SpectraPlot.py b/schainpy/Graphics/SpectraPlot.py
index 0195ac6..336864b 100644
--- a/schainpy/Graphics/SpectraPlot.py
+++ b/schainpy/Graphics/SpectraPlot.py
@@ -7,6 +7,7 @@ Created on Feb 7, 2012
 
 import os, sys
 import numpy
+import datetime
 import plplot
 
 path = os.path.split(os.getcwd())[0]
@@ -102,7 +103,10 @@ class Spectrum():
         plplot.pladv(0)
         plplot.plssub(nx, nx)
         
-        self.__isPlotIni = True     
+        self.__nx = nx
+        self.__ny = nx
+        self.__isPlotIni = True
+         
     
     def plotData(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, titleList=None, xlabelList=None, ylabelList=None, showColorbar=False, showPowerProfile=True, XAxisAsTime=False):
         
@@ -124,6 +128,9 @@ class Spectrum():
         x = numpy.arange(nX)        
         y = self.m_Spectra.heights
         
+        thisDatetime = datetime.datetime.fromtimestamp(self.m_Spectra.m_BasicHeader.utc)
+        txtDate = "Self Spectra - Date: %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S"))
+        
         if xmin == None: xmin = x[0]
         if xmax == None: xmax = x[-1]
         if ymin == None: ymin = y[0]
@@ -132,6 +139,8 @@ class Spectrum():
         if zmax == None: zmax = numpy.nanmax(abs(data))
         
         plplot.plbop()
+        
+        plplot.plssub(self.__nx, self.__ny)
         for i in range(self.nGraphs):
             self.graphObjList[i].iniSubpage()
             self.graphObjList[i].plotData(data[i,:,:],
@@ -143,8 +152,11 @@ class Spectrum():
                                           ymax=ymax,
                                           zmin=zmin,
                                           zmax=zmax)
-            
         
+        plplot.plssub(1,0)
+        plplot.pladv(0)
+        plplot.plvpor(0., 1., 0., 1.)
+        plplot.plmtex("t",-1., 0.5, 0.5, txtDate)
         plplot.plflush()
         plplot.pleop()