@@ -12,6 +12,8 import Queue | |||||
12 | from collections import OrderedDict |
|
12 | from collections import OrderedDict | |
13 | from os.path import expanduser |
|
13 | from os.path import expanduser | |
14 | from time import sleep |
|
14 | from time import sleep | |
|
15 | # from gevent import sleep | |||
|
16 | ||||
15 | import ast |
|
17 | import ast | |
16 |
|
18 | |||
17 | from PyQt4.QtGui import QMainWindow |
|
19 | from PyQt4.QtGui import QMainWindow | |
@@ -19,11 +21,14 from PyQt4.QtCore import pyqtSignature | |||||
19 | from PyQt4.QtCore import pyqtSignal |
|
21 | from PyQt4.QtCore import pyqtSignal | |
20 | from PyQt4 import QtCore |
|
22 | from PyQt4 import QtCore | |
21 | from PyQt4 import QtGui |
|
23 | from PyQt4 import QtGui | |
|
24 | # from PyQt4.QtCore import QThread | |||
|
25 | # from PyQt4.QtCore import QObject, SIGNAL | |||
22 |
|
26 | |||
23 | from schainpy.gui.viewer.ui_unitprocess import Ui_UnitProcess |
|
27 | from schainpy.gui.viewer.ui_unitprocess import Ui_UnitProcess | |
24 | from schainpy.gui.viewer.ui_ftp import Ui_Ftp |
|
28 | from schainpy.gui.viewer.ui_ftp import Ui_Ftp | |
25 | from schainpy.gui.viewer.ui_mainwindow import Ui_BasicWindow |
|
29 | from schainpy.gui.viewer.ui_mainwindow import Ui_BasicWindow | |
26 |
from schainpy.controller |
|
30 | from schainpy.controller_api import ControllerThread | |
|
31 | from schainpy.controller import Project | |||
27 |
|
32 | |||
28 | from propertiesViewModel import TreeModel, PropertyBuffer |
|
33 | from propertiesViewModel import TreeModel, PropertyBuffer | |
29 | from parametersModel import ProjectParms |
|
34 | from parametersModel import ProjectParms | |
@@ -34,23 +39,23 FIGURES_PATH = tools.get_path() | |||||
34 | TEMPORAL_FILE = ".temp.xml" |
|
39 | TEMPORAL_FILE = ".temp.xml" | |
35 |
|
40 | |||
36 | def isRadarFile(file): |
|
41 | def isRadarFile(file): | |
37 |
|
|
42 | try: | |
38 |
|
|
43 | year = int(file[1:5]) | |
39 |
|
|
44 | doy = int(file[5:8]) | |
40 |
|
|
45 | set = int(file[8:11]) | |
41 |
|
|
46 | except: | |
42 |
|
|
47 | return 0 | |
43 |
|
48 | |||
44 |
|
|
49 | return 1 | |
45 |
|
50 | |||
46 | def isRadarPath(path): |
|
51 | def isRadarPath(path): | |
47 |
|
|
52 | try: | |
48 |
|
|
53 | year = int(path[1:5]) | |
49 |
|
|
54 | doy = int(path[5:8]) | |
50 |
|
|
55 | except: | |
51 |
|
|
56 | return 0 | |
52 |
|
57 | |||
53 |
|
|
58 | return 1 | |
54 |
|
59 | |||
55 | class BasicWindow(QMainWindow, Ui_BasicWindow): |
|
60 | class BasicWindow(QMainWindow, Ui_BasicWindow): | |
56 | """ |
|
61 | """ | |
@@ -84,7 +89,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
84 | self.walk = 0 |
|
89 | self.walk = 0 | |
85 | self.create = False |
|
90 | self.create = False | |
86 | self.selectedItemTree = None |
|
91 | self.selectedItemTree = None | |
87 |
self.controller |
|
92 | self.controllerThread = None | |
88 | # self.commCtrlPThread = None |
|
93 | # self.commCtrlPThread = None | |
89 | # self.create_figure() |
|
94 | # self.create_figure() | |
90 | self.temporalFTP = ftpBuffer() |
|
95 | self.temporalFTP = ftpBuffer() | |
@@ -108,11 +113,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
108 | self.__operationObjDict = {} |
|
113 | self.__operationObjDict = {} | |
109 |
|
114 | |||
110 | self.__puLocalFolder2FTP = {} |
|
115 | self.__puLocalFolder2FTP = {} | |
111 |
self.__ |
|
116 | self.__enable = False | |
112 |
|
117 | |||
113 | # self.create_comm() |
|
118 | # self.create_comm() | |
114 | self.create_updating_timer() |
|
119 | self.create_updating_timer() | |
115 |
self.set |
|
120 | self.setGUIStatus() | |
116 |
|
121 | |||
117 | @pyqtSignature("") |
|
122 | @pyqtSignature("") | |
118 | def on_actionOpen_triggered(self): |
|
123 | def on_actionOpen_triggered(self): | |
@@ -271,10 +276,10 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
271 | self.proDelay.setEnabled(False) |
|
276 | self.proDelay.setEnabled(False) | |
272 | elif index == 1: |
|
277 | elif index == 1: | |
273 | self.online = 1 |
|
278 | self.online = 1 | |
274 |
self.proSet.setText(" |
|
279 | self.proSet.setText("") | |
275 | self.proDelay.setText("5") |
|
280 | self.proDelay.setText("5") | |
276 | self.proSet.setEnabled(True) |
|
281 | self.proSet.setEnabled(True) | |
277 |
self.proDelay.setEnabled(True) |
|
282 | self.proDelay.setEnabled(True) | |
278 |
|
283 | |||
279 | @pyqtSignature("int") |
|
284 | @pyqtSignature("int") | |
280 | def on_proComDataType_activated(self, index): |
|
285 | def on_proComDataType_activated(self, index): | |
@@ -284,6 +289,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
284 | self.labelSet.show() |
|
289 | self.labelSet.show() | |
285 | self.proSet.show() |
|
290 | self.proSet.show() | |
286 |
|
291 | |||
|
292 | self.labExpLabel.show() | |||
|
293 | self.proExpLabel.show() | |||
|
294 | ||||
287 | self.labelIPPKm.hide() |
|
295 | self.labelIPPKm.hide() | |
288 | self.proIPPKm.hide() |
|
296 | self.proIPPKm.hide() | |
289 |
|
297 | |||
@@ -296,11 +304,15 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
296 | elif index == 3: |
|
304 | elif index == 3: | |
297 | extension = '.hdf5' |
|
305 | extension = '.hdf5' | |
298 |
|
306 | |||
299 | self.labelSet.hide() |
|
|||
300 | self.proSet.hide() |
|
|||
301 | self.labelIPPKm.show() |
|
307 | self.labelIPPKm.show() | |
302 | self.proIPPKm.show() |
|
308 | self.proIPPKm.show() | |
303 |
|
309 | |||
|
310 | self.labelSet.hide() | |||
|
311 | self.proSet.hide() | |||
|
312 | ||||
|
313 | self.labExpLabel.hide() | |||
|
314 | self.proExpLabel.hide() | |||
|
315 | ||||
304 | self.proDataType.setText(extension) |
|
316 | self.proDataType.setText(extension) | |
305 |
|
317 | |||
306 | @pyqtSignature("int") |
|
318 | @pyqtSignature("int") | |
@@ -345,7 +357,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
345 | if not os.path.exists(datapath): |
|
357 | if not os.path.exists(datapath): | |
346 |
|
358 | |||
347 | self.console.clear() |
|
359 | self.console.clear() | |
348 |
self.console.append("Write a |
|
360 | self.console.append("Write a valid path") | |
349 | return |
|
361 | return | |
350 |
|
362 | |||
351 | self.dataPath = datapath |
|
363 | self.dataPath = datapath | |
@@ -364,7 +376,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
364 | if not parameter_list[0]: |
|
376 | if not parameter_list[0]: | |
365 | return |
|
377 | return | |
366 |
|
378 | |||
367 | parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set = parameter_list |
|
379 | parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set, expLabel = parameter_list | |
368 |
|
380 | |||
369 | if read_mode == "Offline": |
|
381 | if read_mode == "Offline": | |
370 | self.proComStartDate.clear() |
|
382 | self.proComStartDate.clear() | |
@@ -376,15 +388,15 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
376 | self.frame_2.setEnabled(True) |
|
388 | self.frame_2.setEnabled(True) | |
377 |
|
389 | |||
378 | if read_mode == "Online": |
|
390 | if read_mode == "Online": | |
379 |
self.proComStartDate.addItem(" |
|
391 | self.proComStartDate.addItem("1960/01/30") | |
380 |
self.proComEndDate.addItem("201 |
|
392 | self.proComEndDate.addItem("2018/12/31") | |
381 | self.proComStartDate.setEnabled(False) |
|
393 | self.proComStartDate.setEnabled(False) | |
382 | self.proComEndDate.setEnabled(False) |
|
394 | self.proComEndDate.setEnabled(False) | |
383 | self.proStartTime.setEnabled(False) |
|
395 | self.proStartTime.setEnabled(False) | |
384 | self.proEndTime.setEnabled(False) |
|
396 | self.proEndTime.setEnabled(False) | |
385 | self.frame_2.setEnabled(True) |
|
397 | self.frame_2.setEnabled(True) | |
386 |
|
398 | |||
387 | self.loadDays(data_path, ext, walk) |
|
399 | self.loadDays(data_path, ext, walk, expLabel) | |
388 |
|
400 | |||
389 | @pyqtSignature("int") |
|
401 | @pyqtSignature("int") | |
390 | def on_proComStartDate_activated(self, index): |
|
402 | def on_proComStartDate_activated(self, index): | |
@@ -964,12 +976,14 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
964 | """ |
|
976 | """ | |
965 | Donde se guardan los DATOS |
|
977 | Donde se guardan los DATOS | |
966 | """ |
|
978 | """ | |
967 |
s |
|
979 | save_path = str(QtGui.QFileDialog.getExistingDirectory(self, 'Open Directory', './', QtGui.QFileDialog.ShowDirsOnly)) | |
968 |
self.volGraphPath.setText(s |
|
980 | self.volGraphPath.setText(save_path) | |
969 |
|
981 | |||
970 |
|
|
982 | if not os.path.exists(save_path): | |
971 |
|
|
983 | self.console.clear() | |
972 | # return |
|
984 | self.console.append("Set a valid path") | |
|
985 | self.volGraphOk.setEnabled(False) | |||
|
986 | return | |||
973 |
|
987 | |||
974 | @pyqtSignature("int") |
|
988 | @pyqtSignature("int") | |
975 | def on_volGraphCebshow_stateChanged(self, p0): |
|
989 | def on_volGraphCebshow_stateChanged(self, p0): | |
@@ -1734,7 +1748,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
1734 | opObj = puObj.addOperation(name='SpectraWriter', optype='other') |
|
1748 | opObj = puObj.addOperation(name='SpectraWriter', optype='other') | |
1735 | opObj.addParameter(name='path', value=output_path) |
|
1749 | opObj.addParameter(name='path', value=output_path) | |
1736 | opObj.addParameter(name='blocksPerFile', value=blocksperfile, format='int') |
|
1750 | opObj.addParameter(name='blocksPerFile', value=blocksperfile, format='int') | |
1737 | opObj.addParameter(name='profilesPerBlock', value=profilesperblock, format='int') |
|
|||
1738 |
|
1751 | |||
1739 | self.console.clear() |
|
1752 | self.console.clear() | |
1740 | try: |
|
1753 | try: | |
@@ -1859,11 +1872,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
1859 | def on_specGraphToolPath_clicked(self): |
|
1872 | def on_specGraphToolPath_clicked(self): | |
1860 | """ |
|
1873 | """ | |
1861 | """ |
|
1874 | """ | |
1862 |
s |
|
1875 | save_path = str(QtGui.QFileDialog.getExistingDirectory(self, 'Open Directory', './', QtGui.QFileDialog.ShowDirsOnly)) | |
1863 |
self.specGraphPath.setText(s |
|
1876 | self.specGraphPath.setText(save_path) | |
1864 |
if not os.path.exists(s |
|
1877 | if not os.path.exists(save_path): | |
1865 | self.console.clear() |
|
1878 | self.console.clear() | |
1866 |
self.console.append("Write a |
|
1879 | self.console.append("Write a valid path") | |
1867 | return |
|
1880 | return | |
1868 |
|
1881 | |||
1869 | @pyqtSignature("") |
|
1882 | @pyqtSignature("") | |
@@ -1874,11 +1887,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
1874 | def on_specHeisGraphToolPath_clicked(self): |
|
1887 | def on_specHeisGraphToolPath_clicked(self): | |
1875 | """ |
|
1888 | """ | |
1876 | """ |
|
1889 | """ | |
1877 |
s |
|
1890 | save_path = str(QtGui.QFileDialog.getExistingDirectory(self, 'Open Directory', './', QtGui.QFileDialog.ShowDirsOnly)) | |
1878 |
self.specHeisGraphPath.setText(s |
|
1891 | self.specHeisGraphPath.setText(save_path) | |
1879 |
if not os.path.exists(s |
|
1892 | if not os.path.exists(save_path): | |
1880 | self.console.clear() |
|
1893 | self.console.clear() | |
1881 |
self.console.append("Write a |
|
1894 | self.console.append("Write a valid path") | |
1882 | return |
|
1895 | return | |
1883 |
|
1896 | |||
1884 | @pyqtSignature("int") |
|
1897 | @pyqtSignature("int") | |
@@ -2095,9 +2108,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2095 | return 0 |
|
2108 | return 0 | |
2096 |
|
2109 | |||
2097 | if addFTP and not localfolder: |
|
2110 | if addFTP and not localfolder: | |
2098 |
|
|
2111 | self.console.clear() | |
2099 |
|
|
2112 | self.console.append("You should save plots before send them to FTP Server") | |
2100 |
|
|
2113 | return 0 | |
2101 |
|
2114 | |||
2102 | # if something happened |
|
2115 | # if something happened | |
2103 | parms_ok, output_path, blocksperfile, metada = self.checkInputsPUSave(datatype='SpectraHeis') |
|
2116 | parms_ok, output_path, blocksperfile, metada = self.checkInputsPUSave(datatype='SpectraHeis') | |
@@ -2376,6 +2389,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2376 | parms_ok = False |
|
2389 | parms_ok = False | |
2377 |
|
2390 | |||
2378 | walk = int(self.proComWalk.currentIndex()) |
|
2391 | walk = int(self.proComWalk.currentIndex()) | |
|
2392 | expLabel = str(self.proExpLabel.text()) | |||
2379 |
|
2393 | |||
2380 | startDate = str(self.proComStartDate.currentText()) |
|
2394 | startDate = str(self.proComStartDate.currentText()) | |
2381 | endDate = str(self.proComEndDate.currentText()) |
|
2395 | endDate = str(self.proComEndDate.currentText()) | |
@@ -2404,11 +2418,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2404 | projectParms.endDate = endDate |
|
2418 | projectParms.endDate = endDate | |
2405 | projectParms.startTime = startTime |
|
2419 | projectParms.startTime = startTime | |
2406 | projectParms.endTime = endTime |
|
2420 | projectParms.endTime = endTime | |
2407 | projectParms.delay=delay |
|
2421 | projectParms.delay = delay | |
2408 | projectParms.walk=walk |
|
2422 | projectParms.walk = walk | |
2409 |
projectParms. |
|
2423 | projectParms.expLabel = expLabel | |
2410 |
projectParms. |
|
2424 | projectParms.set = set | |
2411 |
projectParms. |
|
2425 | projectParms.ippKm = ippKm | |
|
2426 | projectParms.parmsOk = parms_ok | |||
2412 |
|
2427 | |||
2413 | return projectParms |
|
2428 | return projectParms | |
2414 |
|
2429 | |||
@@ -2461,6 +2476,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2461 | except: |
|
2476 | except: | |
2462 | pass |
|
2477 | pass | |
2463 |
|
2478 | |||
|
2479 | expLabel = '' | |||
|
2480 | try: | |||
|
2481 | expLabel = operationObj.getParameterValue(parameterName='expLabel') | |||
|
2482 | except: | |||
|
2483 | pass | |||
|
2484 | ||||
2464 | ippKm = '' |
|
2485 | ippKm = '' | |
2465 | if datatype.lower() == 'usrp': |
|
2486 | if datatype.lower() == 'usrp': | |
2466 | try: |
|
2487 | try: | |
@@ -2484,11 +2505,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2484 | projectParms.walk=walk |
|
2505 | projectParms.walk=walk | |
2485 | projectParms.set=set |
|
2506 | projectParms.set=set | |
2486 | projectParms.ippKm=ippKm |
|
2507 | projectParms.ippKm=ippKm | |
|
2508 | projectParms.expLabel = expLabel | |||
2487 | projectParms.parmsOk=parms_ok |
|
2509 | projectParms.parmsOk=parms_ok | |
2488 |
|
2510 | |||
2489 | return projectParms |
|
2511 | return projectParms | |
2490 |
|
2512 | |||
2491 |
def refreshProjectWindow |
|
2513 | def refreshProjectWindow(self, projectObjView): | |
2492 |
|
2514 | |||
2493 | projectParms = self.__getParmsFromProjectObj(projectObjView) |
|
2515 | projectParms = self.__getParmsFromProjectObj(projectObjView) | |
2494 |
|
2516 | |||
@@ -2506,6 +2528,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
2506 | self.proSet.setText(str(projectParms.set)) |
|
2528 | self.proSet.setText(str(projectParms.set)) | |
2507 | self.proIPPKm.setText(str(projectParms.ippKm)) |
|
2529 | self.proIPPKm.setText(str(projectParms.ippKm)) | |
2508 | self.proComWalk.setCurrentIndex(projectParms.walk) |
|
2530 | self.proComWalk.setCurrentIndex(projectParms.walk) | |
|
2531 | self.proExpLabel.setText(str(projectParms.expLabel).strip()) | |||
2509 |
|
2532 | |||
2510 | dateList = self.loadDays(data_path = projectParms.dpath, |
|
2533 | dateList = self.loadDays(data_path = projectParms.dpath, | |
2511 | ext = projectParms.getExt(), |
|
2534 | ext = projectParms.getExt(), | |
@@ -3521,7 +3544,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
3521 | if opObj == None: |
|
3544 | if opObj == None: | |
3522 | self.specOutputPath.clear() |
|
3545 | self.specOutputPath.clear() | |
3523 | self.specOutputblocksperfile.clear() |
|
3546 | self.specOutputblocksperfile.clear() | |
3524 | self.specOutputprofileperblock.clear() |
|
|||
3525 | else: |
|
3547 | else: | |
3526 | value = opObj.getParameterObj(parameterName='path') |
|
3548 | value = opObj.getParameterObj(parameterName='path') | |
3527 | if value == None: |
|
3549 | if value == None: | |
@@ -3537,13 +3559,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
3537 | value = opObj.getParameterValue(parameterName='blocksPerFile') |
|
3559 | value = opObj.getParameterValue(parameterName='blocksPerFile') | |
3538 | blocksperfile = str(value) |
|
3560 | blocksperfile = str(value) | |
3539 | self.specOutputblocksperfile.setText(blocksperfile) |
|
3561 | self.specOutputblocksperfile.setText(blocksperfile) | |
3540 | value = opObj.getParameterObj(parameterName='profilesPerBlock') |
|
|||
3541 | if value == None: |
|
|||
3542 | self.specOutputprofileperblock.clear() |
|
|||
3543 | else: |
|
|||
3544 | value = opObj.getParameterValue(parameterName='profilesPerBlock') |
|
|||
3545 | profilesPerBlock = str(value) |
|
|||
3546 | self.specOutputprofileperblock.setText(profilesPerBlock) |
|
|||
3547 |
|
3562 | |||
3548 | return |
|
3563 | return | |
3549 |
|
3564 | |||
@@ -3861,7 +3876,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
3861 | #A project has been selected |
|
3876 | #A project has been selected | |
3862 | if projectObjView == selectedObjView: |
|
3877 | if projectObjView == selectedObjView: | |
3863 |
|
3878 | |||
3864 |
self.refreshProjectWindow |
|
3879 | self.refreshProjectWindow(projectObjView) | |
3865 | self.refreshProjectProperties(projectObjView) |
|
3880 | self.refreshProjectProperties(projectObjView) | |
3866 |
|
3881 | |||
3867 | self.tabProject.setEnabled(True) |
|
3882 | self.tabProject.setEnabled(True) | |
@@ -3939,11 +3954,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
3939 | if action == quitAction3: |
|
3954 | if action == quitAction3: | |
3940 | self.close() |
|
3955 | self.close() | |
3941 | return 0 |
|
3956 | return 0 | |
3942 |
|
||||
3943 | def create_updating_timer(self): |
|
|||
3944 | self.comm_data_timer = QtCore.QTimer(self) |
|
|||
3945 | self.comm_data_timer.timeout.connect(self.on_comm_updating_timer) |
|
|||
3946 | self.comm_data_timer.start(1000) |
|
|||
3947 |
|
3957 | |||
3948 | def createProjectView(self, id): |
|
3958 | def createProjectView(self, id): | |
3949 |
|
3959 | |||
@@ -4003,7 +4013,10 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4003 |
|
4013 | |||
4004 | if projectParms.delay: |
|
4014 | if projectParms.delay: | |
4005 | readUnitConfObj.addParameter(name="delay", value=projectParms.delay, format="int") |
|
4015 | readUnitConfObj.addParameter(name="delay", value=projectParms.delay, format="int") | |
4006 |
|
|
4016 | ||
|
4017 | if projectParms.expLabel: | |||
|
4018 | readUnitConfObj.addParameter(name="expLabel", value=projectParms.expLabel) | |||
|
4019 | ||||
4007 | if projectParms.datatype == "USRP": |
|
4020 | if projectParms.datatype == "USRP": | |
4008 | readUnitConfObj = projectObjView.addReadUnit(datatype=projectParms.datatype, |
|
4021 | readUnitConfObj = projectObjView.addReadUnit(datatype=projectParms.datatype, | |
4009 | path=projectParms.dpath, |
|
4022 | path=projectParms.dpath, | |
@@ -4046,6 +4059,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4046 |
|
4059 | |||
4047 | if projectParms.delay: |
|
4060 | if projectParms.delay: | |
4048 | readUnitConfObj.addParameter(name="delay", value=projectParms.delay, format="int") |
|
4061 | readUnitConfObj.addParameter(name="delay", value=projectParms.delay, format="int") | |
|
4062 | ||||
|
4063 | if projectParms.expLabel: | |||
|
4064 | readUnitConfObj.addParameter(name="expLabel", value=projectParms.expLabel) | |||
4049 |
|
4065 | |||
4050 | if projectParms.datatype == "USRP": |
|
4066 | if projectParms.datatype == "USRP": | |
4051 | readUnitConfObj.update(datatype=projectParms.datatype, |
|
4067 | readUnitConfObj.update(datatype=projectParms.datatype, | |
@@ -4141,35 +4157,35 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4141 | if self.temporalFTP.plot_pos: |
|
4157 | if self.temporalFTP.plot_pos: | |
4142 | opObj.addParameter(name='plot_pos', value=int(self.temporalFTP.plot_pos), format='int') |
|
4158 | opObj.addParameter(name='plot_pos', value=int(self.temporalFTP.plot_pos), format='int') | |
4143 |
|
4159 | |||
4144 | def __checkFTPProcUnit(self, projectObj, localfolder): |
|
4160 | # def __checkFTPProcUnit(self, projectObj, localfolder): | |
4145 |
|
4161 | # | ||
4146 | puId = None |
|
4162 | # puId = None | |
4147 | puObj = None |
|
4163 | # puObj = None | |
4148 |
|
4164 | # | ||
4149 | for thisPuId, thisPuObj in projectObj.procUnitItems(): |
|
4165 | # for thisPuId, thisPuObj in projectObj.procUnitItems(): | |
4150 |
|
4166 | # | ||
4151 | if not thisPuObj.name == "SendToServer": |
|
4167 | # if not thisPuObj.name == "SendToServer": | |
4152 | continue |
|
4168 | # continue | |
4153 |
|
4169 | # | ||
4154 | opObj = thisPuObj.getOperationObj(name='run') |
|
4170 | # opObj = thisPuObj.getOperationObj(name='run') | |
4155 |
|
4171 | # | ||
4156 | parmObj = opObj.getParameterObj('localfolder') |
|
4172 | # parmObj = opObj.getParameterObj('localfolder') | |
4157 |
|
4173 | # | ||
4158 | #localfolder parameter should always be set, if it is not set then ProcUnit should be removed |
|
4174 | # #localfolder parameter should always be set, if it is not set then ProcUnit should be removed | |
4159 | if not parmObj: |
|
4175 | # if not parmObj: | |
4160 | projectObj.removeProcUnit(thisPuId) |
|
4176 | # projectObj.removeProcUnit(thisPuId) | |
4161 | continue |
|
4177 | # continue | |
4162 |
|
4178 | # | ||
4163 | thisLocalfolder = parmObj.getValue() |
|
4179 | # thisLocalfolder = parmObj.getValue() | |
4164 |
|
4180 | # | ||
4165 | if localfolder != thisLocalfolder: |
|
4181 | # if localfolder != thisLocalfolder: | |
4166 | continue |
|
4182 | # continue | |
4167 |
|
4183 | # | ||
4168 | puId = thisPuId |
|
4184 | # puId = thisPuId | |
4169 | puObj = thisPuObj |
|
4185 | # puObj = thisPuObj | |
4170 | break |
|
4186 | # break | |
4171 |
|
4187 | # | ||
4172 | return puObj |
|
4188 | # return puObj | |
4173 |
|
4189 | |||
4174 | def createFTPProcUnitView(self): |
|
4190 | def createFTPProcUnitView(self): | |
4175 |
|
4191 | |||
@@ -4183,10 +4199,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4183 | if not self.__puLocalFolder2FTP: |
|
4199 | if not self.__puLocalFolder2FTP: | |
4184 | return |
|
4200 | return | |
4185 |
|
4201 | |||
4186 | folderList = "" |
|
4202 | folderList = ",".join(self.__puLocalFolder2FTP.values()) | |
4187 |
|
||||
4188 | for localfolder in self.__puLocalFolder2FTP.values(): |
|
|||
4189 | folderList += str(localfolder) + "," |
|
|||
4190 |
|
4203 | |||
4191 | procUnitConfObj = projectObj.addProcUnit(name="SendToServer") |
|
4204 | procUnitConfObj = projectObj.addProcUnit(name="SendToServer") | |
4192 |
|
4205 | |||
@@ -4477,7 +4490,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4477 | self.console.append("The selected xml file could not be loaded ...") |
|
4490 | self.console.append("The selected xml file could not be loaded ...") | |
4478 | return 0 |
|
4491 | return 0 | |
4479 |
|
4492 | |||
4480 |
self.refreshProjectWindow |
|
4493 | self.refreshProjectWindow(projectObjLoad) | |
4481 | self.refreshProjectProperties(projectObjLoad) |
|
4494 | self.refreshProjectProperties(projectObjLoad) | |
4482 |
|
4495 | |||
4483 | projectId = projectObjLoad.id |
|
4496 | projectId = projectObjLoad.id | |
@@ -4534,16 +4547,30 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4534 |
|
4547 | |||
4535 | self.actionStart.setEnabled(True) |
|
4548 | self.actionStart.setEnabled(True) | |
4536 | self.actionStarToolbar.setEnabled(True) |
|
4549 | self.actionStarToolbar.setEnabled(True) | |
4537 |
|
4550 | |||
|
4551 | def create_updating_timer(self): | |||
|
4552 | self.comm_data_timer = QtCore.QTimer(self) | |||
|
4553 | self.comm_data_timer.timeout.connect(self.on_comm_updating_timer) | |||
|
4554 | self.comm_data_timer.start(1000) | |||
|
4555 | ||||
4538 | def on_comm_updating_timer(self): |
|
4556 | def on_comm_updating_timer(self): | |
4539 | # Verifica si algun proceso ha sido inicializado y sigue ejecutandose |
|
4557 | # Verifica si algun proceso ha sido inicializado y sigue ejecutandose | |
4540 |
|
4558 | # Si el proceso se ha parado actualizar el GUI (stopProject) | ||
4541 |
if not self.__ |
|
4559 | if not self.__enable: | |
4542 | return |
|
4560 | return | |
4543 |
|
4561 | |||
4544 |
if |
|
4562 | if self.controllerThread.isFinished(): | |
4545 | self.stopProject() |
|
4563 | self.stopProject() | |
4546 |
|
|
4564 | ||
|
4565 | # def jobStartedFromThread(self, success): | |||
|
4566 | # | |||
|
4567 | # self.console.clear() | |||
|
4568 | # self.console.append("Job started") | |||
|
4569 | # | |||
|
4570 | # def jobFinishedFromThread(self, success): | |||
|
4571 | # | |||
|
4572 | # self.stopProject() | |||
|
4573 | ||||
4547 | def playProject(self, ext=".xml", save=1): |
|
4574 | def playProject(self, ext=".xml", save=1): | |
4548 |
|
4575 | |||
4549 | # self.console.clear() |
|
4576 | # self.console.clear() | |
@@ -4572,18 +4599,25 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4572 |
|
4599 | |||
4573 | self.console.append("Please Wait...") |
|
4600 | self.console.append("Please Wait...") | |
4574 |
|
4601 | |||
4575 |
self.controller |
|
4602 | self.controllerThread = ControllerThread(filename) | |
4576 | self.controllerObj.start() |
|
4603 | ||
|
4604 | # QObject.connect( self.controllerThread, SIGNAL( "jobFinished( PyQt_PyObject )" ), self.jobFinishedFromThread ) | |||
|
4605 | # QObject.connect( self.controllerThread, SIGNAL( "jobStarted( PyQt_PyObject )" ), self.jobStartedFromThread ) | |||
|
4606 | ||||
|
4607 | self.controllerThread.start() | |||
4577 | sleep(0.5) |
|
4608 | sleep(0.5) | |
4578 |
self.__ |
|
4609 | self.__enable = True | |
4579 |
|
4610 | |||
4580 | def stopProject(self): |
|
4611 | def stopProject(self): | |
4581 |
|
4612 | |||
4582 |
self.__ |
|
4613 | self.__enable = False | |
4583 |
|
4614 | |||
4584 | # self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.STOP, True)) |
|
4615 | # self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.STOP, True)) | |
4585 |
self.controller |
|
4616 | self.controllerThread.stop() | |
4586 |
|
4617 | |||
|
4618 | while self.controllerThread.isRunning(): | |||
|
4619 | sleep(0.5) | |||
|
4620 | ||||
4587 | self.actionStart.setEnabled(True) |
|
4621 | self.actionStart.setEnabled(True) | |
4588 | self.actionPause.setEnabled(False) |
|
4622 | self.actionPause.setEnabled(False) | |
4589 | self.actionStop.setEnabled(False) |
|
4623 | self.actionStop.setEnabled(False) | |
@@ -4597,7 +4631,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4597 | def pauseProject(self): |
|
4631 | def pauseProject(self): | |
4598 |
|
4632 | |||
4599 | # self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.PAUSE, data=True)) |
|
4633 | # self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.PAUSE, data=True)) | |
4600 |
self.controller |
|
4634 | self.controllerThread.pause() | |
4601 |
|
4635 | |||
4602 | self.actionStart.setEnabled(False) |
|
4636 | self.actionStart.setEnabled(False) | |
4603 | self.actionPause.setEnabled(True) |
|
4637 | self.actionPause.setEnabled(True) | |
@@ -4940,13 +4974,15 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4940 | parms_ok = False |
|
4974 | parms_ok = False | |
4941 | read_mode = None |
|
4975 | read_mode = None | |
4942 |
|
4976 | |||
4943 | try: |
|
4977 | delay = None | |
4944 | delay = int(str(self.proDelay.text())) |
|
4978 | if read_mode == "Online": | |
4945 | except: |
|
4979 | parms_ok = False | |
4946 | outputstr = 'Delay: %s, this must be a integer number' % str(self.proDelay.text()) |
|
4980 | try: | |
4947 | self.console.append(outputstr) |
|
4981 | delay = int(str(self.proDelay.text())) | |
4948 |
|
|
4982 | parms_ok = True | |
4949 |
|
|
4983 | except: | |
|
4984 | outputstr = 'Delay: %s, this must be a integer number' % str(self.proDelay.text()) | |||
|
4985 | self.console.append(outputstr) | |||
4950 |
|
4986 | |||
4951 | try: |
|
4987 | try: | |
4952 | set = int(str(self.proSet.text())) |
|
4988 | set = int(str(self.proSet.text())) | |
@@ -4956,9 +4992,10 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4956 | # parms_ok = False |
|
4992 | # parms_ok = False | |
4957 | set = None |
|
4993 | set = None | |
4958 |
|
4994 | |||
4959 | walk = self.proComWalk.currentIndex() |
|
4995 | walk = int(self.proComWalk.currentIndex()) | |
|
4996 | expLabel = str(self.proExpLabel.text()) | |||
4960 |
|
4997 | |||
4961 | return parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set |
|
4998 | return parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set, expLabel | |
4962 |
|
4999 | |||
4963 | def checkInputsPUSave(self, datatype): |
|
5000 | def checkInputsPUSave(self, datatype): | |
4964 | """ |
|
5001 | """ | |
@@ -4978,7 +5015,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4978 | if datatype == "Spectra": |
|
5015 | if datatype == "Spectra": | |
4979 | output_path = str(self.specOutputPath.text()) |
|
5016 | output_path = str(self.specOutputPath.text()) | |
4980 | blocksperfile = str(self.specOutputblocksperfile.text()) |
|
5017 | blocksperfile = str(self.specOutputblocksperfile.text()) | |
4981 | profilesperblock = str(self.specOutputprofileperblock.text()) |
|
5018 | profilesperblock = 0 | |
4982 |
|
5019 | |||
4983 | if datatype == "SpectraHeis": |
|
5020 | if datatype == "SpectraHeis": | |
4984 | output_path = str(self.specHeisOutputPath.text()) |
|
5021 | output_path = str(self.specHeisOutputPath.text()) | |
@@ -5007,12 +5044,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5007 | self.console.append(outputstr) |
|
5044 | self.console.append(outputstr) | |
5008 | parms_ok = False |
|
5045 | parms_ok = False | |
5009 | profilesperblock = None |
|
5046 | profilesperblock = None | |
5010 |
|
||||
5011 | elif datatype == "Spectra": |
|
|||
5012 | outputstr = 'Profilesperblock: %s, this must be a integer number' % str(self.specOutputprofileperblock.text()) |
|
|||
5013 | self.console.append(outputstr) |
|
|||
5014 | parms_ok = False |
|
|||
5015 | profilesperblock = None |
|
|||
5016 |
|
5047 | |||
5017 | try: |
|
5048 | try: | |
5018 | blocksperfile = int(blocksperfile) |
|
5049 | blocksperfile = int(blocksperfile) | |
@@ -5104,11 +5135,13 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5104 | if not os.path.isdir(data_path): |
|
5135 | if not os.path.isdir(data_path): | |
5105 | return |
|
5136 | return | |
5106 |
|
5137 | |||
|
5138 | self.dataPath = data_path | |||
|
5139 | ||||
5107 | dateList = self.findDatafiles(data_path, ext=ext, walk=walk, expLabel=expLabel) |
|
5140 | dateList = self.findDatafiles(data_path, ext=ext, walk=walk, expLabel=expLabel) | |
5108 |
|
5141 | |||
5109 | if not dateList: |
|
5142 | if not dateList: | |
5110 | # self.console.clear() |
|
5143 | # self.console.clear() | |
5111 |
outputstr = "The path |
|
5144 | outputstr = "The path %s has no files with extension *%s" % (data_path, ext) | |
5112 | self.console.append(outputstr) |
|
5145 | self.console.append(outputstr) | |
5113 | return |
|
5146 | return | |
5114 |
|
5147 | |||
@@ -5126,6 +5159,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5126 | self.dateList = dateStrList |
|
5159 | self.dateList = dateStrList | |
5127 | self.proOk.setEnabled(True) |
|
5160 | self.proOk.setEnabled(True) | |
5128 |
|
5161 | |||
|
5162 | self.console.clear() | |||
|
5163 | self.console.append("Successful load") | |||
|
5164 | ||||
5129 | return self.dateList |
|
5165 | return self.dateList | |
5130 |
|
5166 | |||
5131 | def setWorkSpaceGUI(self, pathWorkSpace=None): |
|
5167 | def setWorkSpaceGUI(self, pathWorkSpace=None): | |
@@ -5156,7 +5192,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5156 | self.console.append(text) |
|
5192 | self.console.append(text) | |
5157 | self.console.setTextColor(color_black) |
|
5193 | self.console.setTextColor(color_black) | |
5158 |
|
5194 | |||
5159 |
def set |
|
5195 | def setGUIStatus(self): | |
5160 |
|
5196 | |||
5161 | self.setWindowTitle("ROJ-Signal Chain") |
|
5197 | self.setWindowTitle("ROJ-Signal Chain") | |
5162 | self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") )) |
|
5198 | self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") )) | |
@@ -5226,8 +5262,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5226 | self.treeProjectProperties.resizeColumnToContents(1) |
|
5262 | self.treeProjectProperties.resizeColumnToContents(1) | |
5227 |
|
5263 | |||
5228 | # set Project |
|
5264 | # set Project | |
|
5265 | self.proExpLabel.setEnabled(True) | |||
5229 | self.proDelay.setEnabled(False) |
|
5266 | self.proDelay.setEnabled(False) | |
5230 |
self.proSet.setEnabled( |
|
5267 | self.proSet.setEnabled(True) | |
5231 | self.proDataType.setReadOnly(True) |
|
5268 | self.proDataType.setReadOnly(True) | |
5232 |
|
5269 | |||
5233 | # set Operation Voltage |
|
5270 | # set Operation Voltage | |
@@ -5332,6 +5369,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5332 |
|
5369 | |||
5333 | self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME') |
|
5370 | self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME') | |
5334 |
|
5371 | |||
|
5372 | self.labelSet.show() | |||
|
5373 | self.proSet.show() | |||
|
5374 | ||||
|
5375 | self.labelIPPKm.hide() | |||
|
5376 | self.proIPPKm.hide() | |||
|
5377 | ||||
5335 | sys.stdout = ShowMeConsole(textWritten=self.normalOutputWritten) |
|
5378 | sys.stdout = ShowMeConsole(textWritten=self.normalOutputWritten) | |
5336 | # sys.stderr = ShowMeConsole(textWritten=self.errorOutputWritten) |
|
5379 | # sys.stderr = ShowMeConsole(textWritten=self.errorOutputWritten) | |
5337 |
|
5380 | |||
@@ -5441,9 +5484,9 class Ftp(QMainWindow, Ui_Ftp): | |||||
5441 | """ |
|
5484 | """ | |
5442 | QMainWindow.__init__(self, parent) |
|
5485 | QMainWindow.__init__(self, parent) | |
5443 | self.setupUi(self) |
|
5486 | self.setupUi(self) | |
5444 |
self.set |
|
5487 | self.setGUIStatus() | |
5445 |
|
5488 | |||
5446 |
def set |
|
5489 | def setGUIStatus(self): | |
5447 | self.setWindowTitle("ROJ-Signal Chain") |
|
5490 | self.setWindowTitle("ROJ-Signal Chain") | |
5448 | self.serverFTP.setToolTip('Example: jro-app.igp.gob.pe') |
|
5491 | self.serverFTP.setToolTip('Example: jro-app.igp.gob.pe') | |
5449 | self.folderFTP.setToolTip('Example: /home/wmaster/graficos') |
|
5492 | self.folderFTP.setToolTip('Example: /home/wmaster/graficos') |
@@ -70,7 +70,7 class ProjectParms(): | |||||
70 |
|
70 | |||
71 | def set(self, project_name, datatype, ext, dpath, online, |
|
71 | def set(self, project_name, datatype, ext, dpath, online, | |
72 | startDate=None, endDate=None, startTime=None, endTime=None, |
|
72 | startDate=None, endDate=None, startTime=None, endTime=None, | |
73 | delay=None, walk=None, set=None, ippKm=None, parmsOk=True): |
|
73 | delay=None, walk=None, set=None, ippKm=None, parmsOk=True, expLabel=''): | |
74 |
|
74 | |||
75 | name = project_name |
|
75 | name = project_name | |
76 | datatype = datatype |
|
76 | datatype = datatype | |
@@ -85,6 +85,7 class ProjectParms(): | |||||
85 | walk = walk |
|
85 | walk = walk | |
86 | set = set |
|
86 | set = set | |
87 | ippKm = ippKm |
|
87 | ippKm = ippKm | |
|
88 | expLabel = expLabel | |||
88 |
|
89 | |||
89 | self.parmsOk = parmsOk |
|
90 | self.parmsOk = parmsOk | |
90 |
|
91 |
@@ -17,7 +17,7 except AttributeError: | |||||
17 | import os |
|
17 | import os | |
18 | from schainpy.gui.figures import tools |
|
18 | from schainpy.gui.figures import tools | |
19 |
|
19 | |||
20 |
INITIAL_MSG = "Signal Chain GUI - v2.1. |
|
20 | INITIAL_MSG = "Signal Chain GUI - v2.1.5" | |
21 | FIGURES_PATH = tools.get_path() |
|
21 | FIGURES_PATH = tools.get_path() | |
22 |
|
22 | |||
23 | class Ui_InitWindow(object): |
|
23 | class Ui_InitWindow(object): |
@@ -68,17 +68,29 class Ui_ProjectTab(object): | |||||
68 | self.label_33 = QtGui.QLabel(self.frame) |
|
68 | self.label_33 = QtGui.QLabel(self.frame) | |
69 | self.label_33.setObjectName(_fromUtf8("label_33")) |
|
69 | self.label_33.setObjectName(_fromUtf8("label_33")) | |
70 | self.gridLayout_2.addWidget(self.label_33, 3, 5, 1, 1) |
|
70 | self.gridLayout_2.addWidget(self.label_33, 3, 5, 1, 1) | |
|
71 | ||||
71 | self.proDelay = QtGui.QLineEdit(self.frame) |
|
72 | self.proDelay = QtGui.QLineEdit(self.frame) | |
72 | self.proDelay.setObjectName(_fromUtf8("proDelay")) |
|
73 | self.proDelay.setObjectName(_fromUtf8("proDelay")) | |
73 | self.gridLayout_2.addWidget(self.proDelay, 3, 6, 1, 1) |
|
74 | self.gridLayout_2.addWidget(self.proDelay, 3, 6, 1, 1) | |
|
75 | ||||
74 | self.label_32 = QtGui.QLabel(self.frame) |
|
76 | self.label_32 = QtGui.QLabel(self.frame) | |
75 | self.label_32.setObjectName(_fromUtf8("label_32")) |
|
77 | self.label_32.setObjectName(_fromUtf8("label_32")) | |
76 | self.gridLayout_2.addWidget(self.label_32, 4, 0, 1, 1) |
|
78 | self.gridLayout_2.addWidget(self.label_32, 4, 0, 1, 1) | |
|
79 | ||||
77 | self.proComWalk = QtGui.QComboBox(self.frame) |
|
80 | self.proComWalk = QtGui.QComboBox(self.frame) | |
78 | self.proComWalk.setObjectName(_fromUtf8("proComWalk")) |
|
81 | self.proComWalk.setObjectName(_fromUtf8("proComWalk")) | |
79 | self.proComWalk.addItem(_fromUtf8("")) |
|
82 | self.proComWalk.addItem(_fromUtf8("")) | |
80 | self.proComWalk.addItem(_fromUtf8("")) |
|
83 | self.proComWalk.addItem(_fromUtf8("")) | |
81 |
self.gridLayout_2.addWidget(self.proComWalk, 4, 1, 1, |
|
84 | self.gridLayout_2.addWidget(self.proComWalk, 4, 1, 1, 4) | |
|
85 | ||||
|
86 | self.labExpLabel = QtGui.QLabel(self.frame) | |||
|
87 | self.labExpLabel.setObjectName(_fromUtf8("labExpLabel")) | |||
|
88 | self.gridLayout_2.addWidget(self.labExpLabel, 4, 5, 1, 1) | |||
|
89 | ||||
|
90 | self.proExpLabel = QtGui.QLineEdit(self.frame) | |||
|
91 | self.proExpLabel.setObjectName(_fromUtf8("proExpLabel")) | |||
|
92 | self.gridLayout_2.addWidget(self.proExpLabel, 4, 6, 1, 1) | |||
|
93 | ||||
82 | self.proLoadButton = QtGui.QPushButton(self.frame) |
|
94 | self.proLoadButton = QtGui.QPushButton(self.frame) | |
83 | self.proLoadButton.setObjectName(_fromUtf8("proLoadButton")) |
|
95 | self.proLoadButton.setObjectName(_fromUtf8("proLoadButton")) | |
84 | self.gridLayout_2.addWidget(self.proLoadButton, 5, 0, 1, 9) |
|
96 | self.gridLayout_2.addWidget(self.proLoadButton, 5, 0, 1, 9) | |
@@ -164,6 +176,7 class Ui_ProjectTab(object): | |||||
164 | self.proComReadMode.setItemText(0, _translate("MainWindow", "Offline", None)) |
|
176 | self.proComReadMode.setItemText(0, _translate("MainWindow", "Offline", None)) | |
165 | self.proComReadMode.setItemText(1, _translate("MainWindow", "Online", None)) |
|
177 | self.proComReadMode.setItemText(1, _translate("MainWindow", "Online", None)) | |
166 | self.label_33.setText(_translate("MainWindow", "Delay:", None)) |
|
178 | self.label_33.setText(_translate("MainWindow", "Delay:", None)) | |
|
179 | self.labExpLabel.setText(_translate("MainWindow", "Exp Label:", None)) | |||
167 | self.label_32.setText(_translate("MainWindow", "Walk :", None)) |
|
180 | self.label_32.setText(_translate("MainWindow", "Walk :", None)) | |
168 | self.proComWalk.setItemText(0, _translate("MainWindow", "On Files", None)) |
|
181 | self.proComWalk.setItemText(0, _translate("MainWindow", "On Files", None)) | |
169 | self.proComWalk.setItemText(1, _translate("MainWindow", "On Folder", None)) |
|
182 | self.proComWalk.setItemText(1, _translate("MainWindow", "On Folder", None)) |
@@ -104,8 +104,10 class Ui_SpectraTab(object): | |||||
104 | self.specOpRadarfrequency = QtGui.QLineEdit(self.tabopSpectra) |
|
104 | self.specOpRadarfrequency = QtGui.QLineEdit(self.tabopSpectra) | |
105 | self.specOpRadarfrequency.setObjectName(_fromUtf8("specOpRadarfrequency")) |
|
105 | self.specOpRadarfrequency.setObjectName(_fromUtf8("specOpRadarfrequency")) | |
106 | self.gridLayout_5.addWidget(self.specOpRadarfrequency, 0, 3, 1, 2) |
|
106 | self.gridLayout_5.addWidget(self.specOpRadarfrequency, 0, 3, 1, 2) | |
|
107 | ||||
107 | spacerItem12 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
108 | spacerItem12 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
108 | self.gridLayout_5.addItem(spacerItem12, 4, 3, 1, 1) |
|
109 | self.gridLayout_5.addItem(spacerItem12, 4, 3, 1, 1) | |
|
110 | ||||
109 | self.label_21 = QtGui.QLabel(self.tabopSpectra) |
|
111 | self.label_21 = QtGui.QLabel(self.tabopSpectra) | |
110 | self.label_21.setObjectName(_fromUtf8("label_21")) |
|
112 | self.label_21.setObjectName(_fromUtf8("label_21")) | |
111 | self.gridLayout_5.addWidget(self.label_21, 1, 0, 1, 1) |
|
113 | self.gridLayout_5.addWidget(self.label_21, 1, 0, 1, 1) | |
@@ -115,8 +117,10 class Ui_SpectraTab(object): | |||||
115 | self.specOpCebRemoveInt = QtGui.QCheckBox(self.tabopSpectra) |
|
117 | self.specOpCebRemoveInt = QtGui.QCheckBox(self.tabopSpectra) | |
116 | self.specOpCebRemoveInt.setObjectName(_fromUtf8("specOpCebRemoveInt")) |
|
118 | self.specOpCebRemoveInt.setObjectName(_fromUtf8("specOpCebRemoveInt")) | |
117 | self.gridLayout_5.addWidget(self.specOpCebRemoveInt, 15, 0, 1, 1) |
|
119 | self.gridLayout_5.addWidget(self.specOpCebRemoveInt, 15, 0, 1, 1) | |
|
120 | ||||
118 | spacerItem13 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
121 | spacerItem13 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
119 | self.gridLayout_5.addItem(spacerItem13, 15, 3, 1, 1) |
|
122 | self.gridLayout_5.addItem(spacerItem13, 15, 3, 1, 1) | |
|
123 | ||||
120 | self.label_70 = QtGui.QLabel(self.tabopSpectra) |
|
124 | self.label_70 = QtGui.QLabel(self.tabopSpectra) | |
121 | self.label_70.setObjectName(_fromUtf8("label_70")) |
|
125 | self.label_70.setObjectName(_fromUtf8("label_70")) | |
122 | self.gridLayout_5.addWidget(self.label_70, 3, 0, 1, 1) |
|
126 | self.gridLayout_5.addWidget(self.label_70, 3, 0, 1, 1) | |
@@ -136,213 +140,219 class Ui_SpectraTab(object): | |||||
136 | self.gridLayout_5.addWidget(self.specOpgetNoise, 16, 3, 1, 2) |
|
140 | self.gridLayout_5.addWidget(self.specOpgetNoise, 16, 3, 1, 2) | |
137 | self.tabWidgetSpectra.addTab(self.tabopSpectra, _fromUtf8("")) |
|
141 | self.tabWidgetSpectra.addTab(self.tabopSpectra, _fromUtf8("")) | |
138 |
|
142 | |||
|
143 | ################################################################ | |||
|
144 | ################################################################ | |||
139 |
|
145 | |||
140 | self.tabgraphSpectra = QtGui.QWidget() |
|
146 | self.tabgraphSpectra = QtGui.QWidget() | |
141 | self.tabgraphSpectra.setObjectName(_fromUtf8("tabgraphSpectra")) |
|
147 | self.tabgraphSpectra.setObjectName(_fromUtf8("tabgraphSpectra")) | |
142 | self.gridLayout_9 = QtGui.QGridLayout(self.tabgraphSpectra) |
|
148 | self.gridLayout_9 = QtGui.QGridLayout(self.tabgraphSpectra) | |
143 | self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) |
|
149 | self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) | |
144 |
|
150 | |||
145 | spacerItem14 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) |
|
151 | # spacerItem14 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) | |
146 | self.gridLayout_9.addItem(spacerItem14, 14, 2, 1, 1) |
|
152 | # self.gridLayout_9.addItem(spacerItem14, 14, 2, 1, 1) | |
|
153 | xi = 0 | |||
147 |
|
154 | |||
148 | self.label_24 = QtGui.QLabel(self.tabgraphSpectra) |
|
155 | self.label_24 = QtGui.QLabel(self.tabgraphSpectra) | |
149 | self.label_24.setObjectName(_fromUtf8("label_24")) |
|
156 | self.label_24.setObjectName(_fromUtf8("label_24")) | |
150 |
self.gridLayout_9.addWidget(self.label_24, |
|
157 | self.gridLayout_9.addWidget(self.label_24, xi, 0, 1, 1) | |
151 |
|
158 | |||
152 | self.specGraphPath = QtGui.QLineEdit(self.tabgraphSpectra) |
|
159 | self.specGraphPath = QtGui.QLineEdit(self.tabgraphSpectra) | |
153 | self.specGraphPath.setObjectName(_fromUtf8("specGraphPath")) |
|
160 | self.specGraphPath.setObjectName(_fromUtf8("specGraphPath")) | |
154 |
self.gridLayout_9.addWidget(self.specGraphPath, |
|
161 | self.gridLayout_9.addWidget(self.specGraphPath, xi, 1, 1, 6) | |
155 |
|
162 | |||
156 | self.specGraphToolPath = QtGui.QToolButton(self.tabgraphSpectra) |
|
163 | self.specGraphToolPath = QtGui.QToolButton(self.tabgraphSpectra) | |
157 | self.specGraphToolPath.setObjectName(_fromUtf8("specGraphToolPath")) |
|
164 | self.specGraphToolPath.setObjectName(_fromUtf8("specGraphToolPath")) | |
158 |
self.gridLayout_9.addWidget(self.specGraphToolPath, |
|
165 | self.gridLayout_9.addWidget(self.specGraphToolPath, xi, 7, 1, 1) | |
159 |
|
166 | |||
160 | self.label_25 = QtGui.QLabel(self.tabgraphSpectra) |
|
167 | self.label_25 = QtGui.QLabel(self.tabgraphSpectra) | |
161 | self.label_25.setObjectName(_fromUtf8("label_25")) |
|
168 | self.label_25.setObjectName(_fromUtf8("label_25")) | |
162 |
self.gridLayout_9.addWidget(self.label_25, |
|
169 | self.gridLayout_9.addWidget(self.label_25, xi+1, 0, 1, 1) | |
163 | self.specGraphPrefix = QtGui.QLineEdit(self.tabgraphSpectra) |
|
170 | self.specGraphPrefix = QtGui.QLineEdit(self.tabgraphSpectra) | |
164 | self.specGraphPrefix.setObjectName(_fromUtf8("specGraphPrefix")) |
|
171 | self.specGraphPrefix.setObjectName(_fromUtf8("specGraphPrefix")) | |
165 |
self.gridLayout_9.addWidget(self.specGraphPrefix, |
|
172 | self.gridLayout_9.addWidget(self.specGraphPrefix, xi+1, 1, 1, 7) | |
166 |
|
173 | |||
|
174 | xi = 2 | |||
167 |
|
175 | |||
168 | self.label_40 = QtGui.QLabel(self.tabgraphSpectra) |
|
176 | self.label_40 = QtGui.QLabel(self.tabgraphSpectra) | |
169 | self.label_40.setObjectName(_fromUtf8("label_40")) |
|
177 | self.label_40.setObjectName(_fromUtf8("label_40")) | |
170 |
self.gridLayout_9.addWidget(self.label_40, |
|
178 | self.gridLayout_9.addWidget(self.label_40, xi+1, 0, 1, 1) | |
171 | self.label_41 = QtGui.QLabel(self.tabgraphSpectra) |
|
179 | self.label_41 = QtGui.QLabel(self.tabgraphSpectra) | |
172 | self.label_41.setObjectName(_fromUtf8("label_41")) |
|
180 | self.label_41.setObjectName(_fromUtf8("label_41")) | |
173 |
self.gridLayout_9.addWidget(self.label_41, |
|
181 | self.gridLayout_9.addWidget(self.label_41, xi+2, 0, 1, 1) | |
174 | self.label_42 = QtGui.QLabel(self.tabgraphSpectra) |
|
182 | self.label_42 = QtGui.QLabel(self.tabgraphSpectra) | |
175 | self.label_42.setObjectName(_fromUtf8("label_42")) |
|
183 | self.label_42.setObjectName(_fromUtf8("label_42")) | |
176 |
self.gridLayout_9.addWidget(self.label_42, |
|
184 | self.gridLayout_9.addWidget(self.label_42, xi+3, 0, 1, 1) | |
177 | self.label_44 = QtGui.QLabel(self.tabgraphSpectra) |
|
185 | self.label_44 = QtGui.QLabel(self.tabgraphSpectra) | |
178 | self.label_44.setObjectName(_fromUtf8("label_44")) |
|
186 | self.label_44.setObjectName(_fromUtf8("label_44")) | |
179 |
self.gridLayout_9.addWidget(self.label_44, |
|
187 | self.gridLayout_9.addWidget(self.label_44, xi+4, 0, 1, 1) | |
180 | self.label_46 = QtGui.QLabel(self.tabgraphSpectra) |
|
188 | self.label_46 = QtGui.QLabel(self.tabgraphSpectra) | |
181 | self.label_46.setObjectName(_fromUtf8("label_46")) |
|
189 | self.label_46.setObjectName(_fromUtf8("label_46")) | |
182 |
self.gridLayout_9.addWidget(self.label_46, |
|
190 | self.gridLayout_9.addWidget(self.label_46, xi+5, 0, 1, 1) | |
183 | self.label_45 = QtGui.QLabel(self.tabgraphSpectra) |
|
191 | self.label_45 = QtGui.QLabel(self.tabgraphSpectra) | |
184 | self.label_45.setObjectName(_fromUtf8("label_45")) |
|
192 | self.label_45.setObjectName(_fromUtf8("label_45")) | |
185 |
self.gridLayout_9.addWidget(self.label_45, |
|
193 | self.gridLayout_9.addWidget(self.label_45, xi+6, 0, 1, 1) | |
186 |
|
194 | |||
187 | self.label_43 = QtGui.QLabel(self.tabgraphSpectra) |
|
195 | self.label_43 = QtGui.QLabel(self.tabgraphSpectra) | |
188 | self.label_43.setObjectName(_fromUtf8("label_43")) |
|
196 | self.label_43.setObjectName(_fromUtf8("label_43")) | |
189 |
self.gridLayout_9.addWidget(self.label_43, |
|
197 | self.gridLayout_9.addWidget(self.label_43, xi, 3, 1, 1) | |
190 | self.specGraphCebSpectraplot = QtGui.QCheckBox(self.tabgraphSpectra) |
|
198 | self.specGraphCebSpectraplot = QtGui.QCheckBox(self.tabgraphSpectra) | |
191 | self.specGraphCebSpectraplot.setText(_fromUtf8("")) |
|
199 | self.specGraphCebSpectraplot.setText(_fromUtf8("")) | |
192 | self.specGraphCebSpectraplot.setObjectName(_fromUtf8("specGraphCebSpectraplot")) |
|
200 | self.specGraphCebSpectraplot.setObjectName(_fromUtf8("specGraphCebSpectraplot")) | |
193 |
self.gridLayout_9.addWidget(self.specGraphCebSpectraplot, |
|
201 | self.gridLayout_9.addWidget(self.specGraphCebSpectraplot, xi+1, 3, 1, 1) | |
194 | self.specGraphCebCrossSpectraplot = QtGui.QCheckBox(self.tabgraphSpectra) |
|
202 | self.specGraphCebCrossSpectraplot = QtGui.QCheckBox(self.tabgraphSpectra) | |
195 | self.specGraphCebCrossSpectraplot.setText(_fromUtf8("")) |
|
203 | self.specGraphCebCrossSpectraplot.setText(_fromUtf8("")) | |
196 | self.specGraphCebCrossSpectraplot.setObjectName(_fromUtf8("specGraphCebCrossSpectraplot")) |
|
204 | self.specGraphCebCrossSpectraplot.setObjectName(_fromUtf8("specGraphCebCrossSpectraplot")) | |
197 |
self.gridLayout_9.addWidget(self.specGraphCebCrossSpectraplot, |
|
205 | self.gridLayout_9.addWidget(self.specGraphCebCrossSpectraplot, xi+2, 3, 1, 1) | |
198 | self.specGraphCebRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) |
|
206 | self.specGraphCebRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) | |
199 | self.specGraphCebRTIplot.setText(_fromUtf8("")) |
|
207 | self.specGraphCebRTIplot.setText(_fromUtf8("")) | |
200 | self.specGraphCebRTIplot.setObjectName(_fromUtf8("specGraphCebRTIplot")) |
|
208 | self.specGraphCebRTIplot.setObjectName(_fromUtf8("specGraphCebRTIplot")) | |
201 |
self.gridLayout_9.addWidget(self.specGraphCebRTIplot, |
|
209 | self.gridLayout_9.addWidget(self.specGraphCebRTIplot, xi+3, 3, 1, 1) | |
202 | self.specGraphCebCoherencmap = QtGui.QCheckBox(self.tabgraphSpectra) |
|
210 | self.specGraphCebCoherencmap = QtGui.QCheckBox(self.tabgraphSpectra) | |
203 | self.specGraphCebCoherencmap.setText(_fromUtf8("")) |
|
211 | self.specGraphCebCoherencmap.setText(_fromUtf8("")) | |
204 | self.specGraphCebCoherencmap.setObjectName(_fromUtf8("specGraphCebCoherencmap")) |
|
212 | self.specGraphCebCoherencmap.setObjectName(_fromUtf8("specGraphCebCoherencmap")) | |
205 |
self.gridLayout_9.addWidget(self.specGraphCebCoherencmap, |
|
213 | self.gridLayout_9.addWidget(self.specGraphCebCoherencmap, xi+4, 3, 1, 1) | |
206 | self.specGraphPowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) |
|
214 | self.specGraphPowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) | |
207 | self.specGraphPowerprofile.setText(_fromUtf8("")) |
|
215 | self.specGraphPowerprofile.setText(_fromUtf8("")) | |
208 | self.specGraphPowerprofile.setObjectName(_fromUtf8("specGraphPowerprofile")) |
|
216 | self.specGraphPowerprofile.setObjectName(_fromUtf8("specGraphPowerprofile")) | |
209 |
self.gridLayout_9.addWidget(self.specGraphPowerprofile, |
|
217 | self.gridLayout_9.addWidget(self.specGraphPowerprofile, xi+5, 3, 1, 1) | |
210 | self.specGraphCebRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) |
|
218 | self.specGraphCebRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) | |
211 | self.specGraphCebRTInoise.setText(_fromUtf8("")) |
|
219 | self.specGraphCebRTInoise.setText(_fromUtf8("")) | |
212 | self.specGraphCebRTInoise.setObjectName(_fromUtf8("specGraphCebRTInoise")) |
|
220 | self.specGraphCebRTInoise.setObjectName(_fromUtf8("specGraphCebRTInoise")) | |
213 |
self.gridLayout_9.addWidget(self.specGraphCebRTInoise, |
|
221 | self.gridLayout_9.addWidget(self.specGraphCebRTInoise, xi+6, 3, 1, 1) | |
214 |
|
222 | |||
215 | # spacerItem18 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
223 | # spacerItem18 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
216 | # self.gridLayout_9.addItem(spacerItem18, 4, 3, 1, 1) |
|
224 | # self.gridLayout_9.addItem(spacerItem18, 4, 3, 1, 1) | |
217 |
|
225 | |||
218 | self.label_47 = QtGui.QLabel(self.tabgraphSpectra) |
|
226 | self.label_47 = QtGui.QLabel(self.tabgraphSpectra) | |
219 | self.label_47.setObjectName(_fromUtf8("label_47")) |
|
227 | self.label_47.setObjectName(_fromUtf8("label_47")) | |
220 |
self.gridLayout_9.addWidget(self.label_47, |
|
228 | self.gridLayout_9.addWidget(self.label_47, xi, 5, 1, 1) | |
221 | self.specGraphSaveSpectra = QtGui.QCheckBox(self.tabgraphSpectra) |
|
229 | self.specGraphSaveSpectra = QtGui.QCheckBox(self.tabgraphSpectra) | |
222 | self.specGraphSaveSpectra.setText(_fromUtf8("")) |
|
230 | self.specGraphSaveSpectra.setText(_fromUtf8("")) | |
223 | self.specGraphSaveSpectra.setObjectName(_fromUtf8("specGraphSaveSpectra")) |
|
231 | self.specGraphSaveSpectra.setObjectName(_fromUtf8("specGraphSaveSpectra")) | |
224 |
self.gridLayout_9.addWidget(self.specGraphSaveSpectra, |
|
232 | self.gridLayout_9.addWidget(self.specGraphSaveSpectra, xi+1, 5, 1, 1) | |
225 | self.specGraphSaveCross = QtGui.QCheckBox(self.tabgraphSpectra) |
|
233 | self.specGraphSaveCross = QtGui.QCheckBox(self.tabgraphSpectra) | |
226 | self.specGraphSaveCross.setText(_fromUtf8("")) |
|
234 | self.specGraphSaveCross.setText(_fromUtf8("")) | |
227 | self.specGraphSaveCross.setObjectName(_fromUtf8("specGraphSaveCross")) |
|
235 | self.specGraphSaveCross.setObjectName(_fromUtf8("specGraphSaveCross")) | |
228 |
self.gridLayout_9.addWidget(self.specGraphSaveCross, |
|
236 | self.gridLayout_9.addWidget(self.specGraphSaveCross, xi+2, 5, 1, 1) | |
229 | self.specGraphSaveRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) |
|
237 | self.specGraphSaveRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) | |
230 | self.specGraphSaveRTIplot.setText(_fromUtf8("")) |
|
238 | self.specGraphSaveRTIplot.setText(_fromUtf8("")) | |
231 | self.specGraphSaveRTIplot.setObjectName(_fromUtf8("specGraphSaveRTIplot")) |
|
239 | self.specGraphSaveRTIplot.setObjectName(_fromUtf8("specGraphSaveRTIplot")) | |
232 |
self.gridLayout_9.addWidget(self.specGraphSaveRTIplot, |
|
240 | self.gridLayout_9.addWidget(self.specGraphSaveRTIplot, xi+3, 5, 1, 1) | |
233 | self.specGraphSaveCoherencemap = QtGui.QCheckBox(self.tabgraphSpectra) |
|
241 | self.specGraphSaveCoherencemap = QtGui.QCheckBox(self.tabgraphSpectra) | |
234 | self.specGraphSaveCoherencemap.setText(_fromUtf8("")) |
|
242 | self.specGraphSaveCoherencemap.setText(_fromUtf8("")) | |
235 | self.specGraphSaveCoherencemap.setObjectName(_fromUtf8("specGraphSaveCoherencemap")) |
|
243 | self.specGraphSaveCoherencemap.setObjectName(_fromUtf8("specGraphSaveCoherencemap")) | |
236 |
self.gridLayout_9.addWidget(self.specGraphSaveCoherencemap, |
|
244 | self.gridLayout_9.addWidget(self.specGraphSaveCoherencemap, xi+4, 5, 1, 1) | |
237 | self.specGraphSavePowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) |
|
245 | self.specGraphSavePowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) | |
238 | self.specGraphSavePowerprofile.setText(_fromUtf8("")) |
|
246 | self.specGraphSavePowerprofile.setText(_fromUtf8("")) | |
239 | self.specGraphSavePowerprofile.setObjectName(_fromUtf8("specGraphSavePowerprofile")) |
|
247 | self.specGraphSavePowerprofile.setObjectName(_fromUtf8("specGraphSavePowerprofile")) | |
240 |
self.gridLayout_9.addWidget(self.specGraphSavePowerprofile, |
|
248 | self.gridLayout_9.addWidget(self.specGraphSavePowerprofile, xi+5, 5, 1, 1) | |
241 | self.specGraphSaveRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) |
|
249 | self.specGraphSaveRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) | |
242 | self.specGraphSaveRTInoise.setText(_fromUtf8("")) |
|
250 | self.specGraphSaveRTInoise.setText(_fromUtf8("")) | |
243 | self.specGraphSaveRTInoise.setObjectName(_fromUtf8("specGraphSaveRTInoise")) |
|
251 | self.specGraphSaveRTInoise.setObjectName(_fromUtf8("specGraphSaveRTInoise")) | |
244 |
self.gridLayout_9.addWidget(self.specGraphSaveRTInoise, |
|
252 | self.gridLayout_9.addWidget(self.specGraphSaveRTInoise, xi+6, 5, 1, 1) | |
245 |
|
253 | |||
246 | self.label_19 = QtGui.QLabel(self.tabgraphSpectra) |
|
254 | self.label_19 = QtGui.QLabel(self.tabgraphSpectra) | |
247 | self.label_19.setObjectName(_fromUtf8("label_19")) |
|
255 | self.label_19.setObjectName(_fromUtf8("label_19")) | |
248 |
self.gridLayout_9.addWidget(self.label_19, |
|
256 | self.gridLayout_9.addWidget(self.label_19, xi, 7, 1, 1) | |
249 | self.specGraphftpSpectra = QtGui.QCheckBox(self.tabgraphSpectra) |
|
257 | self.specGraphftpSpectra = QtGui.QCheckBox(self.tabgraphSpectra) | |
250 | self.specGraphftpSpectra.setText(_fromUtf8("")) |
|
258 | self.specGraphftpSpectra.setText(_fromUtf8("")) | |
251 | self.specGraphftpSpectra.setObjectName(_fromUtf8("specGraphftpSpectra")) |
|
259 | self.specGraphftpSpectra.setObjectName(_fromUtf8("specGraphftpSpectra")) | |
252 |
self.gridLayout_9.addWidget(self.specGraphftpSpectra, |
|
260 | self.gridLayout_9.addWidget(self.specGraphftpSpectra, xi+1, 7, 1, 1) | |
253 | self.specGraphftpCross = QtGui.QCheckBox(self.tabgraphSpectra) |
|
261 | self.specGraphftpCross = QtGui.QCheckBox(self.tabgraphSpectra) | |
254 | self.specGraphftpCross.setText(_fromUtf8("")) |
|
262 | self.specGraphftpCross.setText(_fromUtf8("")) | |
255 | self.specGraphftpCross.setObjectName(_fromUtf8("specGraphftpCross")) |
|
263 | self.specGraphftpCross.setObjectName(_fromUtf8("specGraphftpCross")) | |
256 |
self.gridLayout_9.addWidget(self.specGraphftpCross, |
|
264 | self.gridLayout_9.addWidget(self.specGraphftpCross, xi+2, 7, 1, 1) | |
257 | self.specGraphftpRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) |
|
265 | self.specGraphftpRTIplot = QtGui.QCheckBox(self.tabgraphSpectra) | |
258 | self.specGraphftpRTIplot.setText(_fromUtf8("")) |
|
266 | self.specGraphftpRTIplot.setText(_fromUtf8("")) | |
259 | self.specGraphftpRTIplot.setObjectName(_fromUtf8("specGraphftpRTIplot")) |
|
267 | self.specGraphftpRTIplot.setObjectName(_fromUtf8("specGraphftpRTIplot")) | |
260 |
self.gridLayout_9.addWidget(self.specGraphftpRTIplot, |
|
268 | self.gridLayout_9.addWidget(self.specGraphftpRTIplot, xi+3, 7, 1, 1) | |
261 | self.specGraphftpCoherencemap = QtGui.QCheckBox(self.tabgraphSpectra) |
|
269 | self.specGraphftpCoherencemap = QtGui.QCheckBox(self.tabgraphSpectra) | |
262 | self.specGraphftpCoherencemap.setText(_fromUtf8("")) |
|
270 | self.specGraphftpCoherencemap.setText(_fromUtf8("")) | |
263 | self.specGraphftpCoherencemap.setObjectName(_fromUtf8("specGraphftpCoherencemap")) |
|
271 | self.specGraphftpCoherencemap.setObjectName(_fromUtf8("specGraphftpCoherencemap")) | |
264 |
self.gridLayout_9.addWidget(self.specGraphftpCoherencemap, |
|
272 | self.gridLayout_9.addWidget(self.specGraphftpCoherencemap, xi+4, 7, 1, 1) | |
265 | self.specGraphftpPowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) |
|
273 | self.specGraphftpPowerprofile = QtGui.QCheckBox(self.tabgraphSpectra) | |
266 | self.specGraphftpPowerprofile.setText(_fromUtf8("")) |
|
274 | self.specGraphftpPowerprofile.setText(_fromUtf8("")) | |
267 | self.specGraphftpPowerprofile.setObjectName(_fromUtf8("specGraphftpPowerprofile")) |
|
275 | self.specGraphftpPowerprofile.setObjectName(_fromUtf8("specGraphftpPowerprofile")) | |
268 |
self.gridLayout_9.addWidget(self.specGraphftpPowerprofile, |
|
276 | self.gridLayout_9.addWidget(self.specGraphftpPowerprofile, xi+5, 7, 1, 1) | |
269 | self.specGraphftpRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) |
|
277 | self.specGraphftpRTInoise = QtGui.QCheckBox(self.tabgraphSpectra) | |
270 | self.specGraphftpRTInoise.setText(_fromUtf8("")) |
|
278 | self.specGraphftpRTInoise.setText(_fromUtf8("")) | |
271 | self.specGraphftpRTInoise.setObjectName(_fromUtf8("specGraphftpRTInoise")) |
|
279 | self.specGraphftpRTInoise.setObjectName(_fromUtf8("specGraphftpRTInoise")) | |
272 |
self.gridLayout_9.addWidget(self.specGraphftpRTInoise, |
|
280 | self.gridLayout_9.addWidget(self.specGraphftpRTInoise, xi+6, 7, 1, 1) | |
273 |
|
281 | |||
274 | spacerItem19 = QtGui.QSpacerItem(39, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
282 | # spacerItem19 = QtGui.QSpacerItem(39, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
275 | self.gridLayout_9.addItem(spacerItem19, 27, 4, 1, 1) |
|
283 | # self.gridLayout_9.addItem(spacerItem19, 27, 4, 1, 1) | |
|
284 | ||||
|
285 | xi = 11 | |||
276 |
|
286 | |||
277 | self.label_22 = QtGui.QLabel(self.tabgraphSpectra) |
|
287 | self.label_22 = QtGui.QLabel(self.tabgraphSpectra) | |
278 | self.label_22.setObjectName(_fromUtf8("label_22")) |
|
288 | self.label_22.setObjectName(_fromUtf8("label_22")) | |
279 |
self.gridLayout_9.addWidget(self.label_22, |
|
289 | self.gridLayout_9.addWidget(self.label_22, xi, 0, 1, 1) | |
280 | self.specGgraphFreq = QtGui.QLineEdit(self.tabgraphSpectra) |
|
290 | self.specGgraphFreq = QtGui.QLineEdit(self.tabgraphSpectra) | |
281 | self.specGgraphFreq.setObjectName(_fromUtf8("specGgraphFreq")) |
|
291 | self.specGgraphFreq.setObjectName(_fromUtf8("specGgraphFreq")) | |
282 |
self.gridLayout_9.addWidget(self.specGgraphFreq, |
|
292 | self.gridLayout_9.addWidget(self.specGgraphFreq, xi, 2, 1, 2) | |
283 |
|
293 | |||
284 | self.label_16 = QtGui.QLabel(self.tabgraphSpectra) |
|
294 | self.label_16 = QtGui.QLabel(self.tabgraphSpectra) | |
285 | self.label_16.setObjectName(_fromUtf8("label_16")) |
|
295 | self.label_16.setObjectName(_fromUtf8("label_16")) | |
286 |
self.gridLayout_9.addWidget(self.label_16, 1 |
|
296 | self.gridLayout_9.addWidget(self.label_16, xi+1, 0, 1, 1) | |
287 | self.specGgraphHeight = QtGui.QLineEdit(self.tabgraphSpectra) |
|
297 | self.specGgraphHeight = QtGui.QLineEdit(self.tabgraphSpectra) | |
288 | self.specGgraphHeight.setObjectName(_fromUtf8("specGgraphHeight")) |
|
298 | self.specGgraphHeight.setObjectName(_fromUtf8("specGgraphHeight")) | |
289 |
self.gridLayout_9.addWidget(self.specGgraphHeight, 1 |
|
299 | self.gridLayout_9.addWidget(self.specGgraphHeight, xi+1, 2, 1, 2) | |
290 |
|
300 | |||
291 | self.label_17 = QtGui.QLabel(self.tabgraphSpectra) |
|
301 | self.label_17 = QtGui.QLabel(self.tabgraphSpectra) | |
292 | self.label_17.setObjectName(_fromUtf8("label_17")) |
|
302 | self.label_17.setObjectName(_fromUtf8("label_17")) | |
293 |
self.gridLayout_9.addWidget(self.label_17, |
|
303 | self.gridLayout_9.addWidget(self.label_17, xi+2, 0, 1, 1) | |
294 | self.specGgraphDbsrange = QtGui.QLineEdit(self.tabgraphSpectra) |
|
304 | self.specGgraphDbsrange = QtGui.QLineEdit(self.tabgraphSpectra) | |
295 | self.specGgraphDbsrange.setObjectName(_fromUtf8("specGgraphDbsrange")) |
|
305 | self.specGgraphDbsrange.setObjectName(_fromUtf8("specGgraphDbsrange")) | |
296 |
self.gridLayout_9.addWidget(self.specGgraphDbsrange, |
|
306 | self.gridLayout_9.addWidget(self.specGgraphDbsrange, xi+2, 2, 1, 2) | |
297 |
|
307 | |||
298 | self.specGraphTminTmaxLabel = QtGui.QLabel(self.tabgraphSpectra) |
|
308 | self.specGraphTminTmaxLabel = QtGui.QLabel(self.tabgraphSpectra) | |
299 | self.specGraphTminTmaxLabel.setObjectName(_fromUtf8("specGraphTminTmaxLabel")) |
|
309 | self.specGraphTminTmaxLabel.setObjectName(_fromUtf8("specGraphTminTmaxLabel")) | |
300 |
self.gridLayout_9.addWidget(self.specGraphTminTmaxLabel, |
|
310 | self.gridLayout_9.addWidget(self.specGraphTminTmaxLabel, xi+3, 0, 1, 2) | |
301 | self.specGgraphTminTmax = QtGui.QLineEdit(self.tabgraphSpectra) |
|
311 | self.specGgraphTminTmax = QtGui.QLineEdit(self.tabgraphSpectra) | |
302 | self.specGgraphTminTmax.setObjectName(_fromUtf8("specGgraphTminTmax")) |
|
312 | self.specGgraphTminTmax.setObjectName(_fromUtf8("specGgraphTminTmax")) | |
303 |
self.gridLayout_9.addWidget(self.specGgraphTminTmax, |
|
313 | self.gridLayout_9.addWidget(self.specGgraphTminTmax, xi+3, 2, 1, 2) | |
304 |
|
314 | |||
305 | self.specGraphMagLabel = QtGui.QLabel(self.tabgraphSpectra) |
|
315 | self.specGraphMagLabel = QtGui.QLabel(self.tabgraphSpectra) | |
306 | self.specGraphMagLabel.setObjectName(_fromUtf8("specGraphMagLabel")) |
|
316 | self.specGraphMagLabel.setObjectName(_fromUtf8("specGraphMagLabel")) | |
307 |
self.gridLayout_9.addWidget(self.specGraphMagLabel, |
|
317 | self.gridLayout_9.addWidget(self.specGraphMagLabel, xi, 4, 1, 2) | |
308 | self.specGgraphmagnitud = QtGui.QLineEdit(self.tabgraphSpectra) |
|
318 | self.specGgraphmagnitud = QtGui.QLineEdit(self.tabgraphSpectra) | |
309 | self.specGgraphmagnitud.setObjectName(_fromUtf8("specGgraphmagnitud")) |
|
319 | self.specGgraphmagnitud.setObjectName(_fromUtf8("specGgraphmagnitud")) | |
310 |
self.gridLayout_9.addWidget(self.specGgraphmagnitud, |
|
320 | self.gridLayout_9.addWidget(self.specGgraphmagnitud, xi, 6, 1, 2) | |
311 |
|
321 | |||
312 | self.specGraphPhaseLabel = QtGui.QLabel(self.tabgraphSpectra) |
|
322 | self.specGraphPhaseLabel = QtGui.QLabel(self.tabgraphSpectra) | |
313 | self.specGraphPhaseLabel.setObjectName(_fromUtf8("specGraphPhaseLabel")) |
|
323 | self.specGraphPhaseLabel.setObjectName(_fromUtf8("specGraphPhaseLabel")) | |
314 |
self.gridLayout_9.addWidget(self.specGraphPhaseLabel, 1 |
|
324 | self.gridLayout_9.addWidget(self.specGraphPhaseLabel, xi+1, 4, 1, 2) | |
315 | self.specGgraphPhase = QtGui.QLineEdit(self.tabgraphSpectra) |
|
325 | self.specGgraphPhase = QtGui.QLineEdit(self.tabgraphSpectra) | |
316 | self.specGgraphPhase.setObjectName(_fromUtf8("specGgraphPhase")) |
|
326 | self.specGgraphPhase.setObjectName(_fromUtf8("specGgraphPhase")) | |
317 |
self.gridLayout_9.addWidget(self.specGgraphPhase, 1 |
|
327 | self.gridLayout_9.addWidget(self.specGgraphPhase, xi+1, 6, 1, 2) | |
318 |
|
328 | |||
319 | self.label_6 = QtGui.QLabel(self.tabgraphSpectra) |
|
329 | self.label_6 = QtGui.QLabel(self.tabgraphSpectra) | |
320 | self.label_6.setObjectName(_fromUtf8("label_6")) |
|
330 | self.label_6.setObjectName(_fromUtf8("label_6")) | |
321 |
self.gridLayout_9.addWidget(self.label_6, |
|
331 | self.gridLayout_9.addWidget(self.label_6, xi+2, 4, 1, 1) | |
322 | self.specGgraphChannelList = QtGui.QLineEdit(self.tabgraphSpectra) |
|
332 | self.specGgraphChannelList = QtGui.QLineEdit(self.tabgraphSpectra) | |
323 | self.specGgraphChannelList.setObjectName(_fromUtf8("specGgraphChannelList")) |
|
333 | self.specGgraphChannelList.setObjectName(_fromUtf8("specGgraphChannelList")) | |
324 |
self.gridLayout_9.addWidget(self.specGgraphChannelList, |
|
334 | self.gridLayout_9.addWidget(self.specGgraphChannelList, xi+2, 6, 1, 2) | |
325 |
|
335 | |||
326 | self.label_29 = QtGui.QLabel(self.tabgraphSpectra) |
|
336 | self.label_29 = QtGui.QLabel(self.tabgraphSpectra) | |
327 | self.label_29.setObjectName(_fromUtf8("label_29")) |
|
337 | self.label_29.setObjectName(_fromUtf8("label_29")) | |
328 |
self.gridLayout_9.addWidget(self.label_29, |
|
338 | self.gridLayout_9.addWidget(self.label_29, xi+3, 4, 1, 2) | |
329 | self.specGgraphftpratio = QtGui.QLineEdit(self.tabgraphSpectra) |
|
339 | self.specGgraphftpratio = QtGui.QLineEdit(self.tabgraphSpectra) | |
330 | self.specGgraphftpratio.setObjectName(_fromUtf8("specGgraphftpratio")) |
|
340 | self.specGgraphftpratio.setObjectName(_fromUtf8("specGgraphftpratio")) | |
331 |
self.gridLayout_9.addWidget(self.specGgraphftpratio, |
|
341 | self.gridLayout_9.addWidget(self.specGgraphftpratio, xi+3, 6, 1, 2) | |
332 |
|
342 | |||
333 | self.label_48 = QtGui.QLabel(self.tabgraphSpectra) |
|
343 | self.label_48 = QtGui.QLabel(self.tabgraphSpectra) | |
334 | self.label_48.setObjectName(_fromUtf8("label_48")) |
|
344 | self.label_48.setObjectName(_fromUtf8("label_48")) | |
335 |
self.gridLayout_9.addWidget(self.label_48, |
|
345 | self.gridLayout_9.addWidget(self.label_48, xi+4, 4, 1, 2) | |
336 | self.specGgraphTimeRange = QtGui.QLineEdit(self.tabgraphSpectra) |
|
346 | self.specGgraphTimeRange = QtGui.QLineEdit(self.tabgraphSpectra) | |
337 | self.specGgraphTimeRange.setObjectName(_fromUtf8("specGgraphTimeRange")) |
|
347 | self.specGgraphTimeRange.setObjectName(_fromUtf8("specGgraphTimeRange")) | |
338 |
self.gridLayout_9.addWidget(self.specGgraphTimeRange, |
|
348 | self.gridLayout_9.addWidget(self.specGgraphTimeRange, xi+4, 6, 1, 2) | |
339 |
|
349 | |||
340 | spacerItem15 = QtGui.QSpacerItem(28, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
350 | # spacerItem15 = QtGui.QSpacerItem(28, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
341 | self.gridLayout_9.addItem(spacerItem15, 27, 6, 1, 2) |
|
351 | # self.gridLayout_9.addItem(spacerItem15, 27, 6, 1, 2) | |
342 | spacerItem16 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) |
|
352 | # spacerItem16 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) | |
343 | self.gridLayout_9.addItem(spacerItem16, 3, 5, 1, 1) |
|
353 | # self.gridLayout_9.addItem(spacerItem16, 3, 5, 1, 1) | |
344 | spacerItem17 = QtGui.QSpacerItem(49, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
|
354 | # spacerItem17 = QtGui.QSpacerItem(49, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) | |
345 | self.gridLayout_9.addItem(spacerItem17, 27, 0, 1, 1) |
|
355 | # self.gridLayout_9.addItem(spacerItem17, 27, 0, 1, 1) | |
346 |
|
356 | |||
347 |
|
357 | |||
348 |
|
358 | |||
@@ -375,12 +385,7 class Ui_SpectraTab(object): | |||||
375 | self.label_9 = QtGui.QLabel(self.taboutputSpectra) |
|
385 | self.label_9 = QtGui.QLabel(self.taboutputSpectra) | |
376 | self.label_9.setObjectName(_fromUtf8("label_9")) |
|
386 | self.label_9.setObjectName(_fromUtf8("label_9")) | |
377 | self.gridLayout_11.addWidget(self.label_9, 2, 0, 1, 2) |
|
387 | self.gridLayout_11.addWidget(self.label_9, 2, 0, 1, 2) | |
378 | self.label_38 = QtGui.QLabel(self.taboutputSpectra) |
|
388 | ||
379 | self.label_38.setObjectName(_fromUtf8("label_38")) |
|
|||
380 | self.gridLayout_11.addWidget(self.label_38, 3, 0, 1, 1) |
|
|||
381 | self.specOutputprofileperblock = QtGui.QLineEdit(self.taboutputSpectra) |
|
|||
382 | self.specOutputprofileperblock.setObjectName(_fromUtf8("specOutputprofileperblock")) |
|
|||
383 | self.gridLayout_11.addWidget(self.specOutputprofileperblock, 3, 2, 1, 1) |
|
|||
384 | self.tabWidgetSpectra.addTab(self.taboutputSpectra, _fromUtf8("")) |
|
389 | self.tabWidgetSpectra.addTab(self.taboutputSpectra, _fromUtf8("")) | |
385 | self.gridLayout_7.addWidget(self.tabWidgetSpectra, 0, 1, 1, 1) |
|
390 | self.gridLayout_7.addWidget(self.tabWidgetSpectra, 0, 1, 1, 1) | |
386 |
|
391 | |||
@@ -444,7 +449,7 class Ui_SpectraTab(object): | |||||
444 | self.label_34.setText(_translate("MainWindow", "Path:", None)) |
|
449 | self.label_34.setText(_translate("MainWindow", "Path:", None)) | |
445 | self.specOutputToolPath.setText(_translate("MainWindow", "...", None)) |
|
450 | self.specOutputToolPath.setText(_translate("MainWindow", "...", None)) | |
446 | self.label_9.setText(_translate("MainWindow", "Blocks per File: ", None)) |
|
451 | self.label_9.setText(_translate("MainWindow", "Blocks per File: ", None)) | |
447 | self.label_38.setText(_translate("MainWindow", "Profile per Block: ", None)) |
|
452 | ||
448 | self.tabWidgetSpectra.setTabText(self.tabWidgetSpectra.indexOf(self.taboutputSpectra), _translate("MainWindow", "Output", None)) |
|
453 | self.tabWidgetSpectra.setTabText(self.tabWidgetSpectra.indexOf(self.taboutputSpectra), _translate("MainWindow", "Output", None)) | |
449 |
|
454 | |||
450 | self.tabWidgetProject.setTabText(self.tabWidgetProject.indexOf(self.tabSpectra), _translate("MainWindow", "Spectra", None)) |
|
455 | self.tabWidgetProject.setTabText(self.tabWidgetProject.indexOf(self.tabSpectra), _translate("MainWindow", "Spectra", None)) |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed | ||
This diff has been collapsed as it changes many lines, (632 lines changed) Show them Hide them |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed | ||
This diff has been collapsed as it changes many lines, (807 lines changed) Show them Hide them |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now