##// END OF EJS Templates
schain-jc
RSS
Bug fixed in RTI and Wind Profiler Plots, when data time exceeded the xmax, the new plot generated was overwriting the first one.
Julio Valdez -
r509:7fe23f0913c9
parent child
Show More
Show file before | Show file after | Hide comments
@@ -360,7 +360,7 class WindProfilerPlot(Figure):
360 def __init__(self):
360 def __init__(self):
361
361
362 self.timerange = 2*60*60
362 self.timerange = 2*60*60
363 self.isConfig = False
363 self.__isConfig = False
364 self.__nsubplots = 1
364 self.__nsubplots = 1
365
365
366 self.WIDTH = 800
366 self.WIDTH = 800
@@ -483,9 +483,7 class WindProfilerPlot(Figure):
483 ylabel = "Range (Km)"
483 ylabel = "Range (Km)"
484
484
485 if not self.__isConfig:
485 if not self.__isConfig:
486
486
487
488
489 self.setup(id=id,
487 self.setup(id=id,
490 nplots=nplots,
488 nplots=nplots,
491 wintitle=wintitle,
489 wintitle=wintitle,
@@ -554,18 +552,13 class WindProfilerPlot(Figure):
554 ticksize=9, cblabel='', cbsize="1%", colormap="jet")
552 ticksize=9, cblabel='', cbsize="1%", colormap="jet")
555
553
556 self.draw()
554 self.draw()
557
555
558 if x[1] >= self.axesList[0].xmax:
559 self.counter_imagwr = wr_period
560 self.__isConfig = False
561
562
563 if self.figfile == None:
556 if self.figfile == None:
564 str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S")
557 str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S")
565 self.figfile = self.getFilename(name = str_datetime)
558 self.figfile = self.getFilename(name = str_datetime)
566
559
567 if figpath != '':
560 if figpath != '':
568
561
569 self.counter_imagwr += 1
562 self.counter_imagwr += 1
570 if (self.counter_imagwr>=wr_period):
563 if (self.counter_imagwr>=wr_period):
571 # store png plot to local folder
564 # store png plot to local folder
@@ -574,7 +567,10 class WindProfilerPlot(Figure):
574 name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS)
567 name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS)
575 ftp_filename = os.path.join(figpath, name)
568 ftp_filename = os.path.join(figpath, name)
576 self.saveFigure(figpath, ftp_filename)
569 self.saveFigure(figpath, ftp_filename)
577
570
578 self.counter_imagwr = 0
571 self.counter_imagwr = 0
579
572
580 No newline at end of file
573 if x[1] >= self.axesList[0].xmax:
574 self.counter_imagwr = wr_period
575 self.__isConfig = False
576 self.figfile = None No newline at end of file
Show file before | Show file after | Hide comments
@@ -406,7 +406,7 class CrossSpectraPlot(Figure):
406
406
407 class RTIPlot(Figure):
407 class RTIPlot(Figure):
408
408
409 isConfig = None
409 __isConfig = None
410 __nsubplots = None
410 __nsubplots = None
411
411
412 WIDTHPROF = None
412 WIDTHPROF = None
@@ -416,7 +416,7 class RTIPlot(Figure):
416 def __init__(self):
416 def __init__(self):
417
417
418 self.timerange = 2*60*60
418 self.timerange = 2*60*60
419 self.isConfig = False
419 self.__isConfig = False
420 self.__nsubplots = 1
420 self.__nsubplots = 1
421
421
422 self.WIDTH = 800
422 self.WIDTH = 800
@@ -533,7 +533,7 class RTIPlot(Figure):
533 xlabel = ""
533 xlabel = ""
534 ylabel = "Range (Km)"
534 ylabel = "Range (Km)"
535
535
536 if not self.isConfig:
536 if not self.__isConfig:
537
537
538 nplots = len(channelIndexList)
538 nplots = len(channelIndexList)
539
539
@@ -562,7 +562,7 class RTIPlot(Figure):
562 self.PLOT_POS = plot_pos
562 self.PLOT_POS = plot_pos
563
563
564 self.name = thisDatetime.strftime("%Y%m%d_%H%M%S")
564 self.name = thisDatetime.strftime("%Y%m%d_%H%M%S")
565 self.isConfig = True
565 self.__isConfig = True
566 self.figfile = figfile
566 self.figfile = figfile
567
567
568 self.setWinTitle(title)
568 self.setWinTitle(title)
@@ -589,12 +589,7 class RTIPlot(Figure):
589 ytick_visible=False,
589 ytick_visible=False,
590 grid='x')
590 grid='x')
591
591
592 self.draw()
592 self.draw()
593
594 if x[1] >= self.axesList[0].xmax:
595 self.counter_imagwr = wr_period
596 self.__isConfig = False
597
598
593
599 if self.figfile == None:
594 if self.figfile == None:
600 str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S")
595 str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S")
@@ -612,7 +607,11 class RTIPlot(Figure):
612 self.saveFigure(figpath, ftp_filename)
607 self.saveFigure(figpath, ftp_filename)
613
608
614 self.counter_imagwr = 0
609 self.counter_imagwr = 0
615
610
611 if x[1] >= self.axesList[0].xmax:
612 self.counter_imagwr = wr_period
613 self.__isConfig = False
614 self.figfile = None
616
615
617 class CoherenceMap(Figure):
616 class CoherenceMap(Figure):
618 isConfig = None
617 isConfig = None
General Comments 0
You need to be logged in to leave comments. Login now