schain Commit - r914:9d82fa5b564c · Jicamarca Repository

schainpy/scripts/0, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/[], created 644 +1 0

	@@ -0,0 +1,1
				1	=: ERROR: cannot open `=' (No such file or directory)

schainpy/scripts/host, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/password, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/path, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/protocol, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/username, created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/{ created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/{-s} created 644 0 0

NO CONTENT: new file 100644

schainpy/scripts/{}}}, created 644 0 0

NO CONTENT: new file 100644

schainpy/model/graphics/jroplot_data.py +3 -5

                     print 'plotting...{}'.format(self.CODE)
+                    if self.show:
+                        self.figure.show()
                     self.plot()
                     self.figure.suptitle('{} {} - Date:{}'.format(self.title, self.CODE.upper(),
                                                                   datetime.datetime.utcfromtimestamp(self.max_time).strftime('%y/%m/%d %H:%M:%S')))
                             n += 1
                     self.figure.subplots_adjust(left=0.1, right=0.95, bottom=0.15, top=0.85, wspace=0.9, hspace=0.5)
-                    self.figure.show()
                 def plot(self):
                         ax.firsttime = True
                         self.axes.append(ax)
                     self.figure.subplots_adjust(hspace=0.5)
-                    self.figure.show()
                 def plot(self):
                         self.axes.append(ax)
                     self.figure.subplots_adjust(hspace=0.5)
-                    self.figure.show()
             class PlotNoiseData(PlotData):
                 CODE = 'noise'
                     self.ax = self.figure.add_subplot(self.nrows, self.ncols, 1)
                     self.ax.firsttime = True
-                    self.figure.show()
                 def plot(self):
                     x = self.times

schainpy/model/utils/jroutils_publish.py +16 -4

             def decimate(z):
                 # dx = int(len(self.x)/self.__MAXNUMX) + 1
                 dy = int(len(z[0])/MAXNUMY) + 1
                 return z[::, ::dy]
             class throttle(object):
                         self.zmq_socket.connect(address)
                         time.sleep(1)
                 def publish_data(self):
                     self.dataOut.finished = False
                     if self.mqtt is 1:
                         if plottype == 'phase':
                             self.data[plottype][t] = self.dataOut.getCoherence(phase=True)
                         if self.realtime:
+            <<<<<<< HEAD
                             self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist())
                             self.data_web['timestamp'] = t
+            =======
+                            if plottype == 'spc':
+                                self.data_web[plottype] = roundFloats(decimate(self.data[plottype]).tolist())
+                            else:
+                                self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist())
+                            self.data_web['time'] = t
+            >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812
                             self.data_web['interval'] = self.dataOut.getTimeInterval()
                             self.data_web['type'] = plottype
                 def run(self):
                     print '[Starting] {} from {}'.format(self.name, self.address)
                         context = zmq.Context()
                         sender_web_config = context.socket(zmq.PUB)
                         if 'tcp://' in self.plot_address:
-                            print self.plot_address
                             dum, address, port = self.plot_address.split(':')
                             conf_address = '{}:{}:{}'.format(dum, address, int(port)+1)
                         else:
                             conf_address = self.plot_address + '.config'
                         sender_web_config.bind(conf_address)
+            <<<<<<< HEAD
+            =======
+                        time.sleep(1)
+            >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812
                         for kwargs in self.operationKwargs.values():
                             if 'plot' in kwargs:
+                                print '[Sending] Config data to web for {}'.format(kwargs['code'].upper())
                                 sender_web_config.send_string(json.dumps(kwargs))
-                                print kwargs
                         self.isWebConfig = True

	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