##// END OF EJS Templates
Bug fixed in SignalChain GUI:...
Miguel Valdez -
r581:cd9db1f6f595
parent child
Show More
@@ -732,7 +732,15 class Project():
732 def getProcUnitObj(self, id):
732 def getProcUnitObj(self, id):
733
733
734 return self.procUnitConfObjDict[id]
734 return self.procUnitConfObjDict[id]
735
735
736 def getProcUnitObjByName(self, name):
737
738 for obj in self.procUnitConfObjDict.values():
739 if obj.name == name:
740 return obj
741
742 return None
743
736 def makeXml(self):
744 def makeXml(self):
737
745
738 projectElement = Element('Project')
746 projectElement = Element('Project')
@@ -244,6 +244,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
244 self.__ftpProcUnitAdded = True
244 self.__ftpProcUnitAdded = True
245 self.__ftpProcUnitId = puObj.getId()
245 self.__ftpProcUnitId = puObj.getId()
246
246
247 opObj = puObj.getOperationObj(name="run")
248 self.saveFTPvalues(opObj)
249
247 self.console.clear()
250 self.console.clear()
248 self.console.append("The selected xml file has been loaded successfully")
251 self.console.append("The selected xml file has been loaded successfully")
249 # self.refreshPUWindow(datatype=datatype,puObj=puObj)
252 # self.refreshPUWindow(datatype=datatype,puObj=puObj)
@@ -1796,8 +1799,13 class BasicWindow(QMainWindow, Ui_BasicWindow):
1796 self.console.append("You have to save the plots before sending them to FTP Server")
1799 self.console.append("You have to save the plots before sending them to FTP Server")
1797 return 0
1800 return 0
1798
1801
1802 if not self.temporalFTP.create:
1803 self.temporalFTP.setwithoutconfiguration()
1804
1799 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
1805 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
1800 self.createFTPProcUnitView(server, username, password, remotefolder, localfolder)
1806 self.createFTPProcUnitView(server, username, password, remotefolder,
1807 ftp_wei, exp_code, sub_exp_code, plot_pos,
1808 localfolder=localfolder)
1801 else:
1809 else:
1802 self.removeFTPProcUnitView()
1810 self.removeFTPProcUnitView()
1803
1811
@@ -2269,8 +2277,13 class BasicWindow(QMainWindow, Ui_BasicWindow):
2269 self.console.append("You have to save the plots before sending them to FTP Server")
2277 self.console.append("You have to save the plots before sending them to FTP Server")
2270 return 0
2278 return 0
2271
2279
2280 if not self.temporalFTP.create:
2281 self.temporalFTP.setwithoutconfiguration()
2282
2272 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
2283 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
2273 self.createFTPProcUnitView(server, username, password, remotefolder, localfolder)
2284 self.createFTPProcUnitView(server, username, password, remotefolder,
2285 ftp_wei, exp_code, sub_exp_code, plot_pos,
2286 localfolder=localfolder)
2274 else:
2287 else:
2275 self.removeFTPProcUnitView()
2288 self.removeFTPProcUnitView()
2276
2289
@@ -3770,10 +3783,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
3770 self.temporalFTP.setwithoutconfiguration()
3783 self.temporalFTP.setwithoutconfiguration()
3771 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
3784 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
3772
3785
3773 opObj.addParameter(name='server', value=server, format='str')
3786 # opObj.addParameter(name='server', value=server, format='str')
3774 opObj.addParameter(name='folder', value=remotefolder, format='str')
3787 # opObj.addParameter(name='folder', value=remotefolder, format='str')
3775 opObj.addParameter(name='username', value=username, format='str')
3788 # opObj.addParameter(name='username', value=username, format='str')
3776 opObj.addParameter(name='password', value=password, format='str')
3789 # opObj.addParameter(name='password', value=password, format='str')
3777
3790
3778 if ftp_wei:
3791 if ftp_wei:
3779 opObj.addParameter(name='ftp_wei', value=int(ftp_wei), format='int')
3792 opObj.addParameter(name='ftp_wei', value=int(ftp_wei), format='int')
@@ -3799,14 +3812,17 class BasicWindow(QMainWindow, Ui_BasicWindow):
3799
3812
3800 opObj.addParameter(name='wr_period', value=value, format='int')
3813 opObj.addParameter(name='wr_period', value=value, format='int')
3801
3814
3802 def createFTPProcUnitView(self, server, username, password, remotefolder, localfolder='./', extension='.png', period='60', protocol='ftp'):
3815 def createFTPProcUnitView(self, server, username, password, remotefolder,
3816 ftp_wei, exp_code, sub_exp_code, plot_pos,
3817 localfolder='./', extension='.png', period='60', protocol='ftp'):
3803
3818
3804 if self.__ftpProcUnitAdded:
3819 projectObj = self.getSelectedProjectObj()
3805 procUnitConfObj = self.__puObjDict[self.__ftpProcUnitId]
3820 procUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
3806 procUnitConfObj.removeOperations()
3821
3807 else:
3822 if not procUnitConfObj:
3808 projectObj = self.getSelectedProjectObj()
3809 procUnitConfObj = projectObj.addProcUnit(name="SendToServer")
3823 procUnitConfObj = projectObj.addProcUnit(name="SendToServer")
3824 else:
3825 procUnitConfObj.removeOperations()
3810
3826
3811 procUnitConfObj.addParameter(name='server', value=server, format='str')
3827 procUnitConfObj.addParameter(name='server', value=server, format='str')
3812 procUnitConfObj.addParameter(name='username', value=username, format='str')
3828 procUnitConfObj.addParameter(name='username', value=username, format='str')
@@ -3817,6 +3833,11 class BasicWindow(QMainWindow, Ui_BasicWindow):
3817 procUnitConfObj.addParameter(name='period', value=period, format='int')
3833 procUnitConfObj.addParameter(name='period', value=period, format='int')
3818 procUnitConfObj.addParameter(name='protocol', value=protocol, format='str')
3834 procUnitConfObj.addParameter(name='protocol', value=protocol, format='str')
3819
3835
3836 procUnitConfObj.addParameter(name='ftp_wei', value=ftp_wei, format='str')
3837 procUnitConfObj.addParameter(name='exp_code', value=exp_code, format='str')
3838 procUnitConfObj.addParameter(name='sub_exp_code', value=sub_exp_code, format='str')
3839 procUnitConfObj.addParameter(name='plot_pos', value=plot_pos, format='str')
3840
3820 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
3841 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
3821
3842
3822 self.__ftpProcUnitAdded = True
3843 self.__ftpProcUnitAdded = True
@@ -3824,16 +3845,18 class BasicWindow(QMainWindow, Ui_BasicWindow):
3824
3845
3825 def removeFTPProcUnitView(self):
3846 def removeFTPProcUnitView(self):
3826
3847
3827 if not self.__ftpProcUnitAdded:
3848 projectObj = self.getSelectedProjectObj()
3849 procUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
3850
3851 self.__ftpProcUnitAdded = False
3852 self.__ftpProcUnitId = None
3853
3854 if not procUnitConfObj:
3828 return
3855 return
3829
3856
3830 procUnitConfObj = self.__puObjDict[self.__ftpProcUnitId]
3831 procUnitConfObj.removeOperations()
3857 procUnitConfObj.removeOperations()
3832
3858
3833 self.__puObjDict.pop(procUnitConfObj.getId())
3859 self.__puObjDict.pop(procUnitConfObj.getId())
3834
3835 self.__ftpProcUnitAdded = False
3836 self.__ftpProcUnitId = None
3837
3860
3838 def bufferProject(self, caracteristica, principal, description):
3861 def bufferProject(self, caracteristica, principal, description):
3839
3862
@@ -4395,7 +4418,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4395 status = 'enable'
4418 status = 'enable'
4396 self.bufferSpectra("Spectra Plot", "FTP", status)
4419 self.bufferSpectra("Spectra Plot", "FTP", status)
4397 self.showWr_Period(puObj, opObj, nameplotop="Spectra Plot")
4420 self.showWr_Period(puObj, opObj, nameplotop="Spectra Plot")
4398 self.saveFTPvalues(opObj)
4421 # self.saveFTPvalues(opObj)
4399
4422
4400 opObj = puObj.getOperationObj(name='CrossSpectraPlot')
4423 opObj = puObj.getOperationObj(name='CrossSpectraPlot')
4401 # opObj = puObj.getOpObjfromParamValue(value="CrossSpectraPlot")
4424 # opObj = puObj.getOpObjfromParamValue(value="CrossSpectraPlot")
@@ -4472,7 +4495,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4472 status = 'enable'
4495 status = 'enable'
4473 self.bufferSpectra("Cross Spectra Plot", "FTP", status)
4496 self.bufferSpectra("Cross Spectra Plot", "FTP", status)
4474 self.showWr_Period(puObj, opObj, nameplotop="Cross Spectra Plot")
4497 self.showWr_Period(puObj, opObj, nameplotop="Cross Spectra Plot")
4475 self.saveFTPvalues(opObj)
4498 # self.saveFTPvalues(opObj)
4476
4499
4477 opObj = puObj.getOperationObj(name='RTIPlot')
4500 opObj = puObj.getOperationObj(name='RTIPlot')
4478 # opObj = puObj.getOpObjfromParamValue(value="RTIPlot")
4501 # opObj = puObj.getOpObjfromParamValue(value="RTIPlot")
@@ -4565,7 +4588,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4565 status = 'enable'
4588 status = 'enable'
4566 self.bufferSpectra("RTI Plot", "FTP", status)
4589 self.bufferSpectra("RTI Plot", "FTP", status)
4567 self.showWr_Period(puObj, opObj, nameplotop="RTI Plot")
4590 self.showWr_Period(puObj, opObj, nameplotop="RTI Plot")
4568 self.saveFTPvalues(opObj)
4591 # self.saveFTPvalues(opObj)
4569
4592
4570 opObj = puObj.getOperationObj(name='CoherenceMap')
4593 opObj = puObj.getOperationObj(name='CoherenceMap')
4571 # opObj = puObj.getOpObjfromParamValue(value="CoherenceMap")
4594 # opObj = puObj.getOpObjfromParamValue(value="CoherenceMap")
@@ -4658,7 +4681,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4658 status = 'enable'
4681 status = 'enable'
4659 self.bufferSpectra("Coherence Map Plot", "FTP", status)
4682 self.bufferSpectra("Coherence Map Plot", "FTP", status)
4660 self.showWr_Period(puObj, opObj, nameplotop="Coherence Map Plot")
4683 self.showWr_Period(puObj, opObj, nameplotop="Coherence Map Plot")
4661 self.saveFTPvalues(opObj)
4684 # self.saveFTPvalues(opObj)
4662
4685
4663
4686
4664 opObj = puObj.getOperationObj(name='PowerProfilePlot')
4687 opObj = puObj.getOperationObj(name='PowerProfilePlot')
@@ -4729,7 +4752,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4729 status = 'enable'
4752 status = 'enable'
4730 self.bufferSpectra("PowerProfile Plot", "FTP", status)
4753 self.bufferSpectra("PowerProfile Plot", "FTP", status)
4731 self.showWr_Period(puObj, opObj, nameplotop="PowerProfile Plot")
4754 self.showWr_Period(puObj, opObj, nameplotop="PowerProfile Plot")
4732 self.saveFTPvalues(opObj)
4755 # self.saveFTPvalues(opObj)
4733
4756
4734 # noise
4757 # noise
4735 opObj = puObj.getOperationObj(name='Noise')
4758 opObj = puObj.getOperationObj(name='Noise')
@@ -4809,33 +4832,34 class BasicWindow(QMainWindow, Ui_BasicWindow):
4809 status = 'enable'
4832 status = 'enable'
4810 self.bufferSpectra("Noise Plot", "FTP", status)
4833 self.bufferSpectra("Noise Plot", "FTP", status)
4811 self.showWr_Period(puObj, opObj, nameplotop="Noise Plot")
4834 self.showWr_Period(puObj, opObj, nameplotop="Noise Plot")
4812 self.saveFTPvalues(opObj)
4835 # self.saveFTPvalues(opObj)
4836
4837 projectObj = self.getSelectedProjectObj()
4838 ftpProcUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
4813
4839
4814 if self.temporalFTP.create:
4840 if ftpProcUnitConfObj:
4815 self.bufferSpectra("FTP", "Server", self.temporalFTP.server)
4841
4816 self.bufferSpectra("FTP", "Folder", self.temporalFTP.folder)
4842 opObj = ftpProcUnitConfObj.getOperationObj(name='run')
4817 self.bufferSpectra("FTP", "Username", self.temporalFTP.username)
4843
4818 self.bufferSpectra("FTP", "Password", '*'*len(self.temporalFTP.password))
4844 server = opObj.getParameterValue(parameterName='server')
4819 self.bufferSpectra("FTP", "Ftp_wei", self.temporalFTP.ftp_wei)
4845 folder = opObj.getParameterValue(parameterName='remotefolder')
4820 self.bufferSpectra("FTP", "Exp_code", self.temporalFTP.exp_code)
4846 username = opObj.getParameterValue(parameterName='username')
4821 self.bufferSpectra("FTP", "Sub_exp_code", self.temporalFTP.sub_exp_code)
4847 password = opObj.getParameterValue(parameterName='password')
4822 self.bufferSpectra("FTP", "Plot_pos", self.temporalFTP.plot_pos)
4848 ftp_wei = opObj.getParameterValue(parameterName='ftp_wei')
4823 # self.temporalFTP.create=False
4849 exp_code = opObj.getParameterValue(parameterName='exp_code')
4824 self.temporalFTP.withoutconfig = False
4850 sub_exp_code = opObj.getParameterValue(parameterName='sub_exp_code')
4825
4851 plot_pos = opObj.getParameterValue(parameterName='plot_pos')
4826 if self.temporalFTP.withoutconfig:
4852 localfolder = opObj.getParameterValue(parameterName='localfolder')
4827 self.bufferSpectra("FTP", "Server", self.temporalFTP.server)
4853
4828 self.bufferSpectra("FTP", "Folder", self.temporalFTP.folder)
4854 self.bufferSpectra("FTP", "Server", server)
4829 self.bufferSpectra("FTP", "Username", self.temporalFTP.username)
4855 self.bufferSpectra("FTP", "Remote folder", folder)
4830 self.bufferSpectra("FTP", "Password", '*'*len(self.temporalFTP.password))
4856 self.bufferSpectra("FTP", "Local folder", localfolder)
4831 self.bufferSpectra("FTP", "Ftp_wei", self.temporalFTP.ftp_wei)
4857 self.bufferSpectra("FTP", "Username", username)
4832 self.bufferSpectra("FTP", "Exp_code", self.temporalFTP.exp_code)
4858 self.bufferSpectra("FTP", "Password", '*'*len(password))
4833 self.bufferSpectra("FTP", "Sub_exp_code", self.temporalFTP.sub_exp_code)
4859 self.bufferSpectra("FTP", "Ftp_wei", ftp_wei)
4834 self.bufferSpectra("FTP", "Plot_pos", self.temporalFTP.plot_pos)
4860 self.bufferSpectra("FTP", "Exp_code", exp_code)
4835 self.temporalFTP.withoutconfig = False
4861 self.bufferSpectra("FTP", "Sub_exp_code", sub_exp_code)
4836
4862 self.bufferSpectra("FTP", "Plot_pos", plot_pos)
4837 ####
4838 self.temporalFTP.create = False
4839
4863
4840 # outputSpectraWrite
4864 # outputSpectraWrite
4841 opObj = puObj.getOperationObj(name='SpectraWriter')
4865 opObj = puObj.getOperationObj(name='SpectraWriter')
@@ -4969,7 +4993,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4969 status = 'enable'
4993 status = 'enable'
4970 self.bufferSpectraHeis("SpectraHeis Plot", "FTP", status)
4994 self.bufferSpectraHeis("SpectraHeis Plot", "FTP", status)
4971 self.showWr_Period(puObj, opObj, nameplotop="SpectraHeis Plot")
4995 self.showWr_Period(puObj, opObj, nameplotop="SpectraHeis Plot")
4972 self.saveFTPvalues(opObj)
4996 # self.saveFTPvalues(opObj)
4973
4997
4974 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
4998 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
4975 # opObj = puObj.getOpObjfromParamValue(value="RTIfromSpectraHeis")
4999 # opObj = puObj.getOpObjfromParamValue(value="RTIfromSpectraHeis")
@@ -5046,33 +5070,34 class BasicWindow(QMainWindow, Ui_BasicWindow):
5046 status = 'enable'
5070 status = 'enable'
5047 self.bufferSpectraHeis("RTIHeis Plot", "FTP", status)
5071 self.bufferSpectraHeis("RTIHeis Plot", "FTP", status)
5048 self.showWr_Period(puObj, opObj, nameplotop="RTIHeis Plot")
5072 self.showWr_Period(puObj, opObj, nameplotop="RTIHeis Plot")
5049 self.saveFTPvalues(opObj)
5073 # self.saveFTPvalues(opObj)
5050
5074
5051 if self.temporalFTP.create:
5075 projectObj = self.getSelectedProjectObj()
5052 self.bufferSpectraHeis("FTP", "Server", self.temporalFTP.server)
5076 ftpProcUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
5053 self.bufferSpectraHeis("FTP", "Folder", self.temporalFTP.folder)
5077
5054 self.bufferSpectraHeis("FTP", "Username", self.temporalFTP.username)
5078 if ftpProcUnitConfObj:
5055 self.bufferSpectraHeis("FTP", "Password", self.temporalFTP.password)
5079
5056 self.bufferSpectraHeis("FTP", "Ftp_wei", self.temporalFTP.ftp_wei)
5080 opObj = ftpProcUnitConfObj.getOperationObj(name='run')
5057 self.bufferSpectraHeis("FTP", "Exp_code", self.temporalFTP.exp_code)
5081
5058 self.bufferSpectraHeis("FTP", "Sub_exp_code", self.temporalFTP.sub_exp_code)
5082 server = opObj.getParameterValue(parameterName='server')
5059 self.bufferSpectraHeis("FTP", "Plot_pos", self.temporalFTP.plot_pos)
5083 folder = opObj.getParameterValue(parameterName='folder')
5060 # self.temporalFTP.create=False
5084 username = opObj.getParameterValue(parameterName='username')
5061 self.temporalFTP.withoutconfig = False
5085 password = opObj.getParameterValue(parameterName='password')
5062
5086 ftp_wei = opObj.getParameterValue(parameterName='ftp_wei')
5063 if self.temporalFTP.withoutconfig:
5087 exp_code = opObj.getParameterValue(parameterName='exp_code')
5064 self.bufferSpectraHeis("FTP", "Server", self.temporalFTP.server)
5088 sub_exp_code = opObj.getParameterValue(parameterName='sub_exp_code')
5065 self.bufferSpectraHeis("FTP", "Folder", self.temporalFTP.folder)
5089 plot_pos = opObj.getParameterValue(parameterName='plot_pos')
5066 self.bufferSpectraHeis("FTP", "Username", self.temporalFTP.username)
5090 localfolder = opObj.getParameterValue(parameterName='localfolder')
5067 self.bufferSpectraHeis("FTP", "Password", self.temporalFTP.password)
5091
5068 self.bufferSpectraHeis("FTP", "Ftp_wei", self.temporalFTP.ftp_wei)
5092 self.bufferSpectraHeis("FTP", "Server", server)
5069 self.bufferSpectraHeis("FTP", "Exp_code", self.temporalFTP.exp_code)
5093 self.bufferSpectraHeis("FTP", "Remote folder", folder)
5070 self.bufferSpectraHeis("FTP", "Sub_exp_code", self.temporalFTP.sub_exp_code)
5094 self.bufferSpectraHeis("FTP", "Local folder", localfolder)
5071 self.bufferSpectraHeis("FTP", "Plot_pos", self.temporalFTP.plot_pos)
5095 self.bufferSpectraHeis("FTP", "Username", username)
5072 self.temporalFTP.withoutconfig = False
5096 self.bufferSpectraHeis("FTP", "Password", '*'*len(password))
5073
5097 self.bufferSpectraHeis("FTP", "Ftp_wei", ftp_wei)
5074 ####
5098 self.bufferSpectraHeis("FTP", "Exp_code", exp_code)
5075 self.temporalFTP.create = False
5099 self.bufferSpectraHeis("FTP", "Sub_exp_code", sub_exp_code)
5100 self.bufferSpectraHeis("FTP", "Plot_pos", plot_pos)
5076
5101
5077 # outputSpectraHeisWrite
5102 # outputSpectraHeisWrite
5078 opObj = puObj.getOperationObj(name='FitsWriter')
5103 opObj = puObj.getOperationObj(name='FitsWriter')
@@ -5132,6 +5157,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
5132 self.bufferSpectraHeis(nameplotop, "wr_period", wr_period)
5157 self.bufferSpectraHeis(nameplotop, "wr_period", wr_period)
5133
5158
5134 def saveFTPvalues(self, opObj):
5159 def saveFTPvalues(self, opObj):
5160
5135 parmObj = opObj.getParameterObj(parameterName="server")
5161 parmObj = opObj.getParameterObj(parameterName="server")
5136 if parmObj == None:
5162 if parmObj == None:
5137 server = 'jro-app.igp.gob.pe'
5163 server = 'jro-app.igp.gob.pe'
@@ -5177,10 +5203,24 class BasicWindow(QMainWindow, Ui_BasicWindow):
5177 parmObj = opObj.getParameterObj(parameterName="plot_pos")
5203 parmObj = opObj.getParameterObj(parameterName="plot_pos")
5178 if parmObj == None:
5204 if parmObj == None:
5179 plot_pos = '0'
5205 plot_pos = '0'
5180 self.temporalFTP.setwithoutconfiguration()
5181 else:
5206 else:
5182 plot_pos = opObj.getParameterValue(parameterName='plot_pos')
5207 plot_pos = opObj.getParameterValue(parameterName='plot_pos')
5183 self.temporalFTP.save(server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos)
5208
5209 parmObj = opObj.getParameterObj(parameterName="localfolder")
5210 if parmObj == None:
5211 localfolder = None
5212 else:
5213 localfolder = opObj.getParameterValue(parameterName='localfolder')
5214
5215 parmObj = opObj.getParameterObj(parameterName="extension")
5216 if parmObj == None:
5217 extension = None
5218 else:
5219 extension = opObj.getParameterValue(parameterName='extension')
5220
5221 self.temporalFTP.save(server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos,
5222 localfolder=localfolder,
5223 extension=extension)
5184
5224
5185 def addProject2ProjectExplorer(self, id, name):
5225 def addProject2ProjectExplorer(self, id, name):
5186
5226
@@ -6099,9 +6139,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
6099
6139
6100 self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME')
6140 self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME')
6101
6141
6102 def closeEvent(self, event):
6103 self.closed.emit()
6104 event.accept()
6105
6142
6106 class UnitProcessWindow(QMainWindow, Ui_UnitProcess):
6143 class UnitProcessWindow(QMainWindow, Ui_UnitProcess):
6107 """
6144 """
@@ -6379,6 +6416,7 class ftpBuffer():
6379 self.extension = '.png'
6416 self.extension = '.png'
6380 self.period = '60'
6417 self.period = '60'
6381 self.protocol = 'ftp'
6418 self.protocol = 'ftp'
6419 self.createforView = True
6382
6420
6383 def save(self, server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos, localfolder='./', extension='.png', period='60', protocol='ftp'):
6421 def save(self, server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos, localfolder='./', extension='.png', period='60', protocol='ftp'):
6384
6422
@@ -554,7 +554,7 class SendToServer(ProcessingUnit):
554 self.isConfig = False
554 self.isConfig = False
555 self.clientObj = None
555 self.clientObj = None
556
556
557 def setup(self, server, username, password, remotefolder, localfolder, ext='.png', period=60, protocol='ftp'):
557 def setup(self, server, username, password, remotefolder, localfolder, ext='.png', period=60, protocol='ftp', **kwargs):
558
558
559 self.clientObj = None
559 self.clientObj = None
560 self.localfolder = localfolder
560 self.localfolder = localfolder
General Comments 0
You need to be logged in to leave comments. Login now