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