|
@@
-391,23
+391,23
class BasicWindow(QMainWindow, Ui_BasicWindow):
|
|
391
|
"""
|
|
391
|
"""
|
|
392
|
SELECCION DEL RANGO DE FECHAS -START DATE
|
|
392
|
SELECCION DEL RANGO DE FECHAS -START DATE
|
|
393
|
"""
|
|
393
|
"""
|
|
394
|
stopIndex = self.proComEndDate.count() - self.proComEndDate.currentIndex()
|
|
394
|
stopIndex = self.proComEndDate.count() - self.proComEndDate.currentIndex() - 1
|
|
|
|
|
395
|
|
|
395
|
self.proComEndDate.clear()
|
|
396
|
self.proComEndDate.clear()
|
|
396
|
for i in self.dateList[index:]:
|
|
397
|
for i in self.dateList[index:]:
|
|
397
|
self.proComEndDate.addItem(i)
|
|
398
|
self.proComEndDate.addItem(i)
|
|
398
|
self.proComEndDate.setCurrentIndex(self.proComEndDate.count() - stopIndex)
|
|
399
|
|
|
|
|
|
400
|
if self.proComEndDate.count() - stopIndex - 1 >= 0:
|
|
|
|
|
401
|
self.proComEndDate.setCurrentIndex(self.proComEndDate.count() - stopIndex - 1)
|
|
|
|
|
402
|
else:
|
|
|
|
|
403
|
self.proComEndDate.setCurrentIndex(self.proComEndDate.count() - 1)
|
|
399
|
|
|
404
|
|
|
400
|
@pyqtSignature("int")
|
|
405
|
@pyqtSignature("int")
|
|
401
|
def on_proComEndDate_activated(self, index):
|
|
406
|
def on_proComEndDate_activated(self, index):
|
|
402
|
"""
|
|
407
|
"""
|
|
403
|
SELECCION DEL RANGO DE FECHAS-END DATE
|
|
408
|
SELECCION DEL RANGO DE FECHAS-END DATE
|
|
404
|
"""
|
|
409
|
"""
|
|
405
|
startIndex = self.proComStartDate.currentIndex()
|
|
410
|
pass
|
|
406
|
stopIndex = self.proComEndDate.count() - index
|
|
|
|
|
407
|
self.proComStartDate.clear()
|
|
|
|
|
408
|
for i in self.dateList[:len(self.dateList) - stopIndex + 1]:
|
|
|
|
|
409
|
self.proComStartDate.addItem(i)
|
|
|
|
|
410
|
self.proComStartDate.setCurrentIndex(startIndex)
|
|
|
|
|
411
|
|
|
411
|
|
|
412
|
@pyqtSignature("")
|
|
412
|
@pyqtSignature("")
|
|
413
|
def on_proOk_clicked(self):
|
|
413
|
def on_proOk_clicked(self):
|
|
@@
-2505,6
+2505,7
class BasicWindow(QMainWindow, Ui_BasicWindow):
|
|
2505
|
self.proDelay.setText(str(projectParms.delay))
|
|
2505
|
self.proDelay.setText(str(projectParms.delay))
|
|
2506
|
self.proSet.setText(str(projectParms.set))
|
|
2506
|
self.proSet.setText(str(projectParms.set))
|
|
2507
|
self.proIPPKm.setText(str(projectParms.ippKm))
|
|
2507
|
self.proIPPKm.setText(str(projectParms.ippKm))
|
|
|
|
|
2508
|
self.proComWalk.setCurrentIndex(projectParms.walk)
|
|
2508
|
|
|
2509
|
|
|
2509
|
dateList = self.loadDays(data_path = projectParms.dpath,
|
|
2510
|
dateList = self.loadDays(data_path = projectParms.dpath,
|
|
2510
|
ext = projectParms.getExt(),
|
|
2511
|
ext = projectParms.getExt(),
|
|
@@
-4955,16
+4956,7
class BasicWindow(QMainWindow, Ui_BasicWindow):
|
|
4955
|
# parms_ok = False
|
|
4956
|
# parms_ok = False
|
|
4956
|
set = None
|
|
4957
|
set = None
|
|
4957
|
|
|
4958
|
|
|
4958
|
walk_str = str(self.proComWalk.currentText())
|
|
4959
|
walk = self.proComWalk.currentIndex()
|
|
4959
|
if walk_str == 'On Files':
|
|
|
|
|
4960
|
walk = 0
|
|
|
|
|
4961
|
elif walk_str == 'On Folder':
|
|
|
|
|
4962
|
walk = 1
|
|
|
|
|
4963
|
else:
|
|
|
|
|
4964
|
outputstr = 'Walk: %s, this must be either On Files or On Folders' % walk_str
|
|
|
|
|
4965
|
self.console.append(outputstr)
|
|
|
|
|
4966
|
parms_ok = False
|
|
|
|
|
4967
|
walk = None
|
|
|
|
|
4968
|
|
|
4960
|
|
|
4969
|
return parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set
|
|
4961
|
return parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set
|
|
4970
|
|
|
4962
|
|