schain Commit - r667:e6e33e90d008 · Jicamarca Repository

GUI: Every icon were resized

Miguel Valdez -

r667:e6e33e90d008

parent child

Context file:

r667:e6e33e90d008

Expand all files

schainpy/gui/figures/branch.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/close.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/logo.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/new.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/save.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/startred.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/stopred.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

schainpy/gui/figures/open.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

schainpy/gui/figures/pause.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

schainpy/gui/figures/pausered.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

schainpy/gui/figures/start.png ~~schainpy/gui/figures/startServer.png~~ renamed 0 0

NO CONTENT: file renamed from schainpy/gui/figures/startServer.png to schainpy/gui/figures/start.png

schainpy/gui/figures/stop.png ~~schainpy/gui/figures/stopServer.png~~ renamed 0 0

NO CONTENT: file renamed from schainpy/gui/figures/stopServer.png to schainpy/gui/figures/stop.png

schainpy/gui/viewcontroller/basicwindow.py +19 -27

                     self.__operationObjDict = {}
                     self.__puLocalFolder2FTP = {}
-                    self.__enable = False
+                    self.threadStarted = False
             #         self.create_comm()
                     self.create_updating_timer()
                             return 0
                        valueList = value.split(',')
-                       format = 'float'
                        if  self.volOpComHeights.currentIndex() == 0:
+                           format = 'float'
                            name_operation = 'selectHeights'
                            name_parameter1 = 'minHei'
                            name_parameter2 = 'maxHei'
                        else:
+                           format = 'int'
                            name_operation = 'selectHeightsByIndex'
                            name_parameter1 = 'minIndex'
                            name_parameter2 = 'maxIndex'
                             return 0
                         name_parameter = 'n'
-                        format = 'float'
+                        format = 'int'
                         opObj = puObj.addOperation(name=name_operation, optype=optype)
                             format = 'float'
                         else:
                             name_parameter = 'n'
-                            format = 'float'
+                            format = 'int'
                         value = str(self.specOpIncoherent.text())
                         self.volOpHeights.clear()
                         self.volOpCebHeights.setCheckState(0)
                     else:
-                       value1 = int(opObj.getParameterValue(parameterName='minHei'))
+                       value1 = str(opObj.getParameterValue(parameterName='minHei'))
-                       value1 = str(value1)
+                       value2 = str(opObj.getParameterValue(parameterName='maxHei'))
-                       value2 = int(opObj.getParameterValue(parameterName='maxHei'))
-                       value2 = str(value2)
                        value = value1 + "," + value2
                        self.volOpHeights.setText(value)
                        self.volOpHeights.setEnabled(True)
                 def updateProcUnitView(self, id):
-                    procUnitConfObj = projectObjView.getProcUnitObj(id)
+                    pass
-                    procUnitConfObj.removeOperations()
-                    return procUnitConfObj
                 def addPUWindow(self):
                 def on_comm_updating_timer(self):
                     # Verifica si algun proceso ha sido inicializado y sigue ejecutandose
                     # Si el proceso se ha parado actualizar el GUI (stopProject)
-                    if not self.__enable:
+                    if not self.threadStarted:
                         return
                     if self.controllerThread.isFinished():
                         self.stopProject()
-            #     def jobStartedFromThread(self, success):
-            #         self.console.clear()
-            #         self.console.append("Job started")
-            #     def jobFinishedFromThread(self, success):
-            #         self.stopProject()
                 def playProject(self, ext=".xml", save=1):
                     projectObj = self.getSelectedProjectObj()
                     self.console.clear()
                     self.controllerThread.start()
                     sleep(0.5)
-                    self.__enable = True
+                    self.threadStarted = True
-                def stopProject(self):
+                    self.changeStartIcon(started=True)
-                    self.__enable = False
+                def stopProject(self):
             #         self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.STOP, True))
                     self.controllerThread.stop()
+                    self.threadStarted = False
                     while self.controllerThread.isRunning():
                         sleep(0.5)
                     self.actionStopToolbar.setEnabled(False)
                     self.restorePauseIcon()
+                    self.restoreStartIcon()
                 def pauseProject(self):
             #         self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.PAUSE, data=True))
-                    self.controllerThread.pause()
+                    paused = self.controllerThread.pause()
                     self.actionStart.setEnabled(False)
                     self.actionPause.setEnabled(True)
                     self.actionStarToolbar.setEnabled(False)
                     self.actionPauseToolbar.setEnabled(True)
                     self.actionStopToolbar.setEnabled(True)
+                    self.changePauseIcon(paused)
                 def saveProject(self, filename=None):
                 def setGUIStatus(self):
                     self.setWindowTitle("ROJ-Signal Chain")
-                    self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"adn.jpg") ))
+                    self.setWindowIcon(QtGui.QIcon( os.path.join(FIGURES_PATH,"logo.png") ))
                     self.tabWidgetProject.setEnabled(False)
                     self.tabVoltage.setEnabled(False)

schainpy/gui/viewer/ui_mainwindow.py +57 -35

