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.actionPauseToolbar.setEnabled(True)
                     self.actionStopToolbar.setEnabled(True)
+                    self.changePauseIcon(paused)
                 def saveProject(self, filename=None):
                     self.actionStart.setEnabled(False)
                 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 +47 -25

                 def restorePauseIcon(self):
+                    icon_name = "pause.png"
                     iconPause = QtGui.QIcon()
-                     iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     self.actionPauseToolbar.setIcon(iconPause)
-                     self.paused = False
+                def restoreStartIcon(self):
-                def changePauseIcon(self):
+                    icon_name = "start.png"
+                    iconStart = QtGui.QIcon()
+                    iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    self.actionStarToolbar.setIcon(iconStart)
-                     if self.paused == False:
+                def changePauseIcon(self, paused=False):
-                        iconPauseRed = QtGui.QIcon()
-                        iconPauseRed.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pausered.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    if paused == True:
-                        self.actionPauseToolbar.setIcon(iconPauseRed)
+                        icon_name = "pausered.png"
-                        self.paused = True
+                    else:
-                        return 0
+                        icon_name = "pause.png"
-                     if self.paused:
                     iconPause = QtGui.QIcon()
-                         iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     self.actionPauseToolbar.setIcon(iconPause)
-                         self.paused = False
-                         return 0
+                    return
+                def changeStartIcon(self, started=False):
+                    if started == True:
+                        icon_name = "startred.png"
+                    else:
+                        icon_name = "start.png"
+                    iconStart = QtGui.QIcon()
+                    iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    self.actionStarToolbar.setIcon(iconStart)
+                    return
                 def setupUi(self, MainWindow):
                     MainWindow.setMenuBar(self.menuBar)
                     iconOpen = QtGui.QIcon()
-                    iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconOpen.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"open.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconCreate = QtGui.QIcon()
-                    iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"project.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconCreate.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"new.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconSave = QtGui.QIcon()
-                    iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"saveicon.jpeg") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconSave.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"save.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconStart = QtGui.QIcon()
-                    iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"startServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"start.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconStop = QtGui.QIcon()
-                    iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stopServer.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconStop.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"stop.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconPause = QtGui.QIcon()
                     iconPause.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"pause.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     iconAddPU = QtGui.QIcon()
-                    iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"add_PU.gif") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconAddPU.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"branch.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+                    iconClose = QtGui.QIcon()
+                    iconClose.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH,"close.png") )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
                     self.actionOpen = QtGui.QAction(MainWindow)
                     self.actionOpen.setIcon(iconOpen)
                     self.actionSave.setIcon(iconSave)
                     self.actionSave.setObjectName(_fromUtf8("actionSave"))
                     self.actionClose = QtGui.QAction(MainWindow)
+                    self.actionClose.setIcon(iconClose)
                     self.actionClose.setObjectName(_fromUtf8("actionClose"))
                     self.actionStart = QtGui.QAction(MainWindow)
                     self.actionStart.setIcon(iconStart)
                     self.toolBar.addAction(self.actionStopToolbar)
                     self.toolBar.addSeparator()
-                    self.actionPause.triggered.connect(self.changePauseIcon)
+            #         self.actionPause.triggered.connect(self.changePauseIcon)
-                    self.actionPauseToolbar.triggered.connect(self.changePauseIcon)
+            #         self.actionPauseToolbar.triggered.connect(self.changePauseIcon)
                     self.menuProject.addAction(self.actionOpen)
                     self.menuProject.addAction(self.actionCreate)
                         event.ignore()
                 def aboutEvent(self):
+                    title = "Signal Chain Processing Software v%s" %__version__
+                    message = """
+                    Developed by Jicamarca Radio Observatory
+                    Any comment to miguel.urco@jro.igp.gob.pe
+                    """
-                    reply = QtGui.QMessageBox.information(self,
+                    QtGui.QMessageBox.about(self, title, message)
-                                                          'About',
-                        "Signal Chain Processing Software v%s" %__version__,
-                        "Developed by Jicamarca Radio Observatory\nComments to miguel.urco@jro.igp.gob.pe")
             class Ui_BasicWindow(Ui_EnvWindow, Ui_ProjectTab, Ui_VoltageTab, Ui_SpectraTab, Ui_SpectraHeisTab, Ui_CorrelationTab):

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