From f7735fe71c7973b918aaaed0f4e8dad80c8d7696 2017-11-22 15:30:45
From: jespinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2017-11-22 15:30:45
Subject: [PATCH] Add decimation to jsonify data to web & fix typo KM

---

diff --git a/schainpy/model/graphics/jroplot_data.py b/schainpy/model/graphics/jroplot_data.py
index da783fe..261792b 100644
--- a/schainpy/model/graphics/jroplot_data.py
+++ b/schainpy/model/graphics/jroplot_data.py
@@ -451,7 +451,7 @@ class PlotData(Operation, Process):
                         self.CODE,
                         label,
                         self.getDateTime(self.saveTime).strftime(
-                            '%y%m%d_%H%M%S'),                        
+                            '%Y%m%d_%H%M%S'),                        
                     )
                 )
                 log.log('Saving figure: {}'.format(figname), self.name)
@@ -528,7 +528,7 @@ class PlotSpectraData(PlotData):
         if self.showprofile:
             self.width += 0.8 * self.ncols
 
-        self.ylabel = 'Range [Km]'
+        self.ylabel = 'Range [km]'
 
     def plot(self):
         if self.xaxis == "frequency":
@@ -600,7 +600,7 @@ class PlotCrossSpectraData(PlotData):
         self.nplots = self.nrows * 4
         self.width = 3.4 * self.ncols
         self.height = 3 * self.nrows
-        self.ylabel = 'Range [Km]'
+        self.ylabel = 'Range [km]'
         self.showprofile = False
 
     def plot(self):
@@ -703,7 +703,7 @@ class PlotRTIData(PlotData):
         self.ncols = 1
         self.nrows = len(self.data.channels)
         self.nplots = len(self.data.channels)
-        self.ylabel = 'Range [Km]'
+        self.ylabel = 'Range [km]'
         self.cb_label = 'dB'
         self.titles = ['{} Channel {}'.format(
             self.CODE.upper(), x) for x in range(self.nrows)]
@@ -760,7 +760,7 @@ class PlotCOHData(PlotRTIData):
         self.ncols = 1
         self.nrows = len(self.data.pairs)
         self.nplots = len(self.data.pairs)
-        self.ylabel = 'Range [Km]'
+        self.ylabel = 'Range [km]'
         if self.CODE == 'coh':
             self.cb_label = ''
             self.titles = [
@@ -902,7 +902,7 @@ class PlotParamData(PlotRTIData):
             self.nrows += 1
             self.nplots += 1
 
-        self.ylabel = 'Height [Km]'
+        self.ylabel = 'Height [km]'
         if not self.titles:
             self.titles = self.data.parameters \
                 if self.data.parameters else ['Param {}'.format(x) for x in xrange(self.nrows)]
diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py
index 63d496b..9ce28d9 100644
--- a/schainpy/model/utils/jroutils_publish.py
+++ b/schainpy/model/utils/jroutils_publish.py
@@ -218,10 +218,12 @@ class Data(object):
 
         data = {}
         tm = self.times[-1]
-
+        
         for key in self.data:
             if key in ('spc', 'cspc'):
-                data[key] = roundFloats(self.data[key].tolist())
+                dx = int(self.data[key].shape[1]/MAXNUMX) + 1
+                dy = int(self.data[key].shape[2]/MAXNUMY) + 1
+                data[key] = roundFloats(self.data[key][::, ::dx, ::dy].tolist())
             else:
                 data[key] = roundFloats(self.data[key][tm].tolist())
 
@@ -229,10 +231,12 @@ class Data(object):
         ret['exp_code'] = self.exp_code
         ret['time'] = tm
         ret['interval'] = self.interval
-        ret['ymin'] = self.heights[0]
-        ret['ymax'] = self.heights[-1]
-        ret['ystep'] = self.heights[1] - self.heights[0]
-
+        ret['localtime'] = self.localtime
+        ret['yrange'] = roundFloats(self.heights.tolist())
+        if key in ('spc', 'cspc'):
+            ret['xrange'] = roundFloats(self.xrange[2][::dx].tolist())
+        if hasattr(self, 'pairs'):
+            ret['pairs'] = self.pairs
         return json.dumps(ret)
 
     @property