@@ -35,28 +35,44 class Ui_EnvWindow(object):
35		35
36	def restorePauseIcon(self):	36	def restorePauseIcon(self):
37		37
38	iconPause = QtGui.QIcon()	38	icon_name = "pause.png"
39	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	39	iconPause = QtGui.QIcon()
40	self.actionPauseToolbar.setIcon(iconPause)	40	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
41		41	self.actionPauseToolbar.setIcon(iconPause)
42	self.paused = False	42
43		43	def restoreStartIcon(self):
44	def changePauseIcon(self):	44
45		45	icon_name = "start.png"
46	if self.paused == False:	46	iconStart = QtGui.QIcon()
47	iconPauseRed = QtGui.QIcon()	47	iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
48	iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	48	self.actionStarToolbar.setIcon(iconStart)
49	self.actionPauseToolbar.setIcon(iconPauseRed)	49
50	self.paused = True	50	def changePauseIcon(self, paused=False):
51	return 0	51
52		52	if paused == True:
53	if self.paused:	53	icon_name = "pausered.png"
54	iconPause = QtGui.QIcon()	54	else:
55	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	55	icon_name = "pause.png"
56	self.actionPauseToolbar.setIcon(iconPause)	56
57	self.paused = False	57	iconPause = QtGui.QIcon()
58	return 0	58	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
59		59	self.actionPauseToolbar.setIcon(iconPause)
		60
		61	return
		62
		63	def changeStartIcon(self, started=False):
		64
		65	if started == True:
		66	icon_name = "startred.png"
		67	else:
		68	icon_name = "start.png"
		69
		70	iconStart = QtGui.QIcon()
		71	iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
		72	self.actionStarToolbar.setIcon(iconStart)
		73
		74	return
		75
60	def setupUi(self, MainWindow):	76	def setupUi(self, MainWindow):
61		77
62	self.paused=False	78	self.paused=False
@@ -123,19 +139,22 class Ui_EnvWindow(object):
123	MainWindow.setMenuBar(self.menuBar)	139	MainWindow.setMenuBar(self.menuBar)
124		140
125	iconOpen = QtGui.QIcon()	141	iconOpen = QtGui.QIcon()
126	iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	142	iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
127	iconCreate = QtGui.QIcon()	143	iconCreate = QtGui.QIcon()
128	iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"~~project.gif~~") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	144	iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"new.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
129	iconSave = QtGui.QIcon()	145	iconSave = QtGui.QIcon()
130	iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"save~~icon.jpe~~g") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	146	iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"save.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
131	iconStart = QtGui.QIcon()	147	iconStart = QtGui.QIcon()
132	iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"start~~Server~~.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	148	iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"start.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
133	iconStop = QtGui.QIcon()	149	iconStop = QtGui.QIcon()
134	iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stop~~Server~~.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	150	iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stop.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
135	iconPause = QtGui.QIcon()	151	iconPause = QtGui.QIcon()
136	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	152	iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
137	iconAddPU = QtGui.QIcon()	153	iconAddPU = QtGui.QIcon()
138	iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"~~add_PU.gif~~") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)	154	iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"branch.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
		155	iconClose = QtGui.QIcon()
		156	iconClose.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"close.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
		157
139		158
140	self.actionOpen = QtGui.QAction(MainWindow)	159	self.actionOpen = QtGui.QAction(MainWindow)
141	self.actionOpen.setIcon(iconOpen)	160	self.actionOpen.setIcon(iconOpen)
@@ -147,6 +166,7 class Ui_EnvWindow(object):
147	self.actionSave.setIcon(iconSave)	166	self.actionSave.setIcon(iconSave)
148	self.actionSave.setObjectName(_fromUtf8("actionSave"))	167	self.actionSave.setObjectName(_fromUtf8("actionSave"))
149	self.actionClose = QtGui.QAction(MainWindow)	168	self.actionClose = QtGui.QAction(MainWindow)
		169	self.actionClose.setIcon(iconClose)
150	self.actionClose.setObjectName(_fromUtf8("actionClose"))	170	self.actionClose.setObjectName(_fromUtf8("actionClose"))
151	self.actionStart = QtGui.QAction(MainWindow)	171	self.actionStart = QtGui.QAction(MainWindow)
152	self.actionStart.setIcon(iconStart)	172	self.actionStart.setIcon(iconStart)
@@ -199,8 +219,8 class Ui_EnvWindow(object):
199	self.toolBar.addAction(self.actionStopToolbar)	219	self.toolBar.addAction(self.actionStopToolbar)
200	self.toolBar.addSeparator()	220	self.toolBar.addSeparator()
201		221
202	self.actionPause.triggered.connect(self.changePauseIcon)	222	# self.actionPause.triggered.connect(self.changePauseIcon)
203	self.actionPauseToolbar.triggered.connect(self.changePauseIcon)	223	# self.actionPauseToolbar.triggered.connect(self.changePauseIcon)
204		224
205	self.menuProject.addAction(self.actionOpen)	225	self.menuProject.addAction(self.actionOpen)
206	self.menuProject.addAction(self.actionCreate)	226	self.menuProject.addAction(self.actionCreate)
@@ -265,12 +285,14 class Ui_EnvWindow(object):
265	event.ignore()	285	event.ignore()
266		286
267	def aboutEvent(self):	287	def aboutEvent(self):
		288	title = "Signal Chain Processing Software v%s" %__version__
		289	message = """
		290	Developed by Jicamarca Radio Observatory
		291	Any comment to miguel.urco@jro.igp.gob.pe
		292	"""
268		293
269	~~reply~~ = QtGui.QMessageBox.~~information~~(self,	294	QtGui.QMessageBox.about(self, title, message)
270	'About',	295
271	"Signal Chain Processing Software v%s" %__version__,
272	"Developed by Jicamarca Radio Observatory\nComments to miguel.urco@jro.igp.gob.pe")
273
274		296
275	class Ui_BasicWindow(Ui_EnvWindow, Ui_ProjectTab, Ui_VoltageTab, Ui_SpectraTab, Ui_SpectraHeisTab, Ui_CorrelationTab):	297	class Ui_BasicWindow(Ui_EnvWindow, Ui_ProjectTab, Ui_VoltageTab, Ui_SpectraTab, Ui_SpectraHeisTab, Ui_CorrelationTab):
276		298

schainpy/gui/figures/Crear.jpg removed binary 0 0