diff --git a/schainpy/model/graphics/jroplot_data.py b/schainpy/model/graphics/jroplot_data.py
index fc954da..d8e31b3 100644
--- a/schainpy/model/graphics/jroplot_data.py
+++ b/schainpy/model/graphics/jroplot_data.py
@@ -118,6 +118,27 @@ class PlotData(Operation, Process):
eachfigure.canvas.manager.set_window_title('{} {} - {}'.format(self.title[n], self.CODE.upper(),
datetime.datetime.fromtimestamp(self.max_time).strftime('%Y/%m/%d')))
+ # if self.save:
+ # if self.ind_plt_ch is False : #standard
+ # figname = os.path.join(self.save, '{}_{}.png'.format(self.CODE,
+ # datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
+ # print 'Saving figure: {}'.format(figname)
+ # self.figure.savefig(figname)
+ # else :
+ # for n, eachfigure in enumerate(self.figurelist):
+ # #add specific name for each channel in channelList
+ # figname = os.path.join(self.save, '{}_{}_{}.png'.format(self.titles[n],self.CODE,
+ # datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
+ #
+ # print 'Saving figure: {}'.format(figname)
+ # eachfigure.savefig(figname)
+
+ if self.ind_plt_ch is False :
+ self.figure.canvas.draw()
+ else :
+ for eachfigure in self.figurelist:
+ eachfigure.canvas.draw()
+
if self.save:
if self.ind_plt_ch is False : #standard
figname = os.path.join(self.save, '{}_{}.png'.format(self.CODE,
@@ -133,11 +154,6 @@ class PlotData(Operation, Process):
print 'Saving figure: {}'.format(figname)
eachfigure.savefig(figname)
- if self.ind_plt_ch is False :
- self.figure.canvas.draw()
- else :
- for eachfigure in self.figurelist:
- eachfigure.canvas.draw()
def plot(self):
@@ -576,11 +592,11 @@ class PlotRTIData(PlotData):
ax.xaxis.set_major_formatter(FuncFormatter(func))
ax.xaxis.set_major_locator(LinearLocator(6))
ax.set_ylabel(self.ylabel)
- # if self.xmin is None:
- # xmin = self.min_time
- # else:
- # xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
- # datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
+ if self.xmin is None:
+ xmin = self.min_time
+ else:
+ xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
+ datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
ax.set_xlim(xmin, xmax)
ax.firsttime = False
else:
@@ -632,11 +648,11 @@ class PlotRTIData(PlotData):
self.axes[n].set_ylabel(self.ylabel)
- # if self.xmin is None:
- # xmin = self.min_time
- # else:
- # xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
- # datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
+ if self.xmin is None:
+ xmin = self.min_time
+ else:
+ xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
+ datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
self.axes[n].set_xlim(xmin, xmax)
self.axes[n].firsttime = False
diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py
index 01cab7a..3884e01 100644
--- a/schainpy/scripts/PPD.py
+++ b/schainpy/scripts/PPD.py
@@ -5,6 +5,7 @@ from schainpy.controller import Project, multiSchain
desc = "HF_EXAMPLE"
path='/home/ci-81/Documents/DATA/HFADATA/hfdata_2017/pdata/sp1_f0'
path = '/media/ci-81/Huancayo/DATA/hfradar_2016/pdata/sp1_f1'
+path = '/media/ci-81/Huancayo/DATA/hfradar_2016/pdata/sp1_f1'
def fiber(cursor, skip, q, dt):
controllerObj = Project()
diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py
index e2dc422..83b6d24 100644
--- a/schainpy/scripts/receiver.py
+++ b/schainpy/scripts/receiver.py
@@ -18,7 +18,7 @@ if __name__ == '__main__':
# proc1.addParameter(name='realtime', value='0', format='bool')
#proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str')
#proc1.addParameter(name='plottypes', value='rti,coh,phase,snr', format='str')
- proc1.addParameter(name='plottypes', value='dop', format='str')
+ proc1.addParameter(name='plottypes', value='snr,dop', format='str')
#proc1.addParameter(name='throttle', value='10', format='int')
@@ -54,7 +54,7 @@ if __name__ == '__main__':
# proc2.addParameter(name='server', value='juanca', format='str')
# proc2.addParameter(name='plottypes', value='snr,dop', format='str')
#
-
+ """
op3 = proc1.addOperation(name='PlotSNRData', optype='other')
op3.addParameter(name='wintitle', value='HF System SNR0', format='str')
op3.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
@@ -62,7 +62,8 @@ if __name__ == '__main__':
op3.addParameter(name='zmin', value='-10', format='int')
op3.addParameter(name='zmax', value='30', format='int')
op3.addParameter(name='SNRthresh', value='0', format='float')
- """
+ op3.addParameter(name='ind_plt_ch',value='1',format = 'bool')
+
#
op5 = proc1.addOperation(name='PlotDOPData', optype='other')
op5.addParameter(name='wintitle', value='HF System DOP', format='str')
diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml
index d63fe86..cf3e5c5 100644
--- a/schainpy/scripts/schain.xml
+++ b/schainpy/scripts/schain.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file