@@ -207,11 +207,8 class CrossSpectraPlot(Figure): | |||||
207 | self.saveFigure(figpath, ftp_file) |
|
207 | self.saveFigure(figpath, ftp_file) | |
208 | ftp_filename = os.path.join(figpath,ftp_file) |
|
208 | ftp_filename = os.path.join(figpath,ftp_file) | |
209 |
|
209 | |||
210 | try: |
|
210 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
211 | self.sendByFTP(ftp_filename, server, folder, username, password) |
|
211 | self.counter_imagwr = 0 | |
212 | except: |
|
|||
213 | self.counter_imagwr = 0 |
|
|||
214 | print ValueError, 'Error FTP' |
|
|||
215 |
|
212 | |||
216 | self.counter_imagwr = 0 |
|
213 | self.counter_imagwr = 0 | |
217 |
|
214 | |||
@@ -399,11 +396,8 class RTIPlot(Figure): | |||||
399 | ftp_file = os.path.join(path,'ftp','%s.png'%name) |
|
396 | ftp_file = os.path.join(path,'ftp','%s.png'%name) | |
400 | self.saveFigure(figpath, ftp_file) |
|
397 | self.saveFigure(figpath, ftp_file) | |
401 | ftp_filename = os.path.join(figpath,ftp_file) |
|
398 | ftp_filename = os.path.join(figpath,ftp_file) | |
402 | try: |
|
399 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
403 | self.sendByFTP(ftp_filename, server, folder, username, password) |
|
400 | self.counter_imagwr = 0 | |
404 | except: |
|
|||
405 | self.counter_imagwr = 0 |
|
|||
406 | print ValueError, 'Error FTP' |
|
|||
407 |
|
401 | |||
408 | self.counter_imagwr = 0 |
|
402 | self.counter_imagwr = 0 | |
409 |
|
403 | |||
@@ -612,6 +606,7 class Scope(Figure): | |||||
612 | self.__isConfig = False |
|
606 | self.__isConfig = False | |
613 | self.WIDTH = 600 |
|
607 | self.WIDTH = 600 | |
614 | self.HEIGHT = 200 |
|
608 | self.HEIGHT = 200 | |
|
609 | self.counter_imagwr = 0 | |||
615 |
|
610 | |||
616 | def getSubplots(self): |
|
611 | def getSubplots(self): | |
617 |
|
612 | |||
@@ -638,7 +633,8 class Scope(Figure): | |||||
638 |
|
633 | |||
639 | def run(self, dataOut, id, wintitle="", channelList=None, |
|
634 | def run(self, dataOut, id, wintitle="", channelList=None, | |
640 | xmin=None, xmax=None, ymin=None, ymax=None, save=False, |
|
635 | xmin=None, xmax=None, ymin=None, ymax=None, save=False, | |
641 |
figpath='./', figfile=None, show=True |
|
636 | figpath='./', figfile=None, show=True, wr_period=1, | |
|
637 | server=None, folder=None, username=None, password=None): | |||
642 |
|
638 | |||
643 | """ |
|
639 | """ | |
644 |
|
640 | |||
@@ -705,6 +701,12 class Scope(Figure): | |||||
705 | figfile = self.getFilename(name = date) |
|
701 | figfile = self.getFilename(name = date) | |
706 |
|
702 | |||
707 | self.saveFigure(figpath, figfile) |
|
703 | self.saveFigure(figpath, figfile) | |
|
704 | ||||
|
705 | self.counter_imagwr += 1 | |||
|
706 | if (ftp and (self.counter_imagwr==wr_period)): | |||
|
707 | ftp_filename = os.path.join(figpath,figfile) | |||
|
708 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |||
|
709 | self.counter_imagwr = 0 | |||
708 |
|
710 | |||
709 | class PowerProfilePlot(Figure): |
|
711 | class PowerProfilePlot(Figure): | |
710 | __isConfig = None |
|
712 | __isConfig = None | |
@@ -720,6 +722,7 class PowerProfilePlot(Figure): | |||||
720 |
|
722 | |||
721 | self.WIDTH = 300 |
|
723 | self.WIDTH = 300 | |
722 | self.HEIGHT = 500 |
|
724 | self.HEIGHT = 500 | |
|
725 | self.counter_imagwr = 0 | |||
723 |
|
726 | |||
724 | def getSubplots(self): |
|
727 | def getSubplots(self): | |
725 | ncol = 1 |
|
728 | ncol = 1 | |
@@ -749,7 +752,8 class PowerProfilePlot(Figure): | |||||
749 |
|
752 | |||
750 | def run(self, dataOut, id, wintitle="", channelList=None, |
|
753 | def run(self, dataOut, id, wintitle="", channelList=None, | |
751 | xmin=None, xmax=None, ymin=None, ymax=None, |
|
754 | xmin=None, xmax=None, ymin=None, ymax=None, | |
752 |
save=False, figpath='./', figfile=None, show=True |
|
755 | save=False, figpath='./', figfile=None, show=True, wr_period=1, | |
|
756 | server=None, folder=None, username=None, password=None,): | |||
753 |
|
757 | |||
754 | if channelList == None: |
|
758 | if channelList == None: | |
755 | channelIndexList = dataOut.channelIndexList |
|
759 | channelIndexList = dataOut.channelIndexList | |
@@ -812,6 +816,12 class PowerProfilePlot(Figure): | |||||
812 | figfile = self.getFilename(name = date) |
|
816 | figfile = self.getFilename(name = date) | |
813 |
|
817 | |||
814 | self.saveFigure(figpath, figfile) |
|
818 | self.saveFigure(figpath, figfile) | |
|
819 | ||||
|
820 | self.counter_imagwr += 1 | |||
|
821 | if (ftp and (self.counter_imagwr==wr_period)): | |||
|
822 | ftp_filename = os.path.join(figpath,figfile) | |||
|
823 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |||
|
824 | self.counter_imagwr = 0 | |||
815 |
|
825 | |||
816 | class CoherenceMap(Figure): |
|
826 | class CoherenceMap(Figure): | |
817 | __isConfig = None |
|
827 | __isConfig = None | |
@@ -1011,11 +1021,8 class CoherenceMap(Figure): | |||||
1011 | ftp_file = os.path.join(path,'ftp','%s.png'%name) |
|
1021 | ftp_file = os.path.join(path,'ftp','%s.png'%name) | |
1012 | self.saveFigure(figpath, ftp_file) |
|
1022 | self.saveFigure(figpath, ftp_file) | |
1013 | ftp_filename = os.path.join(figpath,ftp_file) |
|
1023 | ftp_filename = os.path.join(figpath,ftp_file) | |
1014 | try: |
|
1024 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
1015 | self.sendByFTP(ftp_filename, server, folder, username, password) |
|
1025 | self.counter_imagwr = 0 | |
1016 | except: |
|
|||
1017 | self.counter_imagwr = 0 |
|
|||
1018 | print ValueError, 'Error FTP' |
|
|||
1019 |
|
1026 | |||
1020 | self.counter_imagwr = 0 |
|
1027 | self.counter_imagwr = 0 | |
1021 |
|
1028 | |||
@@ -1184,11 +1191,8 class Noise(Figure): | |||||
1184 | ftp_file = os.path.join(path,'ftp','%s.png'%name) |
|
1191 | ftp_file = os.path.join(path,'ftp','%s.png'%name) | |
1185 | self.saveFigure(figpath, ftp_file) |
|
1192 | self.saveFigure(figpath, ftp_file) | |
1186 | ftp_filename = os.path.join(figpath,ftp_file) |
|
1193 | ftp_filename = os.path.join(figpath,ftp_file) | |
1187 | try: |
|
1194 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
1188 | self.sendByFTP(ftp_filename, server, folder, username, password) |
|
1195 | self.counter_imagwr = 0 | |
1189 | except: |
|
|||
1190 | self.counter_imagwr = 0 |
|
|||
1191 | print ValueError, 'Error FTP' |
|
|||
1192 |
|
1196 | |||
1193 | self.counter_imagwr = 0 |
|
1197 | self.counter_imagwr = 0 | |
1194 |
|
1198 | |||
@@ -1264,7 +1268,8 class SpectraHeisScope(Figure): | |||||
1264 |
|
1268 | |||
1265 | def run(self, dataOut, id, wintitle="", channelList=None, |
|
1269 | def run(self, dataOut, id, wintitle="", channelList=None, | |
1266 | xmin=None, xmax=None, ymin=None, ymax=None, save=False, |
|
1270 | xmin=None, xmax=None, ymin=None, ymax=None, save=False, | |
1267 |
figpath='./', figfile=None, ftp=False, wr_period=1, show=True |
|
1271 | figpath='./', figfile=None, ftp=False, wr_period=1, show=True, | |
|
1272 | server=None, folder=None, username=None, password=None): | |||
1268 |
|
1273 | |||
1269 | """ |
|
1274 | """ | |
1270 |
|
1275 | |||
@@ -1351,8 +1356,8 class SpectraHeisScope(Figure): | |||||
1351 |
|
1356 | |||
1352 | self.counter_imagwr += 1 |
|
1357 | self.counter_imagwr += 1 | |
1353 | if (ftp and (self.counter_imagwr==wr_period)): |
|
1358 | if (ftp and (self.counter_imagwr==wr_period)): | |
1354 |
f |
|
1359 | ftp_filename = os.path.join(figpath,figfile) | |
1355 |
self.sendByFTP(f |
|
1360 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
1356 | self.counter_imagwr = 0 |
|
1361 | self.counter_imagwr = 0 | |
1357 |
|
1362 | |||
1358 |
|
1363 | |||
@@ -1407,7 +1412,8 class RTIfromSpectraHeis(Figure): | |||||
1407 | def run(self, dataOut, id, wintitle="", channelList=None, showprofile='True', |
|
1412 | def run(self, dataOut, id, wintitle="", channelList=None, showprofile='True', | |
1408 | xmin=None, xmax=None, ymin=None, ymax=None, |
|
1413 | xmin=None, xmax=None, ymin=None, ymax=None, | |
1409 | timerange=None, |
|
1414 | timerange=None, | |
1410 |
save=False, figpath='./', figfile=None, ftp=False, wr_period=1, show=True |
|
1415 | save=False, figpath='./', figfile=None, ftp=False, wr_period=1, show=True, | |
|
1416 | server=None, folder=None, username=None, password=None): | |||
1411 |
|
1417 | |||
1412 | if channelList == None: |
|
1418 | if channelList == None: | |
1413 | channelIndexList = dataOut.channelIndexList |
|
1419 | channelIndexList = dataOut.channelIndexList | |
@@ -1496,8 +1502,8 class RTIfromSpectraHeis(Figure): | |||||
1496 |
|
1502 | |||
1497 | self.counter_imagwr += 1 |
|
1503 | self.counter_imagwr += 1 | |
1498 | if (ftp and (self.counter_imagwr==wr_period)): |
|
1504 | if (ftp and (self.counter_imagwr==wr_period)): | |
1499 |
f |
|
1505 | ftp_filename = os.path.join(figpath,figfile) | |
1500 |
self.sendByFTP(f |
|
1506 | self.sendByFTP_Thread(ftp_filename, server, folder, username, password) | |
1501 | self.counter_imagwr = 0 |
|
1507 | self.counter_imagwr = 0 | |
1502 |
|
1508 | |||
1503 | if x[1] + (x[1]-x[0]) >= self.axesList[0].xmax: |
|
1509 | if x[1] + (x[1]-x[0]) >= self.axesList[0].xmax: |
General Comments 0
You need to be logged in to leave comments.
Login now