schain-jc Commit - r1219:a84ca1922528

Fix LT issue in plots add snr option in jrodata

Juan C. Espinoza -

r1219:a84ca1922528

parent child

Context file:

r1219:a84ca1922528

Collapse all files

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

                 MAXNUMX = 100
                 MAXNUMY = 100
-                def __init__(self, code, throttle_value, exp_code, buffering=True):
+                def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False):
                     self.throttle = throttle_value
                     self.exp_code = exp_code
                         self.plottypes = ['noise', 'rti']
                     else:
                         self.plottypes = [code]
+                    if 'snr' not in self.plottypes and snr:
+                        self.plottypes.append('snr')
                     for plot in self.plottypes:
                         self.data[plot] = {}

schainpy/model/graphics/jroplot_base.py +15 -8

                     self.sender_period = kwargs.get('sender_period', 2)
                     self.__throttle_plot = apply_throttle(self.throttle)
                     self.data = PlotterData(
-                        self.CODE, self.throttle, self.exp_code, self.buffering)
+                        self.CODE, self.throttle, self.exp_code, self.buffering, snr=self.showSNR)
                     if self.plot_server:
                         if not self.plot_server.startswith('tcp://'):
                             cmap = plt.get_cmap(self.colormap)
                         cmap.set_bad(self.bgcolor, 1.)
                         self.cmaps.append(cmap)
                     for fig in self.figures:
                         fig.canvas.mpl_connect('key_press_event', self.OnKeyPress)
                         fig.canvas.mpl_connect('scroll_event', self.OnBtnScroll)
                         fig.canvas.mpl_connect('button_press_event', self.onBtnPress)
                         fig.canvas.mpl_connect('motion_notify_event', self.onMotion)
                         fig.canvas.mpl_connect('button_release_event', self.onBtnRelease)
-                        if self.show:
-                            fig.show()
                 def OnKeyPress(self, event):
                     '''
                         fig.canvas.manager.set_window_title('{} - {}'.format(self.title,
                                                                              self.getDateTime(self.data.max_time).strftime('%Y/%m/%d')))
                         fig.canvas.draw()
+                        if self.show:
+                            fig.show()
+                            figpause(0.1)
                         if self.save:
                             self.save_figure(n)
                         if dataOut.useLocalTime:
                             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
                         else:
-                            self.tmin = (self.getDateTime(t).replace(hour=self.xmin, minute=0, second=0) - datetime.datetime(1970, 1, 1)).total_seconds()
+                            self.tmin = (
+                                self.getDateTime(t).replace(
+                                    hour=self.xmin,
+                                    minute=0,
+                                    second=0) - self.getDateTime(0)).total_seconds()
                         self.data.setup()
                         self.isConfig = True
                         tm -= time.timezone
                     if dataOut.useLocalTime and not self.localtime:
                         tm += time.timezone
                     if self.xaxis is 'time' and self.data and (tm - self.tmin) >= self.xrange*60*60:
                         self.save_counter = self.save_period
                         self.__plot()
                     else:
                         self.__throttle_plot(self.__plot)#, coerce=coerce)
-                    figpause(0.01)
                 def close(self):
                     if self.data:

schainpy/model/io/bltrIO_param.py +9 -7

                     Get last file and add it to the list
                     '''
-                    for n in range(self.nTries):
+                    for n in range(self.nTries+1):
-                        log.warning(
+                        if n>0:
-                            "Waiting %0.2f seconds for the next file, try %03d ..." % (self.delay, n+1),
+                            log.warning(
-                            self.name
+                                "Waiting %0.2f seconds for the next file, try %03d ..." % (self.delay, n+1),
+                                self.name
-                        time.sleep(self.delay)
+                            time.sleep(self.delay)
                         file_list = os.listdir(self.path)
                         file_list.sort()
                         if file_list:
                     self.counter_records = 0
                     self.flagIsNewFile = 0
                     self.fileIndex += 1
+                    time.sleep(2)
                     return 1
                             pointer = self.fp.tell()
                             self.readBlock()
                         except:
-                            if self.waitDataBlock(pointer, 38512) == 1:
+                            if self.online and self.waitDataBlock(pointer, 38512) == 1:
                                 continue
                             else:
                                 if not self.setNextFile():

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