schain Commit - r1327:e2336f44bb45 · Jicamarca Repository

Correct localtime in plots, handle exception in send_to_server

Juan C. Espinoza -

r1327:e2336f44bb45

parent child

Context file:

r1327:e2336f44bb45

Collapse all files

schainpy/model/data/jrodata.py +2 -4

                 MAXNUMX = 200
                 MAXNUMY = 200
-                def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False):
+                def __init__(self, code, throttle_value, exp_code, localtime=True, buffering=True, snr=False):
                     self.key = code
                     self.throttle = throttle_value
                     self.buffering = buffering
                     self.ready = False
                     self.flagNoData = False
-                    self.localtime = False
+                    self.localtime = localtime
                     self.data = {}
                     self.meta = {}
                     self.__heights = []
                     for plot in self.plottypes:
                         self.data[plot] = {}
                 def __str__(self):
                     dum = ['{}{}'.format(key, self.shape(key)) for key in self.data]
                     return 'Data[{}][{}]'.format(';'.join(dum), len(self.times))
                         self.pairs = dataOut.pairsList
                     self.interval = dataOut.getTimeInterval()
-                    self.localtime = dataOut.useLocalTime
                     if True in ['spc' in ptype for ptype in self.plottypes]:
                         self.xrange = (dataOut.getFreqRange(1)/1000.,
                                        dataOut.getAcfRange(1), dataOut.getVelRange(1))

schainpy/model/graphics/jroplot_base.py +14 -18

                     self.sender_time = 0
                     self.data = None
                     self.firsttime = True
-                    self.sender_queue = Queue(maxsize=10)
+                    self.sender_queue = Queue(maxsize=60)
                     self.plots_adjust = {'left': 0.125, 'right': 0.9, 'bottom': 0.15, 'top': 0.9, 'wspace': 0.2, 'hspace': 0.2}
                 def __fmtTime(self, x, pos):
                     self.show = kwargs.get('show', True)
                     self.save = kwargs.get('save', False)
                     self.save_period = kwargs.get('save_period', 1)
-                    self.ftp = kwargs.get('ftp', False)
                     self.colormap = kwargs.get('colormap', self.colormap)
                     self.colormap_coh = kwargs.get('colormap_coh', 'jet')
                     self.colormap_phase = kwargs.get('colormap_phase', 'RdBu_r')
                     self.grid = kwargs.get('grid', False)
                     self.pause = kwargs.get('pause', False)
                     self.save_code = kwargs.get('save_code', None)
-                    self.realtime = kwargs.get('realtime', True)
                     self.throttle = kwargs.get('throttle', 0)
                     self.exp_code = kwargs.get('exp_code', None)
                     self.plot_server = kwargs.get('plot_server', False)
                     self.height_index = kwargs.get('height_index', None)
                     self.__throttle_plot = apply_throttle(self.throttle)
                     self.data = PlotterData(
-                        self.CODE, self.throttle, self.exp_code, self.buffering, snr=self.showSNR)
+                        self.CODE, self.throttle, self.exp_code, self.localtime, self.buffering, snr=self.showSNR)
                     if self.plot_server:
                         if not self.plot_server.startswith('tcp://'):
                     for ax in self.axes+self.pf_axes+self.cb_axes:
                         ax.clear()
                         ax.firsttime = True
-                        if ax.cbar:
+                        if hasattr(ax, 'cbar') and ax.cbar:
                             ax.cbar.remove()
                 def __plot(self):
                         self.data.meta['colormap'] = 'Viridis'
                     self.data.meta['interval'] = int(interval)
                     # msg = self.data.jsonify(self.data.tm, self.plot_name, self.plot_type)
-                    self.sender_queue.put(self.data.tm)
+                    try:
+                        self.sender_queue.put(self.data.tm, block=False)
+                    except:
+                        tm = self.sender_queue.get()
+                        self.sender_queue.put(self.data.tm)
                     while True:
                         if self.sender_queue.empty():
                             break
                         tm = self.sender_queue.get()
-                        msg = self.data.jsonify(tm, self.plot_name, self.plot_type)
+                        try:
+                            msg = self.data.jsonify(tm, self.plot_name, self.plot_type)
+                        except:
+                            continue
                         self.socket.send_string(msg)
                         socks = dict(self.poll.poll(5000))
                         if socks.get(self.socket) == zmq.POLLIN:
                             reply = self.socket.recv_string()
                             if reply == 'ok':
                                 log.log("Response from server ok", self.name)
-                                time.sleep(0.1)
+                                time.sleep(0.2)
                                 continue
                             else:
                                 log.warning(
                         t = getattr(dataOut, self.attr_time)
-                        if dataOut.useLocalTime:
+                        if self.localtime:
                             self.getDateTime = datetime.datetime.fromtimestamp
-                            if not self.localtime:
-                                t += time.timezone
                         else:
                             self.getDateTime = datetime.datetime.utcfromtimestamp
-                            if self.localtime:
-                                t -= time.timezone
                         if self.xmin is None:
                             self.tmin = t
                             self.poll.register(self.socket, zmq.POLLIN)
                     tm = getattr(dataOut, self.attr_time)
-                    if not dataOut.useLocalTime and self.localtime:
-                        tm -= time.timezone
-                    if dataOut.useLocalTime and not self.localtime:
-                        tm += time.timezone
                     if self.data and (tm - self.tmin) >= self.xrange*60*60:
                         self.save_counter = self.save_period

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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