##// END OF EJS Templates
schain-jc
RSS
Bugs fixed: Error selecting FTP parameters in Signal Chain GUI
Miguel Valdez -
r606:ed924449cee7
parent child
Show More
Show file before | Show file after | Hide comments
@@ -259,7 +259,8 class OperationConf():
259 259
260 260 return None
261 261
262 def getParameterObjfromValue(self,parameterValue):
262 def getParameterObjfromValue(self, parameterValue):
263
263 264 for parmConfObj in self.parmConfObjList:
264 265
265 266 if parmConfObj.getValue() != parameterValue:
@@ -272,6 +273,10 class OperationConf():
272 273 def getParameterValue(self, parameterName):
273 274
274 275 parameterObj = self.getParameterObj(parameterName)
276
277 if not parameterObj:
278 return None
279
275 280 value = parameterObj.getValue()
276 281
277 282 return value
@@ -457,7 +462,7 class ProcUnitConf():
457 462
458 463 return None
459 464
460 def getOpObjfromParamValue(self,value=None):
465 def getOpObjfromParamValue(self, value=None):
461 466
462 467 for opConfObj in self.opConfObjList:
463 468 if opConfObj.getParameterObjfromValue(parameterValue=value) != value:
@@ -855,10 +860,16 class Project():
855 860
856 861 return None
857 862
858 def getProcUnitObj(self, id):
863 def getProcUnitObj(self, id=None, name=None):
864
865 if id != None:
866 return self.procUnitConfObjDict[id]
867
868 if name != None:
869 return self.getProcUnitObjByName(name)
870
871 return None
859 872
860 return self.procUnitConfObjDict[id]
861
862 873 def getProcUnitObjByName(self, name):
863 874
864 875 for obj in self.procUnitConfObjDict.values():
@@ -866,7 +877,11 class Project():
866 877 return obj
867 878
868 879 return None
869
880
881 def procUnitItems(self):
882
883 return self.procUnitConfObjDict.items()
884
870 885 def makeXml(self):
871 886
872 887 projectElement = Element('Project')
Show file before | Show file after | Hide comments
This diff has been collapsed as it changes many lines, (1076 lines changed) Show them Hide them
@@ -29,7 +29,6 from propertiesViewModel import TreeModel, PropertyBuffer
29 29 from parametersModel import ProjectParms
30 30
31 31 from schainpy.gui.figures import tools
32 # from schainpy.gui.viewcontroller.comm import ControllerThread
33 32
34 33 FIGURES_PATH = tools.get_path()
35 34 TEMPORAL_FILE = ".temp.xml"
@@ -107,9 +106,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
107 106
108 107 self.__projectObjDict = {}
109 108 self.__operationObjDict = {}
110
111 self.__ftpProcUnitAdded = False
112 self.__ftpProcUnitId = None
109
110 self.__puLocalFolder2FTP = {}
113 111 self.__initialized = False
114 112
115 113 # self.create_comm()
@@ -168,10 +166,19 class BasicWindow(QMainWindow, Ui_BasicWindow):
168 166 """
169 167 """
170 168 self.configFTPWindowObj = Ftp(self)
171 # if self.temporalFTP.create:
172 if self.temporalFTP.createforView:
173 server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
174 self.configFTPWindowObj.setParmsfromTemporal(server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos)
169
170 if not self.temporalFTP.create:
171 self.temporalFTP.setwithoutconfiguration()
172
173 self.configFTPWindowObj.setParmsfromTemporal(self.temporalFTP.server,
174 self.temporalFTP.remotefolder,
175 self.temporalFTP.username,
176 self.temporalFTP.password,
177 self.temporalFTP.ftp_wei,
178 self.temporalFTP.exp_code,
179 self.temporalFTP.sub_exp_code,
180 self.temporalFTP.plot_pos)
181
175 182 self.configFTPWindowObj.show()
176 183 self.configFTPWindowObj.closed.connect(self.createFTPConfig)
177 184
@@ -181,9 +188,18 class BasicWindow(QMainWindow, Ui_BasicWindow):
181 188 self.console.clear()
182 189 self.console.append("There is no FTP configuration")
183 190 return
191
184 192 self.console.append("Push Ok in Spectra view to Add FTP Configuration")
185 server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.configFTPWindowObj.getParmsFromFtpWindow()
186 self.temporalFTP.save(server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos)
193
194 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.configFTPWindowObj.getParmsFromFtpWindow()
195 self.temporalFTP.save(server=server,
196 remotefolder=remotefolder,
197 username=username,
198 password=password,
199 ftp_wei=ftp_wei,
200 exp_code=exp_code,
201 sub_exp_code=sub_exp_code,
202 plot_pos=plot_pos)
187 203
188 204 @pyqtSignature("")
189 205 def on_actionOpenToolbar_triggered(self):
@@ -681,7 +697,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
681 697 name_parameter = 'frequency'
682 698 if not value == "":
683 699 try:
684 radarfreq = float(self.volOpRadarfrequency.text())
700 radarfreq = float(self.volOpRadarfrequency.text())*1e6
685 701 except:
686 702 self.console.clear()
687 703 self.console.append("Write the parameter Radar Frequency type float")
@@ -1078,7 +1094,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
1078 1094 name_parameter = 'frequency'
1079 1095 if not value == "":
1080 1096 try:
1081 radarfreq = float(self.specOpRadarfrequency.text())
1097 radarfreq = float(self.specOpRadarfrequency.text())*1e6
1082 1098 except:
1083 1099 self.console.clear()
1084 1100 self.console.append("Write the parameter Radar Frequency type float")
@@ -1707,22 +1723,11 class BasicWindow(QMainWindow, Ui_BasicWindow):
1707 1723 self.console.append("Graphic path should be defined")
1708 1724 return 0
1709 1725
1710 if addFTP:
1711 if not figpath:
1726 if addFTP and not figpath:
1712 1727 self.console.clear()
1713 1728 self.console.append("You have to save the plots before sending them to FTP Server")
1714 1729 return 0
1715
1716 if not self.temporalFTP.create:
1717 self.temporalFTP.setwithoutconfiguration()
1718
1719 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
1720 self.addFTPProcUnitView(server, username, password, remotefolder,
1721 ftp_wei, exp_code, sub_exp_code, plot_pos,
1722 localfolder=figpath)
1723 else:
1724 self.removeFTPProcUnitView()
1725
1730
1726 1731 # if something happend
1727 1732 parms_ok, output_path, blocksperfile, profilesperblock = self.checkInputsPUSave(datatype='Spectra')
1728 1733 if parms_ok:
@@ -2089,22 +2094,11 class BasicWindow(QMainWindow, Ui_BasicWindow):
2089 2094 self.console.append("Graphic path should be defined")
2090 2095 return 0
2091 2096
2092 if addFTP:
2093 if not localfolder:
2097 if addFTP and not localfolder:
2094 2098 self.console.clear()
2095 2099 self.console.append("You have to save the plots before sending them to FTP Server")
2096 2100 return 0
2097 2101
2098 if not self.temporalFTP.create:
2099 self.temporalFTP.setwithoutconfiguration()
2100
2101 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
2102 self.addFTPProcUnitView(server, username, password, remotefolder,
2103 ftp_wei, exp_code, sub_exp_code, plot_pos,
2104 localfolder=localfolder)
2105 else:
2106 self.removeFTPProcUnitView()
2107
2108 2102 # if something happened
2109 2103 parms_ok, output_path, blocksperfile, metada = self.checkInputsPUSave(datatype='SpectraHeis')
2110 2104 if parms_ok:
@@ -2548,7 +2542,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2548 2542 self.volOpCebRadarfrequency.setCheckState(0)
2549 2543 else:
2550 2544 value = opObj.getParameterValue(parameterName='frequency')
2551 value = str(value)
2545 value = str(float(value)/1e6)
2552 2546 self.volOpRadarfrequency.setText(value)
2553 2547 self.volOpRadarfrequency.setEnabled(True)
2554 2548 self.volOpCebRadarfrequency.setCheckState(QtCore.Qt.Checked)
@@ -2848,7 +2842,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2848 2842 self.specOpCebRadarfrequency.setCheckState(0)
2849 2843 else:
2850 2844 value = opObj.getParameterValue(parameterName='frequency')
2851 value = str(value)
2845 value = str(float(value)/1e6)
2852 2846 self.specOpRadarfrequency.setText(value)
2853 2847 self.specOpRadarfrequency.setEnabled(True)
2854 2848 self.specOpCebRadarfrequency.setCheckState(QtCore.Qt.Checked)
@@ -3026,7 +3020,19 class BasicWindow(QMainWindow, Ui_BasicWindow):
3026 3020 value = value1 + "," + value2 + "," + value3 + ',' + value4
3027 3021 self.specOpgetNoise.setText(value)
3028 3022 self.specOpgetNoise.setEnabled(True)
3029
3023
3024 self.specGraphPath.clear()
3025 self.specGraphPrefix.clear()
3026 self.specGgraphFreq.clear()
3027 self.specGgraphHeight.clear()
3028 self.specGgraphDbsrange.clear()
3029 self.specGgraphmagnitud.clear()
3030 self.specGgraphPhase.clear()
3031 self.specGgraphChannelList.clear()
3032 self.specGgraphTminTmax.clear()
3033 self.specGgraphTimeRange.clear()
3034 self.specGgraphftpratio.clear()
3035
3030 3036 opObj = puObj.getOperationObj(name='SpectraPlot')
3031 3037
3032 3038 if opObj == None:
@@ -3081,26 +3087,49 class BasicWindow(QMainWindow, Ui_BasicWindow):
3081 3087 self.specGgraphDbsrange.setText(value)
3082 3088 self.specGgraphDbsrange.setEnabled(True)
3083 3089
3084
3085 parmObj = opObj.getParameterObj(parameterName="figpath")
3090 parmObj = opObj.getParameterObj(parameterName="save")
3086 3091 if parmObj == None:
3087 3092 self.specGraphSaveSpectra.setCheckState(0)
3088 3093 else:
3089 3094 self.specGraphSaveSpectra.setCheckState(QtCore.Qt.Checked)
3090 value = opObj.getParameterValue(parameterName='figpath')
3091 self.specGraphPath.setText(value)
3092
3095
3093 3096 parmObj = opObj.getParameterObj(parameterName="ftp")
3094 3097 if parmObj == None:
3095 3098 self.specGraphftpSpectra.setCheckState(0)
3096 3099 else:
3097 3100 self.specGraphftpSpectra.setCheckState(QtCore.Qt.Checked)
3098 try:
3099 value = opObj.getParameterValue(parameterName='wr_period')
3100 except:
3101 value = " "
3101
3102 parmObj = opObj.getParameterObj(parameterName="figpath")
3103 if parmObj:
3104 value = parmObj.getValue()
3105 self.specGraphPath.setText(value)
3106
3107 parmObj = opObj.getParameterObj(parameterName="wr_period")
3108 if parmObj:
3109 value = parmObj.getValue()
3102 3110 self.specGgraphftpratio.setText(str(value))
3103
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
3104 3133 opObj = puObj.getOperationObj(name='CrossSpectraPlot')
3105 3134
3106 3135 if opObj == None:
@@ -3169,29 +3198,52 class BasicWindow(QMainWindow, Ui_BasicWindow):
3169 3198 value = value1 + "," + value2
3170 3199 self.specGgraphPhase.setText(value)
3171 3200 self.specGgraphPhase.setEnabled(True)
3172
3173 parmObj = opObj.getParameterObj(parameterName="figpath")
3201
3202 parmObj = opObj.getParameterObj(parameterName="save")
3174 3203 if parmObj == None:
3175 3204 self.specGraphSaveCross.setCheckState(0)
3176
3177 3205 else:
3178 3206 self.specGraphSaveCross.setCheckState(QtCore.Qt.Checked)
3179 value = opObj.getParameterValue(parameterName='figpath')
3180 self.specGraphPath.setText(value)
3181
3207
3182 3208 parmObj = opObj.getParameterObj(parameterName="ftp")
3183 3209 if parmObj == None:
3184 3210 self.specGraphftpCross.setCheckState(0)
3185 3211 else:
3186 3212 self.specGraphftpCross.setCheckState(QtCore.Qt.Checked)
3187 try:
3188 value = opObj.getParameterValue(parameterName='wr_period')
3189 except:
3190 value = " "
3213
3214 parmObj = opObj.getParameterObj(parameterName="figpath")
3215 if parmObj:
3216 value = parmObj.getValue()
3217 self.specGraphPath.setText(value)
3218
3219 parmObj = opObj.getParameterObj(parameterName="wr_period")
3220 if parmObj:
3221 value = parmObj.getValue()
3191 3222 self.specGgraphftpratio.setText(str(value))
3192
3223
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
3193 3245 opObj = puObj.getOperationObj(name='RTIPlot')
3194 # opObj = puObj.getOpObjfromParamValue(value="RTIPlot")
3246
3195 3247 if opObj == None:
3196 3248 self.specGraphCebRTIplot.setCheckState(0)
3197 3249 self.specGraphSaveRTIplot.setCheckState(0)
@@ -3200,7 +3252,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
3200 3252 self.specGraphCebRTIplot.setCheckState(QtCore.Qt.Checked)
3201 3253 parmObj = opObj.getParameterObj(parameterName='channelList')
3202 3254 if parmObj == None:
3203 self.specGgraphChannelList.clear()
3255 self.specGgraphChannelList.clear()
3204 3256 else:
3205 3257 value = opObj.getParameterValue(parameterName='channelList')
3206 3258 channelListRTIPlot = str(value)[1:-1]
@@ -3211,68 +3263,92 class BasicWindow(QMainWindow, Ui_BasicWindow):
3211 3263 if parmObj == None:
3212 3264 self.specGgraphTminTmax.clear()
3213 3265 else:
3214 value1 = opObj.getParameterValue(parameterName='xmin')
3215 value1 = str(value1)
3216 value2 = opObj.getParameterValue(parameterName='xmax')
3217 value2 = str(value2)
3218 value = value1 + "," + value2
3219 self.specGgraphTminTmax.setText(value)
3220 self.specGgraphTminTmax.setEnabled(True)
3266 value1 = opObj.getParameterValue(parameterName='xmin')
3267 value1 = str(value1)
3268 value2 = opObj.getParameterValue(parameterName='xmax')
3269 value2 = str(value2)
3270 value = value1 + "," + value2
3271 self.specGgraphTminTmax.setText(value)
3272 self.specGgraphTminTmax.setEnabled(True)
3221 3273
3222 3274 parmObj = opObj.getParameterObj(parameterName='timerange')
3223 3275 if parmObj == None:
3224 3276 self.specGgraphTimeRange.clear()
3225 3277 else:
3226 value1 = opObj.getParameterValue(parameterName='timerange')
3227 value1 = str(value1)
3228 self.specGgraphTimeRange.setText(value1)
3229 self.specGgraphTimeRange.setEnabled(True)
3278 value1 = opObj.getParameterValue(parameterName='timerange')
3279 value1 = str(value1)
3280 self.specGgraphTimeRange.setText(value1)
3281 self.specGgraphTimeRange.setEnabled(True)
3230 3282
3231 3283 parmObj = opObj.getParameterObj(parameterName='ymin')
3232 3284 if parmObj == None:
3233 3285 self.specGgraphHeight.clear()
3234 3286 else:
3235 value1 = opObj.getParameterValue(parameterName='ymin')
3236 value1 = str(value1)
3237 value2 = opObj.getParameterValue(parameterName='ymax')
3238 value2 = str(value2)
3239 value = value1 + "," + value2
3240 self.specGgraphHeight.setText(value)
3241 self.specGgraphHeight.setEnabled(True)
3287 value1 = opObj.getParameterValue(parameterName='ymin')
3288 value1 = str(value1)
3289 value2 = opObj.getParameterValue(parameterName='ymax')
3290 value2 = str(value2)
3291 value = value1 + "," + value2
3292 self.specGgraphHeight.setText(value)
3293 self.specGgraphHeight.setEnabled(True)
3242 3294
3243 3295 parmObj = opObj.getParameterObj(parameterName='zmin')
3244 3296 if parmObj == None:
3245 3297 self.specGgraphDbsrange.clear()
3246 3298 else:
3247 value1 = opObj.getParameterValue(parameterName='zmin')
3248 value1 = str(value1)
3249 value2 = opObj.getParameterValue(parameterName='zmax')
3250 value2 = str(value2)
3251 value = value1 + "," + value2
3252 self.specGgraphDbsrange.setText(value)
3253 self.specGgraphDbsrange.setEnabled(True)
3254
3255 parmObj = opObj.getParameterObj(parameterName="figpath")
3299 value1 = opObj.getParameterValue(parameterName='zmin')
3300 value1 = str(value1)
3301 value2 = opObj.getParameterValue(parameterName='zmax')
3302 value2 = str(value2)
3303 value = value1 + "," + value2
3304 self.specGgraphDbsrange.setText(value)
3305 self.specGgraphDbsrange.setEnabled(True)
3306
3307 parmObj = opObj.getParameterObj(parameterName="save")
3256 3308 if parmObj == None:
3257 3309 self.specGraphSaveRTIplot.setCheckState(0)
3258 3310 else:
3259 3311 self.specGraphSaveRTIplot.setCheckState(QtCore.Qt.Checked)
3260 value = opObj.getParameterValue(parameterName='figpath')
3261 self.specGraphPath.setText(value)
3262
3312
3263 3313 parmObj = opObj.getParameterObj(parameterName="ftp")
3264 3314 if parmObj == None:
3265 3315 self.specGraphftpRTIplot.setCheckState(0)
3266 3316 else:
3267 3317 self.specGraphftpRTIplot.setCheckState(QtCore.Qt.Checked)
3268 try:
3269 value = opObj.getParameterValue(parameterName='wr_period')
3270 except:
3271 value = " "
3318
3319 parmObj = opObj.getParameterObj(parameterName="figpath")
3320 if parmObj:
3321 value = parmObj.getValue()
3322 self.specGraphPath.setText(value)
3323
3324 parmObj = opObj.getParameterObj(parameterName="wr_period")
3325 if parmObj:
3326 value = parmObj.getValue()
3272 3327 self.specGgraphftpratio.setText(str(value))
3273
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
3274 3350 opObj = puObj.getOperationObj(name='CoherenceMap')
3275 # opObj = puObj.getOpObjfromParamValue(value="CoherenceMap")
3351
3276 3352 if opObj == None:
3277 3353 self.specGraphCebCoherencmap.setCheckState(0)
3278 3354 self.specGraphSaveCoherencemap.setCheckState(0)
@@ -3348,28 +3424,52 class BasicWindow(QMainWindow, Ui_BasicWindow):
3348 3424 value = value1 + "," + value2
3349 3425 self.specGgraphPhase.setText(value)
3350 3426 self.specGgraphPhase.setEnabled(True)
3351
3352 parmObj = opObj.getParameterObj(parameterName="figpath")
3427
3428 parmObj = opObj.getParameterObj(parameterName="save")
3353 3429 if parmObj == None:
3354 3430 self.specGraphSaveCoherencemap.setCheckState(0)
3355 3431 else:
3356 3432 self.specGraphSaveCoherencemap.setCheckState(QtCore.Qt.Checked)
3357 value = opObj.getParameterValue(parameterName='figpath')
3358 self.specGraphPath.setText(value)
3359
3433
3360 3434 parmObj = opObj.getParameterObj(parameterName="ftp")
3361 3435 if parmObj == None:
3362 3436 self.specGraphftpCoherencemap.setCheckState(0)
3363 3437 else:
3364 3438 self.specGraphftpCoherencemap.setCheckState(QtCore.Qt.Checked)
3365 try:
3366 value = opObj.getParameterValue(parameterName='wr_period')
3367 except:
3368 value = " "
3439
3440 parmObj = opObj.getParameterObj(parameterName="figpath")
3441 if parmObj:
3442 value = parmObj.getValue()
3443 self.specGraphPath.setText(value)
3444
3445 parmObj = opObj.getParameterObj(parameterName="wr_period")
3446 if parmObj:
3447 value = parmObj.getValue()
3369 3448 self.specGgraphftpratio.setText(str(value))
3370
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
3371 3471 opObj = puObj.getOperationObj(name='PowerProfilePlot')
3372 # opObj = puObj.getOpObjfromParamValue(value="PowerProfilePlot")
3472
3373 3473 if opObj == None:
3374 3474 self.specGraphPowerprofile.setCheckState(0)
3375 3475 self.specGraphSavePowerprofile.setCheckState(0)
@@ -3385,47 +3485,71 class BasicWindow(QMainWindow, Ui_BasicWindow):
3385 3485 if parmObj == None:
3386 3486 self.specGgraphDbsrange.clear()
3387 3487 else:
3388 value1 = opObj.getParameterValue(parameterName='xmin')
3389 value1 = str(value1)
3390 value2 = opObj.getParameterValue(parameterName='xmax')
3391 value2 = str(value2)
3392 value = value1 + "," + value2
3393 self.specGgraphDbsrange.setText(value)
3394 self.specGgraphDbsrange.setEnabled(True)
3488 value1 = opObj.getParameterValue(parameterName='xmin')
3489 value1 = str(value1)
3490 value2 = opObj.getParameterValue(parameterName='xmax')
3491 value2 = str(value2)
3492 value = value1 + "," + value2
3493 self.specGgraphDbsrange.setText(value)
3494 self.specGgraphDbsrange.setEnabled(True)
3395 3495
3396 3496 parmObj = opObj.getParameterObj(parameterName='ymin')
3397 3497 if parmObj == None:
3398 3498 self.specGgraphHeight.clear()
3399 3499 else:
3400 value1 = opObj.getParameterValue(parameterName='ymin')
3401 value1 = str(value1)
3402 value2 = opObj.getParameterValue(parameterName='ymax')
3403 value2 = str(value2)
3404 value = value1 + "," + value2
3405 self.specGgraphHeight.setText(value)
3406 self.specGgraphHeight.setEnabled(True)
3407
3408 parmObj = opObj.getParameterObj(parameterName="figpath")
3500 value1 = opObj.getParameterValue(parameterName='ymin')
3501 value1 = str(value1)
3502 value2 = opObj.getParameterValue(parameterName='ymax')
3503 value2 = str(value2)
3504 value = value1 + "," + value2
3505 self.specGgraphHeight.setText(value)
3506 self.specGgraphHeight.setEnabled(True)
3507
3508 parmObj = opObj.getParameterObj(parameterName="save")
3409 3509 if parmObj == None:
3410 3510 self.specGraphSavePowerprofile.setCheckState(0)
3411 3511 else:
3412 self.specGraphSavePowerprofile.setCheckState(QtCore.Qt.Checked)
3413 value = opObj.getParameterValue(parameterName='figpath')
3414 self.specGraphPath.setText(value)
3415
3512 self.specGraphSavePowerprofile.setCheckState(QtCore.Qt.Checked)
3513
3416 3514 parmObj = opObj.getParameterObj(parameterName="ftp")
3417 3515 if parmObj == None:
3418 self.specGraphftpPowerprofile.setCheckState(0)
3516 self.specGraphftpPowerprofile.setCheckState(0)
3419 3517 else:
3420 3518 self.specGraphftpPowerprofile.setCheckState(QtCore.Qt.Checked)
3421 try:
3422 value = opObj.getParameterValue(parameterName='wr_period')
3423 except:
3424 value = " "
3519
3520 parmObj = opObj.getParameterObj(parameterName="figpath")
3521 if parmObj:
3522 value = parmObj.getValue()
3523 self.specGraphPath.setText(value)
3524
3525 parmObj = opObj.getParameterObj(parameterName="wr_period")
3526 if parmObj:
3527 value = parmObj.getValue()
3425 3528 self.specGgraphftpratio.setText(str(value))
3426 # -noise
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
3427 3551 opObj = puObj.getOperationObj(name='Noise')
3428 # opObj = puObj.getOpObjfromParamValue(value="Noise")
3552
3429 3553 if opObj == None:
3430 3554 self.specGraphCebRTInoise.setCheckState(0)
3431 3555 self.specGraphSaveRTInoise.setCheckState(0)
@@ -3445,56 +3569,79 class BasicWindow(QMainWindow, Ui_BasicWindow):
3445 3569 if parmObj == None:
3446 3570 self.specGgraphTminTmax.clear()
3447 3571 else:
3448 value1 = opObj.getParameterValue(parameterName='xmin')
3449 value1 = str(value1)
3450 value2 = opObj.getParameterValue(parameterName='xmax')
3451 value2 = str(value2)
3452 value = value1 + "," + value2
3453 self.specGgraphTminTmax.setText(value)
3454 self.specGgraphTminTmax.setEnabled(True)
3572 value1 = opObj.getParameterValue(parameterName='xmin')
3573 value1 = str(value1)
3574 value2 = opObj.getParameterValue(parameterName='xmax')
3575 value2 = str(value2)
3576 value = value1 + "," + value2
3577 self.specGgraphTminTmax.setText(value)
3578 self.specGgraphTminTmax.setEnabled(True)
3455 3579
3456 3580 parmObj = opObj.getParameterObj(parameterName='timerange')
3457 3581 if parmObj == None:
3458 3582 self.specGgraphTimeRange.clear()
3459 3583 else:
3460 value1 = opObj.getParameterValue(parameterName='timerange')
3461 value1 = str(value1)
3462 self.specGgraphTimeRange.setText(value1)
3463 self.specGgraphTimeRange.setEnabled(True)
3584 value1 = opObj.getParameterValue(parameterName='timerange')
3585 value1 = str(value1)
3586 self.specGgraphTimeRange.setText(value1)
3587 self.specGgraphTimeRange.setEnabled(True)
3464 3588
3465 3589
3466 3590 parmObj = opObj.getParameterObj(parameterName='ymin')
3467 3591 if parmObj == None:
3468 3592 self.specGgraphDbsrange.clear()
3469 3593 else:
3470 value1 = opObj.getParameterValue(parameterName='ymin')
3471 value1 = str(value1)
3472 value2 = opObj.getParameterValue(parameterName='ymax')
3473 value2 = str(value2)
3474 value = value1 + "," + value2
3475 self.specGgraphDbsrange.setText(value)
3476 self.specGgraphDbsrange.setEnabled(True)
3594 value1 = opObj.getParameterValue(parameterName='ymin')
3595 value1 = str(value1)
3596 value2 = opObj.getParameterValue(parameterName='ymax')
3597 value2 = str(value2)
3598 value = value1 + "," + value2
3599 self.specGgraphDbsrange.setText(value)
3600 self.specGgraphDbsrange.setEnabled(True)
3477 3601
3478 parmObj = opObj.getParameterObj(parameterName="figpath")
3602 parmObj = opObj.getParameterObj(parameterName="save")
3479 3603 if parmObj == None:
3480 3604 self.specGraphSaveRTInoise.setCheckState(0)
3481 3605 else:
3482 self.specGraphSaveRTInoise.setCheckState(QtCore.Qt.Checked)
3483 value = opObj.getParameterValue(parameterName='figpath')
3484 self.specGraphPath.setText(value)
3485
3606 self.specGraphSaveRTInoise.setCheckState(QtCore.Qt.Checked)
3607
3486 3608 parmObj = opObj.getParameterObj(parameterName="ftp")
3487 3609 if parmObj == None:
3488 3610 self.specGraphftpRTInoise.setCheckState(0)
3489 3611 else:
3490 self.specGraphftpRTInoise.setCheckState(QtCore.Qt.Checked)
3491 try:
3492 value = opObj.getParameterValue(parameterName='wr_period')
3493 except:
3494 value = " "
3495 self.specGgraphftpratio.setText(str(value))
3496
3497 # outputSpectraWrite
3612 self.specGraphftpRTInoise.setCheckState(QtCore.Qt.Checked)
3613
3614 parmObj = opObj.getParameterObj(parameterName="figpath")
3615 if parmObj:
3616 value = parmObj.getValue()
3617 self.specGraphPath.setText(value)
3618
3619 parmObj = opObj.getParameterObj(parameterName="wr_period")
3620 if parmObj:
3621 value = parmObj.getValue()
3622 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
3498 3645 opObj = puObj.getOperationObj(name='SpectraWriter')
3499 3646 if opObj == None:
3500 3647 self.specOutputPath.clear()
@@ -3542,19 +3689,27 class BasicWindow(QMainWindow, Ui_BasicWindow):
3542 3689 self.specHeisOpCobIncInt.setCurrentIndex(0)
3543 3690
3544 3691 # SpectraHeis Graph
3692
3693 self.specHeisGgraphXminXmax.clear()
3694 self.specHeisGgraphYminYmax.clear()
3695
3696 self.specHeisGgraphChannelList.clear()
3697 self.specHeisGgraphTminTmax.clear()
3698 self.specHeisGgraphTimeRange.clear()
3699 self.specHeisGgraphftpratio.clear()
3700
3545 3701 opObj = puObj.getOperationObj(name='SpectraHeisScope')
3546 # opObj = puObj.getOpObjfromParamValue(value="SpectraHeisScope")
3547 3702 if opObj == None:
3548 3703 self.specHeisGraphCebSpectraplot.setCheckState(0)
3549 3704 self.specHeisGraphSaveSpectra.setCheckState(0)
3550 3705 self.specHeisGraphftpSpectra.setCheckState(0)
3551
3552 3706 else:
3553 3707 operationSpectraHeisScope = "Enable"
3554 3708 self.specHeisGraphCebSpectraplot.setCheckState(QtCore.Qt.Checked)
3709
3555 3710 parmObj = opObj.getParameterObj(parameterName='channelList')
3556 3711 if parmObj == None:
3557 self.specHeisGgraphChannelList.clear()
3712 self.specHeisGgraphChannelList.clear()
3558 3713 else:
3559 3714 value = opObj.getParameterValue(parameterName='channelList')
3560 3715 channelListSpectraHeisScope = str(value)[1:-1]
@@ -3565,47 +3720,71 class BasicWindow(QMainWindow, Ui_BasicWindow):
3565 3720 if parmObj == None:
3566 3721 self.specHeisGgraphXminXmax.clear()
3567 3722 else:
3568 value1 = opObj.getParameterValue(parameterName='xmin')
3569 value1 = str(value1)
3570 value2 = opObj.getParameterValue(parameterName='xmax')
3571 value2 = str(value2)
3572 value = value1 + "," + value2
3573 self.specHeisGgraphXminXmax.setText(value)
3574 self.specHeisGgraphXminXmax.setEnabled(True)
3723 value1 = opObj.getParameterValue(parameterName='xmin')
3724 value1 = str(value1)
3725 value2 = opObj.getParameterValue(parameterName='xmax')
3726 value2 = str(value2)
3727 value = value1 + "," + value2
3728 self.specHeisGgraphXminXmax.setText(value)
3729 self.specHeisGgraphXminXmax.setEnabled(True)
3575 3730
3576 3731 parmObj = opObj.getParameterObj(parameterName='ymin')
3577 3732 if parmObj == None:
3578 3733 self.specHeisGgraphYminYmax.clear()
3579 3734 else:
3580 value1 = opObj.getParameterValue(parameterName='ymin')
3581 value1 = str(value1)
3582 value2 = opObj.getParameterValue(parameterName='ymax')
3583 value2 = str(value2)
3584 value = value1 + "," + value2
3585 self.specHeisGgraphYminYmax.setText(value)
3586 self.specHeisGgraphYminYmax.setEnabled(True)
3587
3588 parmObj = opObj.getParameterObj(parameterName="figpath")
3735 value1 = opObj.getParameterValue(parameterName='ymin')
3736 value1 = str(value1)
3737 value2 = opObj.getParameterValue(parameterName='ymax')
3738 value2 = str(value2)
3739 value = value1 + "," + value2
3740 self.specHeisGgraphYminYmax.setText(value)
3741 self.specHeisGgraphYminYmax.setEnabled(True)
3742
3743 parmObj = opObj.getParameterObj(parameterName="save")
3589 3744 if parmObj == None:
3590 self.specHeisGraphSaveSpectra.setCheckState(0)
3745 self.specHeisGraphSaveSpectra.setCheckState(0)
3591 3746 else:
3592 self.specHeisGraphSaveSpectra.setCheckState(QtCore.Qt.Checked)
3593 value = opObj.getParameterValue(parameterName='figpath')
3594 self.specHeisGraphPath.setText(value)
3595
3747 self.specHeisGraphSaveSpectra.setCheckState(QtCore.Qt.Checked)
3748
3596 3749 parmObj = opObj.getParameterObj(parameterName="ftp")
3597 3750 if parmObj == None:
3598 self.specHeisGraphftpSpectra.setCheckState(0)
3751 self.specHeisGraphftpSpectra.setCheckState(0)
3599 3752 else:
3600 self.specHeisGraphftpSpectra.setCheckState(QtCore.Qt.Checked)
3601 try:
3602 value = opObj.getParameterValue(parameterName='wr_period')
3603 except:
3604 value = " "
3605 self.specHeisGgraphftpratio.setText(str(value))
3606
3607 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
3608 # opObj = puObj.getOpObjfromParamValue(value="RTIfromSpectraHeis")
3753 self.specHeisGraphftpSpectra.setCheckState(QtCore.Qt.Checked)
3754
3755 parmObj = opObj.getParameterObj(parameterName="figpath")
3756 if parmObj:
3757 value = parmObj.getValue()
3758 self.specHeisGraphPath.setText(value)
3759
3760 parmObj = opObj.getParameterObj(parameterName="wr_period")
3761 if parmObj:
3762 value = parmObj.getValue()
3763 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
3786 opObj = puObj.getOperationObj(name='RTIfromSpectraHeis')
3787
3609 3788 if opObj == None:
3610 3789 self.specHeisGraphCebRTIplot.setCheckState(0)
3611 3790 self.specHeisGraphSaveRTIplot.setCheckState(0)
@@ -3614,7 +3793,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
3614 3793 self.specHeisGraphCebRTIplot.setCheckState(QtCore.Qt.Checked)
3615 3794 parmObj = opObj.getParameterObj(parameterName='channelList')
3616 3795 if parmObj == None:
3617 self.specHeisGgraphChannelList.clear()
3796 self.specHeisGgraphChannelList.clear()
3618 3797 else:
3619 3798 value = opObj.getParameterValue(parameterName='channelList')
3620 3799 channelListRTIPlot = str(value)[1:-1]
@@ -3625,54 +3804,78 class BasicWindow(QMainWindow, Ui_BasicWindow):
3625 3804 if parmObj == None:
3626 3805 self.specHeisGgraphTminTmax.clear()
3627 3806 else:
3628 value1 = opObj.getParameterValue(parameterName='xmin')
3629 value1 = str(value1)
3630 value2 = opObj.getParameterValue(parameterName='xmax')
3631 value2 = str(value2)
3632 value = value1 + "," + value2
3633 self.specHeisGgraphTminTmax.setText(value)
3634 self.specHeisGgraphTminTmax.setEnabled(True)
3807 value1 = opObj.getParameterValue(parameterName='xmin')
3808 value1 = str(value1)
3809 value2 = opObj.getParameterValue(parameterName='xmax')
3810 value2 = str(value2)
3811 value = value1 + "," + value2
3812 self.specHeisGgraphTminTmax.setText(value)
3813 self.specHeisGgraphTminTmax.setEnabled(True)
3635 3814
3636 3815 parmObj = opObj.getParameterObj(parameterName='timerange')
3637 3816 if parmObj == None:
3638 3817 self.specGgraphTimeRange.clear()
3639 3818 else:
3640 value1 = opObj.getParameterValue(parameterName='timerange')
3641 value1 = str(value1)
3642 self.specHeisGgraphTimeRange.setText(value1)
3643 self.specHeisGgraphTimeRange.setEnabled(True)
3819 value1 = opObj.getParameterValue(parameterName='timerange')
3820 value1 = str(value1)
3821 self.specHeisGgraphTimeRange.setText(value1)
3822 self.specHeisGgraphTimeRange.setEnabled(True)
3644 3823
3645 3824 parmObj = opObj.getParameterObj(parameterName='ymin')
3646 3825 if parmObj == None:
3647 3826 self.specHeisGgraphYminYmax.clear()
3648 3827 else:
3649 value1 = opObj.getParameterValue(parameterName='ymin')
3650 value1 = str(value1)
3651 value2 = opObj.getParameterValue(parameterName='ymax')
3652 value2 = str(value2)
3653 value = value1 + "," + value2
3654 self.specHeisGgraphYminYmax.setText(value)
3655 self.specHeisGgraphYminYmax.setEnabled(True)
3656
3657 parmObj = opObj.getParameterObj(parameterName="figpath")
3828 value1 = opObj.getParameterValue(parameterName='ymin')
3829 value1 = str(value1)
3830 value2 = opObj.getParameterValue(parameterName='ymax')
3831 value2 = str(value2)
3832 value = value1 + "," + value2
3833 self.specHeisGgraphYminYmax.setText(value)
3834 self.specHeisGgraphYminYmax.setEnabled(True)
3835
3836 parmObj = opObj.getParameterObj(parameterName="save")
3658 3837 if parmObj == None:
3659 3838 self.specHeisGraphSaveRTIplot.setCheckState(0)
3660 3839 else:
3661 self.specHeisGraphSaveRTIplot.setCheckState(QtCore.Qt.Checked)
3662 value = opObj.getParameterValue(parameterName='figpath')
3663 self.specHeisGraphPath.setText(value)
3664
3840 self.specHeisGraphSaveRTIplot.setCheckState(QtCore.Qt.Checked)
3841
3665 3842 parmObj = opObj.getParameterObj(parameterName="ftp")
3666 3843 if parmObj == None:
3667 3844 self.specHeisGraphftpRTIplot.setCheckState(0)
3668 3845 else:
3669 self.specHeisGraphftpRTIplot.setCheckState(QtCore.Qt.Checked)
3670 try:
3671 value = opObj.getParameterValue(parameterName='wr_period')
3672 except:
3673 value = " "
3674 self.specHeisGgraphftpratio.setText(str(value))
3846 self.specHeisGraphftpRTIplot.setCheckState(QtCore.Qt.Checked)
3847
3848 parmObj = opObj.getParameterObj(parameterName="figpath")
3849 if parmObj:
3850 value = parmObj.getValue()
3851 self.specHeisGraphPath.setText(value)
3852
3853 parmObj = opObj.getParameterObj(parameterName="wr_period")
3854 if parmObj:
3855 value = parmObj.getValue()
3856 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)
3675 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
3676 3879 # outputSpectraHeisWrite
3677 3880 opObj = puObj.getOperationObj(name='FitsWriter')
3678 3881 if opObj == None:
@@ -3742,21 +3945,35 class BasicWindow(QMainWindow, Ui_BasicWindow):
3742 3945
3743 3946 def refreshPUProperties(self, puObjView):
3744 3947
3948 ############ FTP CONFIG ################################
3949 if puObjView.id in self.__puLocalFolder2FTP.keys():
3950 self.__puLocalFolder2FTP.pop(puObjView.id)
3951 ########################################################
3952
3745 3953 propertyBuffObj = PropertyBuffer()
3746 3954
3747 3955 for thisOp in puObjView.getOperationObjList():
3748 3956
3749 3957 operationName = thisOp.name
3958
3750 3959 if operationName == 'run':
3751 3960 operationName = 'Properties'
3752 else:
3753 if not thisOp.getParameterObjList():
3754 propertyBuffObj.append(operationName, '--', '--')
3961
3962 if not thisOp.getParameterObjList():
3963 propertyBuffObj.append(operationName, '--', '--')
3964 continue
3755 3965
3756 3966 for thisParmObj in thisOp.getParameterObjList():
3757
3758 3967 propertyBuffObj.append(operationName, thisParmObj.name, str(thisParmObj.getValue()))
3759
3968
3969 ############ FTP CONFIG ################################
3970 if thisParmObj.name == 'ftp' and thisParmObj.getValue():
3971 figpath = thisOp.getParameterValue('figpath')
3972 if not figpath:
3973 continue
3974 self.__puLocalFolder2FTP[puObjView.id] = figpath
3975 ########################################################
3976
3760 3977 propertiesModel = propertyBuffObj.getPropertyModel()
3761 3978
3762 3979 self.treeProjectProperties.setModel(propertiesModel)
@@ -3813,31 +4030,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
3813 4030
3814 4031 puObj = selectedObjView
3815 4032
3816 if self.selectedItemTree.text() == 'Voltage':
3817 voltEnable = True
3818 tabSelected = self.tabVoltage
3819
3820 if self.selectedItemTree.text() == 'Spectra':
3821 specEnable = True
3822 tabSelected = self.tabSpectra
3823
3824 if self.selectedItemTree.text() == 'Correlation':
3825 corrEnable = True
3826 tabSelected = self.tabCorrelation
3827
3828 if self.selectedItemTree.text() == 'SpectraHeis':
3829 specHeisEnable = True
3830 tabSelected = self.tabSpectraHeis
3831
3832 self.refreshPUWindow(puObj=puObj)
4033 self.refreshPUWindow(puObj)
3833 4034 self.refreshPUProperties(puObj)
3834
3835 self.tabProject.setEnabled(False)
3836 self.tabVoltage.setEnabled(voltEnable)
3837 self.tabSpectra.setEnabled(specEnable)
3838 self.tabCorrelation.setEnabled(corrEnable)
3839 self.tabSpectraHeis.setEnabled(specHeisEnable)
3840 self.tabWidgetProject.setCurrentWidget(tabSelected)
4035 self.showtabPUCreated(puObj.datatype)
3841 4036
3842 4037 def on_right_click(self, pos):
3843 4038
@@ -4067,7 +4262,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4067 4262
4068 4263 puObj = self.createProcUnitView(projectObjView, datatype, inputId)
4069 4264
4070 self.addPU2ProjectExplorer(id=puObj.getId(), name=datatype)
4265 self.addPU2ProjectExplorer(puObj)
4071 4266
4072 4267 self.showtabPUCreated(datatype)
4073 4268
@@ -4077,89 +4272,135 class BasicWindow(QMainWindow, Ui_BasicWindow):
4077 4272
4078 4273 def addFTPConf2Operation(self, puObj, opObj):
4079 4274
4080 if self.temporalFTP.create:
4081 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
4082 else:
4275 if not self.temporalFTP.create:
4083 4276 self.temporalFTP.setwithoutconfiguration()
4084 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.temporalFTP.recover()
4085
4086 # opObj.addParameter(name='server', value=server, format='str')
4087 # opObj.addParameter(name='folder', value=remotefolder, format='str')
4088 # opObj.addParameter(name='username', value=username, format='str')
4089 # opObj.addParameter(name='password', value=password, format='str')
4090
4091 if ftp_wei:
4092 opObj.addParameter(name='ftp_wei', value=int(ftp_wei), format='int')
4093 if exp_code:
4094 opObj.addParameter(name='exp_code', value=int(exp_code), format='int')
4095 if sub_exp_code:
4096 opObj.addParameter(name='sub_exp_code', value=int(sub_exp_code), format='int')
4097 if plot_pos:
4098 opObj.addParameter(name='plot_pos', value=int(plot_pos), format='int')
4099
4100 if puObj.datatype == "Spectra":
4101 value = self.specGgraphftpratio.text()
4102 if puObj.datatype == "SpectraHeis":
4103 value = self.specHeisGgraphftpratio.text()
4104
4105 if not value == "":
4106 try:
4107 value = int(value)
4108 opObj.addParameter(name='wr_period', value=value, format='int')
4109 except:
4110 pass
4277
4278 # opObj.addParameter(name='server', value=self.temporalFTP.server, format='str')
4279 # opObj.addParameter(name='remotefolder', value=self.temporalFTP.remotefolder, format='str')
4280 # opObj.addParameter(name='username', value=self.temporalFTP.username, format='str')
4281 # opObj.addParameter(name='password', value=self.temporalFTP.password, format='str')
4282
4283 if self.temporalFTP.ftp_wei:
4284 opObj.addParameter(name='ftp_wei', value=int(self.temporalFTP.ftp_wei), format='int')
4285 if self.temporalFTP.exp_code:
4286 opObj.addParameter(name='exp_code', value=int(self.temporalFTP.exp_code), format='int')
4287 if self.temporalFTP.sub_exp_code:
4288 opObj.addParameter(name='sub_exp_code', value=int(self.temporalFTP.sub_exp_code), format='int')
4289 if self.temporalFTP.plot_pos:
4290 opObj.addParameter(name='plot_pos', value=int(self.temporalFTP.plot_pos), format='int')
4111 4291
4292 def __checkFTPProcUnit(self, projectObj, localfolder):
4112 4293
4113 def addFTPProcUnitView(self, server, username, password, remotefolder,
4114 ftp_wei, exp_code, sub_exp_code, plot_pos,
4115 localfolder='./', extension='.png', period='60', protocol='ftp'):
4294 puId = None
4295 puObj = None
4296
4297 for thisPuId, thisPuObj in projectObj.procUnitItems():
4298
4299 if not thisPuObj.name == "SendToServer":
4300 continue
4301
4302 opObj = thisPuObj.getOperationObj(name='run')
4303
4304 parmObj = opObj.getParameterObj('localfolder')
4305
4306 #localfolder parameter should always be set, if it is not set then ProcUnit should be removed
4307 if not parmObj:
4308 projectObj.removeProcUnit(thisPuId)
4309 continue
4310
4311 thisLocalfolder = parmObj.getValue()
4312
4313 if localfolder != thisLocalfolder:
4314 continue
4315
4316 puId = thisPuId
4317 puObj = thisPuObj
4318 break
4116 4319
4117 projectObj = self.getSelectedProjectObj()
4118 procUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
4320 return puObj
4321
4322 def __addFTPProcUnitFrom(self, operationObj):
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")
4119 4340
4120 if not procUnitConfObj:
4121 procUnitConfObj = projectObj.addProcUnit(name="SendToServer")
4122 else:
4123 procUnitConfObj.removeOperations()
4124
4125 4341 procUnitConfObj.addParameter(name='server', value=server, format='str')
4126 4342 procUnitConfObj.addParameter(name='username', value=username, format='str')
4127 4343 procUnitConfObj.addParameter(name='password', value=password, format='str')
4128 procUnitConfObj.addParameter(name='localfolder', value=localfolder, format='str')
4344 procUnitConfObj.addParameter(name='localfolder', value=localfolder, format='list')
4129 4345 procUnitConfObj.addParameter(name='remotefolder', value=remotefolder, format='str')
4130 procUnitConfObj.addParameter(name='ext', value=extension, format='str')
4346 procUnitConfObj.addParameter(name='ext', value=ext, format='str')
4131 4347 procUnitConfObj.addParameter(name='period', value=period, format='int')
4132 procUnitConfObj.addParameter(name='protocol', value=protocol, format='str')
4133
4134 procUnitConfObj.addParameter(name='ftp_wei', value=ftp_wei, format='str')
4135 procUnitConfObj.addParameter(name='exp_code', value=exp_code, format='str')
4136 procUnitConfObj.addParameter(name='sub_exp_code', value=sub_exp_code, format='str')
4137 procUnitConfObj.addParameter(name='plot_pos', value=plot_pos, format='str')
4138 4348
4139 4349 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
4140 4350
4141 self.__ftpProcUnitAdded = True
4142 self.__ftpProcUnitId = procUnitConfObj.getId()
4143
4144 def removeFTPProcUnitView(self):
4351 return procUnitConfObj
4352
4353 def addFTPProcUnitView(self):
4145 4354
4146 projectObj = self.getSelectedProjectObj()
4147 procUnitConfObj = projectObj.getProcUnitObjByName(name="SendToServer")
4148
4149 self.__ftpProcUnitAdded = False
4150 self.__ftpProcUnitId = None
4355 if not self.temporalFTP.create:
4356 self.temporalFTP.setwithoutconfiguration()
4151 4357
4152 if not procUnitConfObj:
4358 projectObj = self.getSelectedProjectObj()
4359
4360 self.removeAllFTPProcUnitView(projectObj)
4361
4362 if not self.__puLocalFolder2FTP:
4153 4363 return
4154 4364
4155 projectObj.removeProcUnit(procUnitConfObj.getId())
4365 folderList = ""
4156 4366
4157 if procUnitConfObj.getId() not in self.__puObjDict.keys():
4158 return
4367 for localfolder in self.__puLocalFolder2FTP.values():
4368 folderList += str(localfolder) + ","
4369
4370 procUnitConfObj = projectObj.addProcUnit(name="SendToServer")
4371
4372 procUnitConfObj.addParameter(name='server', value=self.temporalFTP.server, format='str')
4373 procUnitConfObj.addParameter(name='username', value=self.temporalFTP.username, format='str')
4374 procUnitConfObj.addParameter(name='password', value=self.temporalFTP.password, format='str')
4375 procUnitConfObj.addParameter(name='localfolder', value=folderList, format='list')
4376 procUnitConfObj.addParameter(name='remotefolder', value=self.temporalFTP.remotefolder, format='str')
4377 procUnitConfObj.addParameter(name='ext', value=self.temporalFTP.extension, format='str')
4378 procUnitConfObj.addParameter(name='period', value=self.temporalFTP.period, format='int')
4379 procUnitConfObj.addParameter(name='protocol', value=self.temporalFTP.protocol, format='str')
4380
4381 procUnitConfObj.addParameter(name='ftp_wei', value=self.temporalFTP.ftp_wei, format='str')
4382 procUnitConfObj.addParameter(name='exp_code', value=self.temporalFTP.exp_code, format='str')
4383 procUnitConfObj.addParameter(name='sub_exp_code', value=self.temporalFTP.sub_exp_code, format='str')
4384 procUnitConfObj.addParameter(name='plot_pos', value=self.temporalFTP.plot_pos, format='str')
4385
4386 self.__puObjDict[procUnitConfObj.getId()] = procUnitConfObj
4387
4388 def removeAllFTPProcUnitView(self, projectObj):
4159 4389
4160 self.__puObjDict.pop(procUnitConfObj.getId())
4390 for thisPuId, thisPuObj in projectObj.procUnitItems():
4391
4392 if not thisPuObj.name == "SendToServer":
4393 continue
4394
4395 projectObj.removeProcUnit(thisPuId)
4396
4397 if thisPuId not in self.__puObjDict.keys():
4398 continue
4399
4400 self.__puObjDict.pop(thisPuId)
4161 4401
4162 4402 def showPUinitView(self):
4403
4163 4404 self.propertiesModel = TreeModel()
4164 4405 self.propertiesModel.initPUVoltageView()
4165 4406 self.treeProjectProperties.setModel(self.propertiesModel)
@@ -4167,119 +4408,129 class BasicWindow(QMainWindow, Ui_BasicWindow):
4167 4408 self.treeProjectProperties.allColumnsShowFocus()
4168 4409 self.treeProjectProperties.resizeColumnToContents(1)
4169 4410
4170 def saveFTPvalues(self, opObj):
4411 def saveFTPvalues(self, puObj):
4412
4413 opObj = puObj.getOperationObj(name="run")
4171 4414
4172 4415 parmObj = opObj.getParameterObj(parameterName="server")
4173 4416 if parmObj == None:
4174 4417 server = 'jro-app.igp.gob.pe'
4175 4418 else:
4176 server = opObj.getParameterValue(parameterName='server')
4419 server = parmObj.getValue()
4177 4420
4178 parmObj = opObj.getParameterObj(parameterName="folder")
4421 parmObj = opObj.getParameterObj(parameterName="remotefolder")
4179 4422 if parmObj == None:
4180 folder = '/home/wmaster/graficos'
4423 remotefolder = '/home/wmaster/graficos'
4181 4424 else:
4182 folder = opObj.getParameterValue(parameterName='folder')
4425 remotefolder = parmObj.getValue()
4183 4426
4184 4427 parmObj = opObj.getParameterObj(parameterName="username")
4185 4428 if parmObj == None:
4186 4429 username = 'wmaster'
4187 4430 else:
4188 username = opObj.getParameterValue(parameterName='username')
4431 username = parmObj.getValue()
4189 4432
4190 4433 parmObj = opObj.getParameterObj(parameterName="password")
4191 4434 if parmObj == None:
4192 4435 password = 'mst2010vhf'
4193 4436 else:
4194 password = opObj.getParameterValue(parameterName='password')
4437 password = parmObj.getValue()
4195 4438
4196 4439 parmObj = opObj.getParameterObj(parameterName="ftp_wei")
4197 4440 if parmObj == None:
4198 4441 ftp_wei = '0'
4199 4442 else:
4200 ftp_wei = opObj.getParameterValue(parameterName='ftp_wei')
4443 ftp_wei = parmObj.getValue()
4201 4444
4202 4445 parmObj = opObj.getParameterObj(parameterName="exp_code")
4203 4446 if parmObj == None:
4204 4447 exp_code = '0'
4205 4448 else:
4206 exp_code = opObj.getParameterValue(parameterName='exp_code')
4449 exp_code = parmObj.getValue()
4207 4450
4208 4451 parmObj = opObj.getParameterObj(parameterName="sub_exp_code")
4209 4452 if parmObj == None:
4210 4453 sub_exp_code = '0'
4211 4454 else:
4212 sub_exp_code = opObj.getParameterValue(parameterName='sub_exp_code')
4455 sub_exp_code = parmObj.getValue()
4213 4456
4214 4457 parmObj = opObj.getParameterObj(parameterName="plot_pos")
4215 4458 if parmObj == None:
4216 4459 plot_pos = '0'
4217 4460 else:
4218 plot_pos = opObj.getParameterValue(parameterName='plot_pos')
4461 plot_pos = parmObj.getValue()
4219 4462
4220 4463 parmObj = opObj.getParameterObj(parameterName="localfolder")
4221 4464 if parmObj == None:
4222 4465 localfolder = None
4223 4466 else:
4224 localfolder = opObj.getParameterValue(parameterName='localfolder')
4467 localfolder = parmObj.getValue()
4225 4468
4226 4469 parmObj = opObj.getParameterObj(parameterName="extension")
4227 4470 if parmObj == None:
4228 extension = None
4471 extension = '.png'
4229 4472 else:
4230 extension = opObj.getParameterValue(parameterName='extension')
4473 extension = parmObj.getValue()
4231 4474
4232 self.temporalFTP.save(server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos,
4475 self.temporalFTP.save(server=server,
4476 remotefolder=remotefolder,
4477 username=username,
4478 password=password,
4479 ftp_wei=ftp_wei,
4480 exp_code=exp_code,
4481 sub_exp_code=sub_exp_code,
4482 plot_pos=plot_pos,
4233 4483 localfolder=localfolder,
4234 4484 extension=extension)
4235 4485
4236 4486 def addProject2ProjectExplorer(self, id, name):
4237 4487
4238 4488 itemTree = QtGui.QStandardItem(QtCore.QString(str(name)))
4239 self.parentItem = self.projectExplorerModel.invisibleRootItem()
4240 self.parentItem.appendRow(itemTree)
4241 self.parentItem = itemTree
4242 self.projectExplorerTree.setCurrentIndex(self.parentItem.index())
4489
4490 parentItem = self.projectExplorerModel.invisibleRootItem()
4491 parentItem.appendRow(itemTree)
4492
4493 self.projectExplorerTree.setCurrentIndex(itemTree.index())
4243 4494
4244 4495 self.selectedItemTree = itemTree
4245 4496
4246 4497 self.__itemTreeDict[id] = itemTree
4247 4498
4248 def addPU2ProjectExplorer(self, id, name):
4249 # id1= round(int(id)/10.)*10
4250 # id= int(id)
4251 # id=id-id1
4499 def addPU2ProjectExplorer(self, puObj):
4500
4501 id, name = puObj.id, puObj.datatype
4502
4252 4503 itemTree = QtGui.QStandardItem(QtCore.QString(str(name)))
4253 4504
4254 self.parentItem = self.selectedItemTree
4255 self.parentItem.appendRow(itemTree)
4505 parentItem = self.selectedItemTree
4506 parentItem.appendRow(itemTree)
4256 4507 self.projectExplorerTree.expandAll()
4257 self.parentItem = itemTree
4258 self.projectExplorerTree.setCurrentIndex(self.parentItem.index())
4508
4509 self.projectExplorerTree.setCurrentIndex(itemTree.index())
4259 4510
4260 4511 self.selectedItemTree = itemTree
4261 4512
4262 4513 self.__itemTreeDict[id] = itemTree
4263 4514
4264 def addPU2PELoadXML(self, id, name, inputId):
4515 def addPU2PELoadXML(self, puObj):
4516
4517 id, name, inputId = puObj.id, puObj.datatype, puObj.inputId
4265 4518
4266 4519 itemTree = QtGui.QStandardItem(QtCore.QString(str(name)))
4267 4520
4268 4521 if self.__itemTreeDict.has_key(inputId):
4269 self.parentItem = self.__itemTreeDict[inputId]
4522 parentItem = self.__itemTreeDict[inputId]
4270 4523 else:
4271 4524 #If parent is a Reader object
4272 self.parentItem = self.__itemTreeDict[inputId[:-1]]
4525 parentItem = self.__itemTreeDict[id[:-1]]
4273 4526
4274 self.parentItem.appendRow(itemTree)
4527 parentItem.appendRow(itemTree)
4275 4528 self.projectExplorerTree.expandAll()
4276 self.parentItem = itemTree
4277 self.projectExplorerTree.setCurrentIndex(self.parentItem.index())
4278
4279 self.selectedItemTree = itemTree
4280
4529 parentItem = itemTree
4530 self.projectExplorerTree.setCurrentIndex(parentItem.index())
4531
4281 4532 self.__itemTreeDict[id] = itemTree
4282 # print "stop"
4533 self.selectedItemTree = itemTree
4283 4534
4284 4535 def getSelectedProjectObj(self):
4285 4536 """
@@ -4417,22 +4668,24 class BasicWindow(QMainWindow, Ui_BasicWindow):
4417 4668 self.__puObjDict[puId] = puObj
4418 4669
4419 4670 if puObj.name == "SendToServer":
4420 self.__ftpProcUnitAdded = True
4421 self.__ftpProcUnitId = puObj.getId()
4422
4423 opObj = puObj.getOperationObj(name="run")
4424 self.saveFTPvalues(opObj)
4671 self.saveFTPvalues(puObj)
4425 4672
4426 4673 if puObj.inputId == '0':
4427 4674 continue
4428 4675
4429 self.addPU2PELoadXML(id=puId , name=puObj.datatype , inputId=puObj.inputId)
4430
4431 if puObj.datatype in ("Voltage", "Spectra", "SpectraHeis"):
4432 self.refreshPUWindow(puObj)
4433 self.refreshPUProperties(puObj)
4434 self.showtabPUCreated(datatype=puObj.datatype)
4435
4676 self.addPU2PELoadXML(puObj)
4677
4678 self.refreshPUWindow(puObj)
4679 self.refreshPUProperties(puObj)
4680 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 ############################################################
4436 4689
4437 4690 self.console.clear()
4438 4691 self.console.append("The selected xml file has been loaded successfully")
@@ -4541,6 +4794,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
4541 4794
4542 4795 if not sts:
4543 4796 return None
4797
4798 self.addFTPProcUnitView()
4544 4799
4545 4800 if not filename:
4546 4801 filename = os.path.join( str(self.pathWorkSpace), "%s%s" %(str(projectObj.name), '.xml') )
@@ -4587,11 +4842,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4587 4842 del self.__itemTreeDict[projectObj.procUnitConfObjDict[key].getId()]
4588 4843 del projectObj.procUnitConfObjDict[key]
4589 4844 # print projectObj.procUnitConfObjDict
4590 # print self.__itemTreeDict,self.__projectObjDict,self.__puObjDict
4591
4592 def removefromtree(self, row):
4593 self.parentItem.removeRow(row)
4594
4845 # print self.__itemTreeDict,self.__projectObjDict,self.__puObjDict
4595 4846
4596 4847 def setInputsProject_View(self):
4597 4848
@@ -4763,13 +5014,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
4763 5014 self.specHeisGgraphYminYmax.clear()
4764 5015 self.specHeisGgraphTminTmax.clear()
4765 5016 self.specHeisGgraphTimeRange.clear()
4766 self.specHeisGgraphftpratio.clear()
4767
4768
4769
4770
5017 self.specHeisGgraphftpratio.clear()
4771 5018
4772 5019 def showtabPUCreated(self, datatype):
5020
4773 5021 if datatype == "Voltage":
4774 5022 self.tabVoltage.setEnabled(True)
4775 5023 self.tabProject.setEnabled(False)
@@ -4785,6 +5033,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4785 5033 self.tabCorrelation.setEnabled(False)
4786 5034 self.tabSpectraHeis.setEnabled(False)
4787 5035 self.tabWidgetProject.setCurrentWidget(self.tabSpectra)
5036
4788 5037 if datatype == "SpectraHeis":
4789 5038 self.tabVoltage.setEnabled(False)
4790 5039 self.tabProject.setEnabled(False)
@@ -5342,7 +5591,7 class Ftp(QMainWindow, Ui_Ftp):
5342 5591 create = False
5343 5592 closed = pyqtSignal()
5344 5593 server = None
5345 folder = None
5594 remotefolder = None
5346 5595 username = None
5347 5596 password = None
5348 5597 ftp_wei = None
@@ -5369,9 +5618,9 class Ftp(QMainWindow, Ui_Ftp):
5369 5618 self.subexpFTP.setToolTip('Example: 0')
5370 5619 self.plotposFTP.setToolTip('Example: 0')
5371 5620
5372 def setParmsfromTemporal(self, server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos):
5621 def setParmsfromTemporal(self, server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos):
5373 5622 self.serverFTP.setText(str(server))
5374 self.folderFTP.setText(str(folder))
5623 self.folderFTP.setText(str(remotefolder))
5375 5624 self.usernameFTP.setText(str(username))
5376 5625 self.passwordFTP.setText(str(password))
5377 5626 self.weightFTP.setText(str(ftp_wei))
@@ -5383,7 +5632,7 class Ftp(QMainWindow, Ui_Ftp):
5383 5632 """
5384 5633 Return Inputs Project:
5385 5634 - server
5386 - folder
5635 - remotefolder
5387 5636 - username
5388 5637 - password
5389 5638 - ftp_wei
@@ -5392,33 +5641,25 class Ftp(QMainWindow, Ui_Ftp):
5392 5641 - plot_pos
5393 5642 """
5394 5643 name_server_ftp = str(self.serverFTP.text())
5395 try:
5396 name = str(self.serverFTP.text())
5397 except:
5644 if not name_server_ftp:
5398 5645 self.console.clear()
5399 5646 self.console.append("Please Write a FTP Server")
5400 5647 return 0
5401 5648
5402 5649 folder_server_ftp = str(self.folderFTP.text())
5403 try:
5404 folder = str(self.folderFTP.text())
5405 except:
5650 if not folder_server_ftp:
5406 5651 self.console.clear()
5407 5652 self.console.append("Please Write a Folder")
5408 5653 return 0
5409 5654
5410 5655 username_ftp = str(self.usernameFTP.text())
5411 try:
5412 username = str(self.usernameFTP.text())
5413 except:
5656 if not username_ftp:
5414 5657 self.console.clear()
5415 5658 self.console.append("Please Write a User Name")
5416 5659 return 0
5417 5660
5418 5661 password_ftp = str(self.passwordFTP.text())
5419 try:
5420 password = str(self.passwordFTP.text())
5421 except:
5662 if not password_ftp:
5422 5663 self.console.clear()
5423 5664 self.console.append("Please Write a passwordFTP")
5424 5665 return 0
@@ -5464,7 +5705,7 class Ftp(QMainWindow, Ui_Ftp):
5464 5705
5465 5706 @pyqtSignature("")
5466 5707 def on_ftpOkButton_clicked(self):
5467 server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.getParmsFromFtpWindow()
5708 server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos = self.getParmsFromFtpWindow()
5468 5709 self.create = True
5469 5710 self.close()
5470 5711
@@ -5478,8 +5719,9 class Ftp(QMainWindow, Ui_Ftp):
5478 5719 event.accept()
5479 5720
5480 5721 class ftpBuffer():
5722
5481 5723 server = None
5482 folder = None
5724 remotefolder = None
5483 5725 username = None
5484 5726 password = None
5485 5727 ftp_wei = None
@@ -5498,7 +5740,7 class ftpBuffer():
5498 5740
5499 5741 self.create = False
5500 5742 self.server = None
5501 self.folder = None
5743 self.remotefolder = None
5502 5744 self.username = None
5503 5745 self.password = None
5504 5746 self.ftp_wei = None
@@ -5515,13 +5757,9 class ftpBuffer():
5515 5757
5516 5758 self.create = False
5517 5759 self.server = "jro-app.igp.gob.pe"
5518 self.folder = "/home/wmaster/graficos"
5760 self.remotefolder = "/home/wmaster/graficos"
5519 5761 self.username = "wmaster"
5520 5762 self.password = "mst2010vhf"
5521 self.ftp_wei = "0"
5522 self.exp_code = "0"
5523 self.sub_exp_code = "0"
5524 self.plot_pos = "0"
5525 5763 self.withoutconfig = True
5526 5764 self.localfolder = './'
5527 5765 self.extension = '.png'
@@ -5529,10 +5767,22 class ftpBuffer():
5529 5767 self.protocol = 'ftp'
5530 5768 self.createforView = True
5531 5769
5532 def save(self, server, folder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos, localfolder='./', extension='.png', period='60', protocol='ftp'):
5770 if not self.ftp_wei:
5771 self.ftp_wei = "0"
5772
5773 if not self.exp_code:
5774 self.exp_code = "0"
5775
5776 if not self.sub_exp_code:
5777 self.sub_exp_code = "0"
5778
5779 if not self.plot_pos:
5780 self.plot_pos = "0"
5781
5782 def save(self, server, remotefolder, username, password, ftp_wei, exp_code, sub_exp_code, plot_pos, localfolder='./', extension='.png', period='60', protocol='ftp'):
5533 5783
5534 5784 self.server = server
5535 self.folder = folder
5785 self.remotefolder = remotefolder
5536 5786 self.username = username
5537 5787 self.password = password
5538 5788 self.ftp_wei = ftp_wei
@@ -5543,11 +5793,13 class ftpBuffer():
5543 5793 self.withoutconfig = False
5544 5794 self.createforView = True
5545 5795 self.localfolder = localfolder
5546
5796 self.extension = extension
5797 self.period = period
5798 self.protocol = protocol
5547 5799
5548 5800 def recover(self):
5549 5801
5550 return self.server, self.folder, self.username, self.password, self.ftp_wei, self.exp_code, self.sub_exp_code, self.plot_pos
5802 return self.server, self.remotefolder, self.username, self.password, self.ftp_wei, self.exp_code, self.sub_exp_code, self.plot_pos, self.extension, self.period, self.protocol
5551 5803
5552 5804 class ShowMeConsole(QtCore.QObject):
5553 5805 textWritten = QtCore.pyqtSignal(str)
Show file before | Show file after | Hide comments
@@ -17,6 +17,7 except AttributeError:
17 17 import os
18 18 from schainpy.gui.figures import tools
19 19
20 INITIAL_MSG = "Signal Chain GUI - v2.1"
20 21 FIGURES_PATH = tools.get_path()
21 22
22 23 class Ui_InitWindow(object):
@@ -37,7 +38,7 class Ui_InitWindow(object):
37 38 font.setBold(False)
38 39 font.setWeight(50)
39 40 self.label_3.setFont(font)
40 self.label_3.setText(QtGui.QApplication.translate("Dialog", "Signal Chain GUI - Ver. 2.0", None, QtGui.QApplication.UnicodeUTF8))
41 self.label_3.setText(QtGui.QApplication.translate("Dialog", INITIAL_MSG, None, QtGui.QApplication.UnicodeUTF8))
41 42 self.label_3.setObjectName(_fromUtf8("label_3"))
42 43 self.verticalLayout_4.addWidget(self.label_3)
43 44 self.line_2 = QtGui.QFrame(Dialog)
Show file before | Show file after | Hide comments
@@ -405,7 +405,7 class Ui_SpectraTab(object):
405 405 self.specOpCebIncoherent.setText(_translate("MainWindow", "Incoherent Integration", None))
406 406 self.specOpCobIncInt.setItemText(0, _translate("MainWindow", "Time Interval", None))
407 407 self.specOpCobIncInt.setItemText(1, _translate("MainWindow", "Profiles", None))
408 self.specOpCebRadarfrequency.setText(_translate("MainWindow", "Radar wavelength", None))
408 self.specOpCebRadarfrequency.setText(_translate("MainWindow", "Radar frequency (MHz)", None))
409 409 self.label_21.setText(_translate("MainWindow", "Profiles", None))
410 410 self.specOpCebRemoveInt.setText(_translate("MainWindow", "Remove Interference", None))
411 411 self.label_70.setText(_translate("MainWindow", "IppFactor", None))
Show file before | Show file after | Hide comments
@@ -278,7 +278,7 class Ui_VoltageTab(object):
278 278 self.volOpCebChannels.setText(_translate("MainWindow", "Select Channels", None))
279 279 self.volOpCebHeights.setText(_translate("MainWindow", "Select Heights", None))
280 280 self.volOpCebFilter.setText(_translate("MainWindow", "Filter", None))
281 self.volOpCebRadarfrequency.setText(_translate("MainWindow", "Radar wavelength", None))
281 self.volOpCebRadarfrequency.setText(_translate("MainWindow", "Radar frequency (MHz)", None))
282 282 self.volLabCodeMode.setText(_translate("MainWindow", "Mode:", None))
283 283 self.volLabCode.setText(_translate("MainWindow", "Code:", None))
284 284 self.volOpComCode.setItemText(0, _translate("MainWindow", "Read from header", None))
Show file before | Show file after | Hide comments
@@ -338,7 +338,9 class USRPReader(ProcessingUnit):
338 338 datetime.datetime.utcfromtimestamp(self.__endUTCSecond - self.__timezone)
339 339 )
340 340
341 print "[Reading] Starting process from ", datetime.datetime.utcfromtimestamp(startUTCSecond - self.__timezone), " to ", datetime.datetime.utcfromtimestamp(endUTCSecond - self.__timezone)
341 print "[Reading] Starting process from %s to %s" %(datetime.datetime.utcfromtimestamp(startUTCSecond - self.__timezone),
342 datetime.datetime.utcfromtimestamp(endUTCSecond - self.__timezone)
343 )
342 344
343 345 def __reload(self):
344 346
Show file before | Show file after | Hide comments
@@ -52,6 +52,8 class Remote(threading.Thread):
52 52 threading.Thread.__init__(self)
53 53 self._stop = threading.Event()
54 54
55 self.setDaemon(True)
56
55 57 self.status = 0
56 58
57 59 self.period = period
@@ -154,7 +156,7 class Remote(threading.Thread):
154 156 """
155 157
156 158 if fileList == self.fileList:
157 return 1
159 return 0
158 160
159 161 init = time.time()
160 162
@@ -188,10 +190,10 class Remote(threading.Thread):
188 190 sts = self.upload(thisFile, self.remotefolder)
189 191 if not sts: break
190 192
191 if not sts: break
192
193 193 self.bussy = False
194 194
195 if not sts: break
196
195 197 if self.stopFlag:
196 198 break
197 199
@@ -346,7 +348,7 class FTPClient(Remote):
346 348
347 349 file = open(fullfilename, 'rb')
348 350
349 filename = os.path.split(fullfilename)[-1]
351 filename = os.path.basename(fullfilename)
350 352
351 353 command = "STOR %s" %filename
352 354
@@ -574,13 +576,24 class SendToServer(ProcessingUnit):
574 576
575 577 def findFiles(self):
576 578
577 filenameList = glob.glob1(self.localfolder, '*%s' %self.ext)
579 if not type(self.localfolder) == list:
580 folderList = [self.localfolder]
581 else:
582 folderList = self.localfolder
578 583
579 if len(filenameList) < 1:
580 return []
581
582 fullfilenameList = [os.path.join(self.localfolder, thisFile) for thisFile in filenameList]
584 fullfilenameList = []
585
586 for thisFolder in folderList:
583 587
588 filenameList = glob.glob1(thisFolder, '*%s' %self.ext)
589
590 if len(filenameList) < 1:
591 continue
592
593 for thisFile in filenameList:
594 fullfilename = os.path.join(thisFolder, thisFile)
595 fullfilenameList.append(fullfilename)
596
584 597 return fullfilenameList
585 598
586 599 def run(self, **kwargs):
@@ -592,7 +605,10 class SendToServer(ProcessingUnit):
592 605
593 606 if time.time() - self.init >= self.period:
594 607 fullfilenameList = self.findFiles()
595 self.clientObj.updateFileList(fullfilenameList)
608
609 if self.clientObj.updateFileList(fullfilenameList):
610 print "[Remote Server]: Sending the next files ", str(fullfilenameList)
611
596 612 self.init = time.time()
597 613
598 614 def close(self):
General Comments 0
You need to be logged in to leave comments. Login now