##// END OF EJS Templates
schain-jc
RSS
Bug fixed in Signal Chain GUI: Updating FTP configuration from old SendByFTP operation.
Miguel Valdez -
r607:bc5d3588d2df
parent child
Show More
Show file before | Show file after | Hide comments
@@ -274,8 +274,8 class OperationConf():
274
274
275 parameterObj = self.getParameterObj(parameterName)
275 parameterObj = self.getParameterObj(parameterName)
276
276
277 if not parameterObj:
277 # if not parameterObj:
278 return None
278 # return None
279
279
280 value = parameterObj.getValue()
280 value = parameterObj.getValue()
281
281
Show file before | Show file after | Hide comments
@@ -3109,27 +3109,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3109 value = parmObj.getValue()
3109 value = parmObj.getValue()
3110 self.specGgraphftpratio.setText(str(value))
3110 self.specGgraphftpratio.setText(str(value))
3111
3111
3112 ########################################################
3113 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3114 if parmObj:
3115 value = parmObj.getValue()
3116 self.temporalFTP.ftp_wei = str(value)
3117
3118 parmObj = opObj.getParameterObj(parameterName="exp_code")
3119 if parmObj:
3120 value = parmObj.getValue()
3121 self.temporalFTP.exp_code = str(value)
3122
3123 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3124 if parmObj:
3125 value = parmObj.getValue()
3126 self.temporalFTP.sub_exp_code = str(value)
3127
3128 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3129 if parmObj:
3130 value = parmObj.getValue()
3131 self.temporalFTP.plot_pos = str(value)
3132
3133 opObj = puObj.getOperationObj(name='CrossSpectraPlot')
3112 opObj = puObj.getOperationObj(name='CrossSpectraPlot')
3134
3113
3135 if opObj == None:
3114 if opObj == None:
@@ -3221,27 +3200,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3221 value = parmObj.getValue()
3200 value = parmObj.getValue()
3222 self.specGgraphftpratio.setText(str(value))
3201 self.specGgraphftpratio.setText(str(value))
3223
3202
3224 ########################################################
3225 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3226 if parmObj:
3227 value = parmObj.getValue()
3228 self.temporalFTP.ftp_wei = str(value)
3229
3230 parmObj = opObj.getParameterObj(parameterName="exp_code")
3231 if parmObj:
3232 value = parmObj.getValue()
3233 self.temporalFTP.exp_code = str(value)
3234
3235 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3236 if parmObj:
3237 value = parmObj.getValue()
3238 self.temporalFTP.sub_exp_code = str(value)
3239
3240 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3241 if parmObj:
3242 value = parmObj.getValue()
3243 self.temporalFTP.plot_pos = str(value)
3244
3245 opObj = puObj.getOperationObj(name='RTIPlot')
3203 opObj = puObj.getOperationObj(name='RTIPlot')
3246
3204
3247 if opObj == None:
3205 if opObj == None:
@@ -3325,27 +3283,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3325 if parmObj:
3283 if parmObj:
3326 value = parmObj.getValue()
3284 value = parmObj.getValue()
3327 self.specGgraphftpratio.setText(str(value))
3285 self.specGgraphftpratio.setText(str(value))
3328
3329 ########################################################
3330 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3331 if parmObj:
3332 value = parmObj.getValue()
3333 self.temporalFTP.ftp_wei = str(value)
3334
3335 parmObj = opObj.getParameterObj(parameterName="exp_code")
3336 if parmObj:
3337 value = parmObj.getValue()
3338 self.temporalFTP.exp_code = str(value)
3339
3340 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3341 if parmObj:
3342 value = parmObj.getValue()
3343 self.temporalFTP.sub_exp_code = str(value)
3344
3345 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3346 if parmObj:
3347 value = parmObj.getValue()
3348 self.temporalFTP.plot_pos = str(value)
3349
3286
3350 opObj = puObj.getOperationObj(name='CoherenceMap')
3287 opObj = puObj.getOperationObj(name='CoherenceMap')
3351
3288
@@ -3446,27 +3383,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3446 if parmObj:
3383 if parmObj:
3447 value = parmObj.getValue()
3384 value = parmObj.getValue()
3448 self.specGgraphftpratio.setText(str(value))
3385 self.specGgraphftpratio.setText(str(value))
3449
3450 ########################################################
3451 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3452 if parmObj:
3453 value = parmObj.getValue()
3454 self.temporalFTP.ftp_wei = str(value)
3455
3456 parmObj = opObj.getParameterObj(parameterName="exp_code")
3457 if parmObj:
3458 value = parmObj.getValue()
3459 self.temporalFTP.exp_code = str(value)
3460
3461 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3462 if parmObj:
3463 value = parmObj.getValue()
3464 self.temporalFTP.sub_exp_code = str(value)
3465
3466 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3467 if parmObj:
3468 value = parmObj.getValue()
3469 self.temporalFTP.plot_pos = str(value)
3470
3386
3471 opObj = puObj.getOperationObj(name='PowerProfilePlot')
3387 opObj = puObj.getOperationObj(name='PowerProfilePlot')
3472
3388
@@ -3526,27 +3442,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3526 if parmObj:
3442 if parmObj:
3527 value = parmObj.getValue()
3443 value = parmObj.getValue()
3528 self.specGgraphftpratio.setText(str(value))
3444 self.specGgraphftpratio.setText(str(value))
3529
3530 ########################################################
3531 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3532 if parmObj:
3533 value = parmObj.getValue()
3534 self.temporalFTP.ftp_wei = str(value)
3535
3536 parmObj = opObj.getParameterObj(parameterName="exp_code")
3537 if parmObj:
3538 value = parmObj.getValue()
3539 self.temporalFTP.exp_code = str(value)
3540
3541 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3542 if parmObj:
3543 value = parmObj.getValue()
3544 self.temporalFTP.sub_exp_code = str(value)
3545
3546 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3547 if parmObj:
3548 value = parmObj.getValue()
3549 self.temporalFTP.plot_pos = str(value)
3550
3445
3551 opObj = puObj.getOperationObj(name='Noise')
3446 opObj = puObj.getOperationObj(name='Noise')
3552
3447
@@ -3620,27 +3515,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3620 if parmObj:
3515 if parmObj:
3621 value = parmObj.getValue()
3516 value = parmObj.getValue()
3622 self.specGgraphftpratio.setText(str(value))
3517 self.specGgraphftpratio.setText(str(value))
3623
3624 ########################################################
3625 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3626 if parmObj:
3627 value = parmObj.getValue()
3628 self.temporalFTP.ftp_wei = str(value)
3629
3630 parmObj = opObj.getParameterObj(parameterName="exp_code")
3631 if parmObj:
3632 value = parmObj.getValue()
3633 self.temporalFTP.exp_code = str(value)
3634
3635 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3636 if parmObj:
3637 value = parmObj.getValue()
3638 self.temporalFTP.sub_exp_code = str(value)
3639
3640 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3641 if parmObj:
3642 value = parmObj.getValue()
3643 self.temporalFTP.plot_pos = str(value)
3644
3518
3645 opObj = puObj.getOperationObj(name='SpectraWriter')
3519 opObj = puObj.getOperationObj(name='SpectraWriter')
3646 if opObj == None:
3520 if opObj == None:
@@ -3761,27 +3635,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3761 if parmObj:
3635 if parmObj:
3762 value = parmObj.getValue()
3636 value = parmObj.getValue()
3763 self.specHeisGgraphftpratio.setText(str(value))
3637 self.specHeisGgraphftpratio.setText(str(value))
3764
3765 ########################################################
3766 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3767 if parmObj:
3768 value = parmObj.getValue()
3769 self.temporalFTP.ftp_wei = str(value)
3770
3771 parmObj = opObj.getParameterObj(parameterName="exp_code")
3772 if parmObj:
3773 value = parmObj.getValue()
3774 self.temporalFTP.exp_code = str(value)
3775
3776 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3777 if parmObj:
3778 value = parmObj.getValue()
3779 self.temporalFTP.sub_exp_code = str(value)
3780
3781 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3782 if parmObj:
3783 value = parmObj.getValue()
3784 self.temporalFTP.plot_pos = str(value)
3785
3638
3786 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
3639 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
3787
3640
@@ -3854,27 +3707,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
3854 if parmObj:
3707 if parmObj:
3855 value = parmObj.getValue()
3708 value = parmObj.getValue()
3856 self.specHeisGgraphftpratio.setText(str(value))
3709 self.specHeisGgraphftpratio.setText(str(value))
3857
3858 ########################################################
3859 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
3860 if parmObj:
3861 value = parmObj.getValue()
3862 self.temporalFTP.ftp_wei = str(value)
3863
3864 parmObj = opObj.getParameterObj(parameterName="exp_code")
3865 if parmObj:
3866 value = parmObj.getValue()
3867 self.temporalFTP.exp_code = str(value)
3868
3869 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
3870 if parmObj:
3871 value = parmObj.getValue()
3872 self.temporalFTP.sub_exp_code = str(value)
3873
3874 parmObj = opObj.getParameterObj(parameterName="plot_pos")
3875 if parmObj:
3876 value = parmObj.getValue()
3877 self.temporalFTP.plot_pos = str(value)
3878
3710
3879 # outputSpectraHeisWrite
3711 # outputSpectraHeisWrite
3880 opObj = puObj.getOperationObj(name='FitsWriter')
3712 opObj = puObj.getOperationObj(name='FitsWriter')
@@ -3946,6 +3778,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
3946 def refreshPUProperties(self, puObjView):
3778 def refreshPUProperties(self, puObjView):
3947
3779
3948 ############ FTP CONFIG ################################
3780 ############ FTP CONFIG ################################
3781 #Deleting FTP Conf. This processing unit have not got any
3782 #FTP configuration by default
3949 if puObjView.id in self.__puLocalFolder2FTP.keys():
3783 if puObjView.id in self.__puLocalFolder2FTP.keys():
3950 self.__puLocalFolder2FTP.pop(puObjView.id)
3784 self.__puLocalFolder2FTP.pop(puObjView.id)
3951 ########################################################
3785 ########################################################
@@ -3959,19 +3793,36 class BasicWindow(QMainWindow, Ui_BasicWindow):
3959 if operationName == 'run':
3793 if operationName == 'run':
3960 operationName = 'Properties'
3794 operationName = 'Properties'
3961
3795
3962 if not thisOp.getParameterObjList():
3796 else:
3963 propertyBuffObj.append(operationName, '--', '--')
3797 if not thisOp.getParameterObjList():
3964 continue
3798 propertyBuffObj.append(operationName, '--', '--')
3799 continue
3965
3800
3966 for thisParmObj in thisOp.getParameterObjList():
3801 for thisParmObj in thisOp.getParameterObjList():
3967 propertyBuffObj.append(operationName, thisParmObj.name, str(thisParmObj.getValue()))
3802 propertyBuffObj.append(operationName, thisParmObj.name, str(thisParmObj.getValue()))
3968
3803
3969 ############ FTP CONFIG ################################
3804 ############ FTP CONFIG ################################
3805 if thisParmObj.name == "ftp_wei" and thisParmObj.getValue():
3806 value = thisParmObj.getValue()
3807 self.temporalFTP.ftp_wei = value
3808
3809 if thisParmObj.name == "exp_code" and thisParmObj.getValue():
3810 value = thisParmObj.getValue()
3811 self.temporalFTP.exp_code = value
3812
3813 if thisParmObj.name == "sub_exp_code" and thisParmObj.getValue():
3814 value = thisParmObj.getValue()
3815 self.temporalFTP.sub_exp_code = value
3816
3817 if thisParmObj.name == "plot_pos" and thisParmObj.getValue():
3818 value = thisParmObj.getValue()
3819 self.temporalFTP.plot_pos = value
3820
3970 if thisParmObj.name == 'ftp' and thisParmObj.getValue():
3821 if thisParmObj.name == 'ftp' and thisParmObj.getValue():
3971 figpath = thisOp.getParameterValue('figpath')
3822 figpathObj = thisOp.getParameterObj('figpath')
3972 if not figpath:
3823 if figpathObj:
3973 continue
3824 self.__puLocalFolder2FTP[puObjView.id] = figpathObj.getValue()
3974 self.__puLocalFolder2FTP[puObjView.id] = figpath
3825
3975 ########################################################
3826 ########################################################
3976
3827
3977 propertiesModel = propertyBuffObj.getPropertyModel()
3828 propertiesModel = propertyBuffObj.getPropertyModel()
@@ -4319,38 +4170,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4319
4170
4320 return puObj
4171 return puObj
4321
4172
4322 def __addFTPProcUnitFrom(self, operationObj):
4173 def createFTPProcUnitView(self):
4323
4324 if operationObj.name != "SendByFTP":
4325 return
4326
4327 projectObj = self.getSelectedProjectObj()
4328
4329 self.removeAllFTPProcUnitView(projectObj)
4330
4331 procUnitConfObj = projectObj.addProcUnit(name="SendToServer")
4332
4333 server = operationObj.getParameterValue("server")
4334 username = operationObj.getParameterValue("username")
4335 password = operationObj.getParameterValue("pasword")
4336 localfolder = operationObj.getParameterValue("localfolder")
4337 remotefolder = operationObj.getParameterValue("remotefolder")
4338 ext = operationObj.getParameterValue("ext")
4339 period = operationObj.getParameterValue("period")
4340
4341 procUnitConfObj.addParameter(name='server', value=server, format='str')
4342 procUnitConfObj.addParameter(name='username', value=username, format='str')
4343 procUnitConfObj.addParameter(name='password', value=password, format='str')
4344 procUnitConfObj.addParameter(name='localfolder', value=localfolder, format='list')
4345 procUnitConfObj.addParameter(name='remotefolder', value=remotefolder, format='str')
4346 procUnitConfObj.addParameter(name='ext', value=ext, format='str')
4347 procUnitConfObj.addParameter(name='period', value=period, format='int')
4348
4349 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
4350
4351 return procUnitConfObj
4352
4353 def addFTPProcUnitView(self):
4354
4174
4355 if not self.temporalFTP.create:
4175 if not self.temporalFTP.create:
4356 self.temporalFTP.setwithoutconfiguration()
4176 self.temporalFTP.setwithoutconfiguration()
@@ -4378,10 +4198,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
4378 procUnitConfObj.addParameter(name='period', value=self.temporalFTP.period, format='int')
4198 procUnitConfObj.addParameter(name='period', value=self.temporalFTP.period, format='int')
4379 procUnitConfObj.addParameter(name='protocol', value=self.temporalFTP.protocol, format='str')
4199 procUnitConfObj.addParameter(name='protocol', value=self.temporalFTP.protocol, format='str')
4380
4200
4381 procUnitConfObj.addParameter(name='ftp_wei', value=self.temporalFTP.ftp_wei, format='str')
4201 procUnitConfObj.addParameter(name='ftp_wei', value=self.temporalFTP.ftp_wei, format='int')
4382 procUnitConfObj.addParameter(name='exp_code', value=self.temporalFTP.exp_code, format='str')
4202 procUnitConfObj.addParameter(name='exp_code', value=self.temporalFTP.exp_code, format='int')
4383 procUnitConfObj.addParameter(name='sub_exp_code', value=self.temporalFTP.sub_exp_code, format='str')
4203 procUnitConfObj.addParameter(name='sub_exp_code', value=self.temporalFTP.sub_exp_code, format='int')
4384 procUnitConfObj.addParameter(name='plot_pos', value=self.temporalFTP.plot_pos, format='str')
4204 procUnitConfObj.addParameter(name='plot_pos', value=self.temporalFTP.plot_pos, format='int')
4385
4205
4386 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
4206 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
4387
4207
@@ -4407,8 +4227,30 class BasicWindow(QMainWindow, Ui_BasicWindow):
4407 self.treeProjectProperties.expandAll()
4227 self.treeProjectProperties.expandAll()
4408 self.treeProjectProperties.allColumnsShowFocus()
4228 self.treeProjectProperties.allColumnsShowFocus()
4409 self.treeProjectProperties.resizeColumnToContents(1)
4229 self.treeProjectProperties.resizeColumnToContents(1)
4230
4231 def saveFTPFromOpObj(self, operationObj):
4232
4233 if operationObj.name != "SendByFTP":
4234 return
4235
4236 server = operationObj.getParameterValue("server")
4237 username = operationObj.getParameterValue("username")
4238 password = operationObj.getParameterValue("password")
4239 localfolder = operationObj.getParameterValue("localfolder")
4240 remotefolder = operationObj.getParameterValue("remotefolder")
4241 ext = operationObj.getParameterValue("ext")
4242 period = operationObj.getParameterValue("period")
4410
4243
4411 def saveFTPvalues(self, puObj):
4244 self.temporalFTP.save(server=server,
4245 remotefolder=remotefolder,
4246 username=username,
4247 password=password,
4248 localfolder=localfolder,
4249 extension=ext)
4250
4251 return
4252
4253 def saveFTPFromProcUnitObj(self, puObj):
4412
4254
4413 opObj = puObj.getOperationObj(name="run")
4255 opObj = puObj.getOperationObj(name="run")
4414
4256
@@ -4438,25 +4280,25 class BasicWindow(QMainWindow, Ui_BasicWindow):
4438
4280
4439 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
4281 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
4440 if parmObj == None:
4282 if parmObj == None:
4441 ftp_wei = '0'
4283 ftp_wei = 0
4442 else:
4284 else:
4443 ftp_wei = parmObj.getValue()
4285 ftp_wei = parmObj.getValue()
4444
4286
4445 parmObj = opObj.getParameterObj(parameterName="exp_code")
4287 parmObj = opObj.getParameterObj(parameterName="exp_code")
4446 if parmObj == None:
4288 if parmObj == None:
4447 exp_code = '0'
4289 exp_code = 0
4448 else:
4290 else:
4449 exp_code = parmObj.getValue()
4291 exp_code = parmObj.getValue()
4450
4292
4451 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
4293 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
4452 if parmObj == None:
4294 if parmObj == None:
4453 sub_exp_code = '0'
4295 sub_exp_code = 0
4454 else:
4296 else:
4455 sub_exp_code = parmObj.getValue()
4297 sub_exp_code = parmObj.getValue()
4456
4298
4457 parmObj = opObj.getParameterObj(parameterName="plot_pos")
4299 parmObj = opObj.getParameterObj(parameterName="plot_pos")
4458 if parmObj == None:
4300 if parmObj == None:
4459 plot_pos = '0'
4301 plot_pos = 0
4460 else:
4302 else:
4461 plot_pos = parmObj.getValue()
4303 plot_pos = parmObj.getValue()
4462
4304
@@ -4466,7 +4308,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4466 else:
4308 else:
4467 localfolder = parmObj.getValue()
4309 localfolder = parmObj.getValue()
4468
4310
4469 parmObj = opObj.getParameterObj(parameterName="extension")
4311 parmObj = opObj.getParameterObj(parameterName="ext")
4470 if parmObj == None:
4312 if parmObj == None:
4471 extension = '.png'
4313 extension = '.png'
4472 else:
4314 else:
@@ -4668,8 +4510,15 class BasicWindow(QMainWindow, Ui_BasicWindow):
4668 self.__puObjDict[puId] = puObj
4510 self.__puObjDict[puId] = puObj
4669
4511
4670 if puObj.name == "SendToServer":
4512 if puObj.name == "SendToServer":
4671 self.saveFTPvalues(puObj)
4513 self.saveFTPFromProcUnitObj(puObj)
4672
4514
4515 ############## COMPATIBLE WITH OLD VERSIONS ################
4516 operationObj = puObj.getOperationObj("SendByFTP")
4517
4518 if operationObj:
4519 self.saveFTPFromOpObj(operationObj)
4520 ############################################################
4521
4673 if puObj.inputId == '0':
4522 if puObj.inputId == '0':
4674 continue
4523 continue
4675
4524
@@ -4678,14 +4527,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
4678 self.refreshPUWindow(puObj)
4527 self.refreshPUWindow(puObj)
4679 self.refreshPUProperties(puObj)
4528 self.refreshPUProperties(puObj)
4680 self.showtabPUCreated(datatype=puObj.datatype)
4529 self.showtabPUCreated(datatype=puObj.datatype)
4681
4682 ############## COMPATIBLE FROM OLD VERSIONS ################
4683 operationObj = puObj.getOperationObj("SendByFTP")
4684
4685 if operationObj:
4686 send2ServerObj = self.__addFTPProcUnitFrom(operationObj)
4687 self.saveFTPvalues(send2ServerObj)
4688 ############################################################
4689
4530
4690 self.console.clear()
4531 self.console.clear()
4691 self.console.append("The selected xml file has been loaded successfully")
4532 self.console.append("The selected xml file has been loaded successfully")
@@ -4795,8 +4636,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
4795 if not sts:
4636 if not sts:
4796 return None
4637 return None
4797
4638
4798 self.addFTPProcUnitView()
4639 self.createFTPProcUnitView()
4799
4640
4800 if not filename:
4641 if not filename:
4801 filename = os.path.join( str(self.pathWorkSpace), "%s%s" %(str(projectObj.name), '.xml') )
4642 filename = os.path.join( str(self.pathWorkSpace), "%s%s" %(str(projectObj.name), '.xml') )
4802
4643
@@ -5263,8 +5104,14 class BasicWindow(QMainWindow, Ui_BasicWindow):
5263 Method to loads day
5104 Method to loads day
5264 """
5105 """
5265 self.proOk.setEnabled(False)
5106 self.proOk.setEnabled(False)
5107 self.proComStartDate.clear()
5108 self.proComEndDate.clear()
5109
5266 self.dateList = []
5110 self.dateList = []
5267
5111
5112 if not os.path.isdir(data_path):
5113 return
5114
5268 dateList = self.findDatafiles(data_path, ext=ext, walk=walk, expLabel=expLabel)
5115 dateList = self.findDatafiles(data_path, ext=ext, walk=walk, expLabel=expLabel)
5269
5116
5270 if not dateList:
5117 if not dateList:
@@ -5273,9 +5120,6 class BasicWindow(QMainWindow, Ui_BasicWindow):
5273 self.console.append(outputstr)
5120 self.console.append(outputstr)
5274 return
5121 return
5275
5122
5276 self.proComStartDate.clear()
5277 self.proComEndDate.clear()
5278
5279 dateStrList = []
5123 dateStrList = []
5280 for thisDate in dateList:
5124 for thisDate in dateList:
5281 dateStr = thisDate.strftime("%Y/%m/%d")
5125 dateStr = thisDate.strftime("%Y/%m/%d")
@@ -5664,7 +5508,7 class Ftp(QMainWindow, Ui_Ftp):
5664 self.console.append("Please Write a passwordFTP")
5508 self.console.append("Please Write a passwordFTP")
5665 return 0
5509 return 0
5666
5510
5667 ftp_wei = self.weightFTP.text()
5511 ftp_wei = str(self.weightFTP.text())
5668 if not ftp_wei == "":
5512 if not ftp_wei == "":
5669 try:
5513 try:
5670 ftp_wei = int(self.weightFTP.text())
5514 ftp_wei = int(self.weightFTP.text())
@@ -5673,7 +5517,7 class Ftp(QMainWindow, Ui_Ftp):
5673 self.console.append("Please Write a ftp_wei number")
5517 self.console.append("Please Write a ftp_wei number")
5674 return 0
5518 return 0
5675
5519
5676 exp_code = self.expcodeFTP.text()
5520 exp_code = str(self.expcodeFTP.text())
5677 if not exp_code == "":
5521 if not exp_code == "":
5678 try:
5522 try:
5679 exp_code = int(self.expcodeFTP.text())
5523 exp_code = int(self.expcodeFTP.text())
@@ -5683,7 +5527,7 class Ftp(QMainWindow, Ui_Ftp):
5683 return 0
5527 return 0
5684
5528
5685
5529
5686 sub_exp_code = self.subexpFTP.text()
5530 sub_exp_code = str(self.subexpFTP.text())
5687 if not sub_exp_code == "":
5531 if not sub_exp_code == "":
5688 try:
5532 try:
5689 sub_exp_code = int(self.subexpFTP.text())
5533 sub_exp_code = int(self.subexpFTP.text())
@@ -5692,7 +5536,7 class Ftp(QMainWindow, Ui_Ftp):
5692 self.console.append("Please Write a sub_exp_code number")
5536 self.console.append("Please Write a sub_exp_code number")
5693 return 0
5537 return 0
5694
5538
5695 plot_pos = self.plotposFTP.text()
5539 plot_pos = str(self.plotposFTP.text())
5696 if not plot_pos == "":
5540 if not plot_pos == "":
5697 try:
5541 try:
5698 plot_pos = int(self.plotposFTP.text())
5542 plot_pos = int(self.plotposFTP.text())
@@ -5763,23 +5607,23 class ftpBuffer():
5763 self.withoutconfig = True
5607 self.withoutconfig = True
5764 self.localfolder = './'
5608 self.localfolder = './'
5765 self.extension = '.png'
5609 self.extension = '.png'
5766 self.period = '60'
5610 self.period = 60
5767 self.protocol = 'ftp'
5611 self.protocol = 'ftp'
5768 self.createforView = True
5612 self.createforView = True
5769
5613
5770 if not self.ftp_wei:
5614 if not self.ftp_wei:
5771 self.ftp_wei = "0"
5615 self.ftp_wei = 0
5772
5616
5773 if not self.exp_code:
5617 if not self.exp_code:
5774 self.exp_code = "0"
5618 self.exp_code = 0
5775
5619
5776 if not self.sub_exp_code:
5620 if not self.sub_exp_code:
5777 self.sub_exp_code = "0"
5621 self.sub_exp_code = 0
5778
5622
5779 if not self.plot_pos:
5623 if not self.plot_pos:
5780 self.plot_pos = "0"
5624 self.plot_pos = 0
5781
5625
5782 def save(self, server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos, localfolder='./', extension='.png', period='60', protocol='ftp'):
5626 def save(self, server, remotefolder, username, password, ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0, localfolder='./', extension='.png', period=60, protocol='ftp'):
5783
5627
5784 self.server = server
5628 self.server = server
5785 self.remotefolder = remotefolder
5629 self.remotefolder = remotefolder
Show file before | Show file after | Hide comments
@@ -432,12 +432,20 class JRODataReader(JRODataIO):
432 #pathList.append(path)
432 #pathList.append(path)
433 multi_path = path.split(',')
433 multi_path = path.split(',')
434 for single_path in multi_path:
434 for single_path in multi_path:
435
436 if not os.path.isdir(single_path):
437 continue
438
435 pathList.append(single_path)
439 pathList.append(single_path)
436
440
437 else:
441 else:
438 #dirList = []
442 #dirList = []
439 multi_path = path.split(',')
443 multi_path = path.split(',')
440 for single_path in multi_path:
444 for single_path in multi_path:
445
446 if not os.path.isdir(single_path):
447 continue
448
441 dirList = []
449 dirList = []
442 for thisPath in os.listdir(single_path):
450 for thisPath in os.listdir(single_path):
443 if not os.path.isdir(os.path.join(single_path,thisPath)):
451 if not os.path.isdir(os.path.join(single_path,thisPath)):
@@ -962,6 +970,9 class JRODataReader(JRODataIO):
962 multi_path = path.split(',')
970 multi_path = path.split(',')
963 for single_path in multi_path:
971 for single_path in multi_path:
964
972
973 if not os.path.isdir(single_path):
974 continue
975
965 ok = False
976 ok = False
966 fileList = glob.glob1(single_path, "*"+ext)
977 fileList = glob.glob1(single_path, "*"+ext)
967
978
@@ -987,6 +998,9 class JRODataReader(JRODataIO):
987 multi_path = path.split(',')
998 multi_path = path.split(',')
988 for single_path in multi_path:
999 for single_path in multi_path:
989
1000
1001 if not os.path.isdir(single_path):
1002 continue
1003
990 dirList = []
1004 dirList = []
991
1005
992 for thisPath in os.listdir(single_path):
1006 for thisPath in os.listdir(single_path):
Show file before | Show file after | Hide comments
@@ -3,6 +3,7 Created on Jul 3, 2014
3
3
4 @author: roj-idl71
4 @author: roj-idl71
5 '''
5 '''
6 import os
6 import datetime
7 import datetime
7 import numpy
8 import numpy
8
9
@@ -123,6 +124,9 class USRPReader(ProcessingUnit):
123
124
124 def findDatafiles(self, path, startDate=None, endDate=None):
125 def findDatafiles(self, path, startDate=None, endDate=None):
125
126
127 if not os.path.isdir(path):
128 return []
129
126 try:
130 try:
127 digitalReadObj = digital_rf_hdf5.read_hdf5(path, load_all_metadata=True)
131 digitalReadObj = digital_rf_hdf5.read_hdf5(path, load_all_metadata=True)
128 except:
132 except:
@@ -205,7 +209,10 class USRPReader(ProcessingUnit):
205
209
206 if not buffer_size:
210 if not buffer_size:
207 buffer_size = nbuffer
211 buffer_size = nbuffer
208
212
213 if not os.path.isdir(path):
214 raise ValueError, "[Reading] This path %s does not exist" %path
215
209 try:
216 try:
210 self.digitalReadObj = digital_rf_hdf5.read_hdf5(path, load_all_metadata=True)
217 self.digitalReadObj = digital_rf_hdf5.read_hdf5(path, load_all_metadata=True)
211 except:
218 except:
General Comments 0
You need to be logged in to leave comments. Login now