schain-jc Commit - r708:e5ce72bc2207

v2.2.0: Controller updated

Miguel Valdez -

r708:e5ce72bc2207

parent child

Context file:

r708:e5ce72bc2207

Collapse all files

README 0 -2

             GUI:
             	-PyQt4
             	-wxPython
-            	-msgpack-numpy
-            	-cPickle
             Signal Chain Installation:

schainpy/__init__.py +1 -1

             @author $Author$
             @version $Id$
             '''
-            __version__ = "2.1.5"
  No newline at end of file
+            __version__ = "2.2.0"
  No newline at end of file

schainpy/controller.py +36 -10

                     if self.type == 'plotter':
                         #Plotter(plotter_name)
+                        if not plotter_queue:
+                            raise ValueError, "plotter_queue is not defined. Use:\nmyProject = Project()\nmyProject.setPlotterQueue(plotter_queue)"
                         opObj = Plotter(self.name, plotter_queue)
                     if self.type == 'external' or self.type == 'other':
                 __plotterQueue = None
-                def __init__(self, filename=None, plotter_queue=None):
+                def __init__(self, plotter_queue=None):
                     self.id = None
                     self.name = None
                     self.description = None
-                    self.filename = filename
                     self.__plotterQueue = plotter_queue
                     self.procUnitConfObjDict = {}
                 def writeXml(self, filename=None):
                     if filename == None:
-                        filename = self.filename
+                        if self.filename:
+                            filename = self.filename
+                        else:
+                            filename = "schain.xml"
                     if not filename:
                         print "filename has not been defined. Use setFilename(filename) for do it."
                     ElementTree(self.projectElement).write(abs_file, method='xml')
+                    self.filename = abs_file
                     return 1
                 def readXml(self, filename = None):
-                    if filename == None:
-                        filename = self.filename
                     abs_file = os.path.abspath(filename)
                         self.procUnitConfObjDict[procUnitConfObj.getId()] = procUnitConfObj
-                    if self.filename == None:
+                    self.filename = abs_file
-                        self.filename = abs_file
                     return 1
                 def getPlotterQueue(self):
                     return self.__plotterQueue
+                def useExternalPlotManager(self):
+                    plotterList = ['Scope',
+                                   'SpectraPlot', 'RTIPlot',
+                                   'CrossSpectraPlot', 'CoherenceMap',
+                                   'PowerProfilePlot', 'Noise', 'BeaconPhase',
+                                   'CorrelationPlot',
+                                   'SpectraHeisScope','RTIfromSpectraHeis']
+                    for thisPUConfObj in self.procUnitConfObjDict.values():
+                        inputId = thisPUConfObj.getInputId()
+                        if int(inputId) == 0:
+                            continue
+                        for thisOpObj in thisPUConfObj.getOperationObjList():
+                            if thisOpObj.type == "self":
+                                continue
+                            if thisOpObj.name in plotterList:
+                                thisOpObj.type = "plotter"
                 def run(self):
                     print
                 def start(self):
-                    if not self.writeXml():
+                    self.writeXml()
-                        return
                     self.createObjects()
                     self.connectObjects()

schainpy/controller_api.py +3 -4

             class ControllerThread(threading.Thread, Project):
-                def __init__(self, filename=None, plotter_queue=None):
+                def __init__(self, plotter_queue=None):
                     threading.Thread.__init__(self)
-                    Project.__init__(self, filename, plotter_queue)
+                    Project.__init__(self, plotter_queue)
                     self.setDaemon(True)
                     self.control['stop'] = False
                     self.control['pause'] = False
-                    if not self.writeXml(self.filename):
+                    self.writeXml()
-                        return
                     self.createObjects()
                     self.connectObjects()

schainpy/gui/viewcontroller/basicwindow.py +38 -8

             from PyQt4.QtCore          import pyqtSignal
             from PyQt4                 import QtCore
             from PyQt4                 import QtGui
-            # from PyQt4.QtCore          import QThread
-            # from PyQt4.QtCore          import QObject, SIGNAL
+            from propertiesViewModel  import TreeModel, PropertyBuffer
+            from parametersModel import ProjectParms
             from schainpy.gui.viewer.ui_unitprocess import Ui_UnitProcess
             from schainpy.gui.viewer.ui_ftp      import Ui_Ftp
             from schainpy.controller_api import ControllerThread
             from schainpy.controller  import Project
-            from propertiesViewModel  import TreeModel, PropertyBuffer
+            from schainpy.model.graphics.jroplotter import PlotManager
-            from parametersModel import ProjectParms
             from schainpy.gui.figures import tools
             FIGURES_PATH = tools.get_path()
                     self.__puLocalFolder2FTP = {}
                     self.threadStarted = False
+                    self.plotManager = None
             #         self.create_comm()
                     self.create_updating_timer()
                     self.setGUIStatus()
                     self._enable_play_button()
                 def create_updating_timer(self):
                     self.comm_data_timer = QtCore.QTimer(self)
                     self.comm_data_timer.timeout.connect(self.on_comm_updating_timer)
                     self.comm_data_timer.start(1000)
                     if self.controllerThread.isFinished():
                         self.stopProject()
+                        return
+                def use_plotmanager(self, controllerThread):
+                    plotter_queue = Queue(10)
+                    controllerThread.setPlotterQueue(plotter_queue)
+                    controllerThread.useExternalPlotManager()
+                    self.plotManager = PlotManager(plotter_queue)
+                    self.plot_timer = QtCore.QTimer()
+                    self.plot_timer.timeout.connect(self.on_plotmanager_timer)
+                    self.plot_timer.start(10)
+                def on_plotmanager_timer(self):
+                    if not self.plotManager:
+                        return
+                    self.plotManager.run()
                 def playProject(self, ext=".xml", save=1):
                     self._disable_play_button()
                     self.console.clear()
                     self.console.append("Please wait...")
-                    self.controllerThread = ControllerThread(filename)
+                    self.controllerThread = ControllerThread()
                     self.controllerThread.readXml(filename)
+                    self.use_plotmanager(self.controllerThread)
                     self.controllerThread.start()
                     sleep(0.5)
                 def stopProject(self):
-            #         self.commCtrlPThread.cmd_q.put(ProcessCommand(ProcessCommand.STOP, True))
-                    self.controllerThread.stop()
                     self.threadStarted = False
+                    self.controllerThread.stop()
                     while self.controllerThread.isRunning():
+                        self.plotManager.run()
                         sleep(0.5)
+                    if self.plotManager is not None:
+                        self.plotManager.stop()
+                        self.plotManager.close()
+                        self.plotManager = None
                     self._disable_stop_button()
                     self._enable_play_button()

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages