schain Commit - r1304:865648b7218f · Jicamarca Repository

Merge branch 'v3.0-devel' of http://jro-dev.igp.gob.pe/rhodecode/schain into v3.0-devel

avaldez -

r1304:865648b7218f

parent child

Context file:

r1304:865648b7218f

schainpy/controller.py +1 -1

                     className = eval(self.name)
-                    if 'Plot' in self.name or 'Writer' in self.name:
+                    if 'Plot' in self.name or 'Writer' in self.name or 'Send' in self.name:
                         kwargs = self.getKwargs()
                         opObj = className(self.id, self.id, self.project_id, self.err_queue, **kwargs)
                         opObj.start()

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

                 Object to hold data to be plotted
                 '''
-                MAXNUMX = 100
+                MAXNUMX = 200
-                MAXNUMY = 100
+                MAXNUMY = 200
                 def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False):
                         data = self.roundFloats(
                             self.data[self.key][::, ::dx, ::dy].tolist())
                     else:
-                        data = self.roundFloats(self.data[self.key][tm].tolist())
                         if self.key is 'noise':
-                            data = [[x] for x in data]
+                            data = [[x] for x in self.roundFloats(self.data[self.key][tm].tolist())]
+                        else:
+                            data = self.roundFloats(self.data[self.key][tm][::, ::dy].tolist())
                     meta = {}
                     ret = {

schainpy/model/graphics/jroplot_base.py +25 -20

             import time
             import numpy
             import datetime
+            from queue import Queue
             from functools import wraps
             from threading import Thread
             import matplotlib
                     self.isConfig = False
                     self.isPlotConfig = False
                     self.save_counter = 1
-                    self.sender_counter = 1
+                    self.sender_time = 0
                     self.data = None
                     self.firsttime = True
+                    self.sender_queue = Queue(maxsize=10)
                     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.throttle = kwargs.get('throttle', 0)
                     self.exp_code = kwargs.get('exp_code', None)
                     self.plot_server = kwargs.get('plot_server', False)
-                    self.sender_period = kwargs.get('sender_period', 1)
+                    self.sender_period = kwargs.get('sender_period', 60)
                     self.height_index = kwargs.get('height_index', None)
                     self.__throttle_plot = apply_throttle(self.throttle)
                     self.data = PlotterData(
                     '''
                     '''
-                    if self.sender_counter < self.sender_period:
+                    interval = self.data.tm - self.sender_time
-                        self.sender_counter += 1
+                    if interval < self.sender_period:
                         return
-                    self.sender_counter = 1
+                    self.sender_time = self.data.tm
-                    self.data.meta['titles'] = self.titles
-                    retries = 2
+                    attrs = ['titles', 'zmin', 'zmax', 'colormap']
+                    for attr in attrs:
+                        value = getattr(self, attr)
+                        if value is not None:
+                            self.data.meta[attr] = getattr(self, attr)
+                    self.data.meta['interval'] = int(interval)
+                    msg = self.data.jsonify(self.plot_name, self.plot_type)
+                    self.sender_queue.put(msg)
                     while True:
-                        self.socket.send_string(self.data.jsonify(self.plot_name, self.plot_type))
+                        if self.sender_queue.empty():
+                            break
+                        self.socket.send_string(self.sender_queue.get())
                         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)
-                                break
+                                time.sleep(0.1)
+                                continue
                             else:
                                 log.warning(
                                     "Malformed reply from server: {}".format(reply), self.name)
                         else:
                             log.warning(
                                 "No response from server, retrying...", self.name)
+                            self.sender_queue.put(msg)
                         self.socket.setsockopt(zmq.LINGER, 0)
                         self.socket.close()
                         self.poll.unregister(self.socket)
-                        retries -= 1
+                        time.sleep(0.1)
-                        if retries == 0:
-                            log.error(
-                                "Server seems to be offline, abandoning", self.name)
-                            self.socket = self.context.socket(zmq.REQ)
-                            self.socket.connect(self.plot_server)
-                            self.poll.register(self.socket, zmq.POLLIN)
-                            time.sleep(1)
-                            break
                         self.socket = self.context.socket(zmq.REQ)
                         self.socket.connect(self.plot_server)
                         self.poll.register(self.socket, zmq.POLLIN)
-                        time.sleep(0.5)
+                        break
                 def setup(self):
                     '''

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