schain Commit - r1336:fc3be1cf6768 · Jicamarca Repository

Update plot parameters

jespinoza -

r1336:fc3be1cf6768

parent child

Context file:

r1336:fc3be1cf6768

schainpy/model/graphics/jroplot_base.py +13 -13

                     self.localtime = kwargs.pop('localtime', True)
                     self.show = kwargs.get('show', True)
                     self.save = kwargs.get('save', False)
-                    self.save_period = kwargs.get('save_period', 60)
+                    self.save_period = kwargs.get('save_period', 0)
                     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.save_code = kwargs.get('save_code', self.CODE)
                     self.throttle = kwargs.get('throttle', 0)
                     self.exp_code = kwargs.get('exp_code', None)
-                    self.plot_server = kwargs.get('plot_server', False)
+                    self.server = kwargs.get('server', False)
                     self.sender_period = kwargs.get('sender_period', 60)
                     self.tag = kwargs.get('tag', '')
                     self.height_index = kwargs.get('height_index', None)
                     self.data = PlotterData(
                         self.CODE, self.throttle, self.exp_code, self.localtime, self.buffering, snr=self.showSNR)
-                    if self.plot_server:
+                    if self.server:
-                        if not self.plot_server.startswith('tcp://'):
+                        if not self.server.startswith('tcp://'):
-                            self.plot_server = 'tcp://{}'.format(self.plot_server)
+                            self.server = 'tcp://{}'.format(self.server)
                         log.success(
-                            'Sending to server: {}'.format(self.plot_server),
+                            'Sending to server: {}'.format(self.server),
                             self.name
                         )
                         if self.save:
                             self.save_figure(n)
-                    if self.plot_server:
+                    if self.server:
                         self.send_to_server()
                 def save_figure(self, n):
                     '''
                     '''
-                    if (self.data.tm - self.save_time) < self.sender_period:
+                    if (self.data.tm - self.save_time) <= self.save_period:
                         return
                     self.save_time = self.data.tm
                         self.poll.unregister(self.socket)
                         time.sleep(0.1)
                         self.socket = self.context.socket(zmq.REQ)
-                        self.socket.connect(self.plot_server)
+                        self.socket.connect(self.server)
                         self.poll.register(self.socket, zmq.POLLIN)
                         break
                         self.data.setup()
                         self.isConfig = True
-                        if self.plot_server:
+                        if self.server:
                             self.context = zmq.Context()
                             self.socket = self.context.socket(zmq.REQ)
-                            self.socket.connect(self.plot_server)
+                            self.socket.connect(self.server)
                             self.poll = zmq.Poller()
                             self.poll.register(self.socket, zmq.POLLIN)
                     tm = getattr(dataOut, self.attr_time)
                     if self.data and 'time' in self.xaxis and (tm - self.tmin) >= self.xrange*60*60:
-                        self.save_counter = self.save_period
+                        self.save_time = tm
                         self.__plot()
                         self.tmin += self.xrange*60*60
                         self.data.setup()
                 def close(self):
                     if self.data and not self.data.flagNoData:
-                        self.save_counter = self.save_period
+                        self.save_time = self.data.tm
                         self.__plot()
                     if self.data and not self.data.flagNoData and self.pause:
                         figpause(10)

schainpy/model/graphics/jroplot_correlation.py +1 -1

                     factor = dataOut.normFactor
                     lenfactor = factor.shape[1]
                     x = dataOut.getLagTRange(1)
-                    y = dataOut.getHeiRange()
+                    y = dataOut.heightList
                     z = copy.copy(dataOut.data_corr[:,:,0,:])
                     for i in range(dataOut.data_corr.shape[0]):

schainpy/model/graphics/jroplot_heispectra.py +1 -1

                         self.timerange = timerange
                     x = dataOut.getTimeRange()
-                    y = dataOut.getHeiRange()
+                    y = dataOut.heightList
                     factor = dataOut.normFactor
                     data = dataOut.data_spc / factor

schainpy/model/graphics/jroplot_spectra.py 0 -2

                             hmax_index = hmax_list[-1]+1
                     x = dataOut.getTimeRange()
-                    #y = dataOut.getHeiRange()
                     thisDatetime = dataOut.datatime

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