schain-jc Commit - r939:09d2a48bbf67

schaincli/schaincli/__init__.py created 644 0 0

NO CONTENT: new file 100644

schainpy/project.py created 644 +34 0

@@ -0,0 +1,34
	1	from schainpy.controller import Project
	2
	3	desc = "A schain project"
	4
	5	controller = Project()
	6	controller.setup(id='191', name="project", description=desc)
	7
	8	readUnitConf = controller.addReadUnit(datatype='VoltageReader',
	9	path="/home/nanosat/schain/schainpy",
	10	startDate="1970/01/01",
	11	endDate="2017/12/31",
	12	startTime="00:00:00",
	13	endTime="23:59:59",
	14	online=0,
	15	verbose=1,
	16	walk=1,
	17	)
	18
	19	procUnitConf1 = controller.addProcUnit(datatype='VoltageProc', inputId=readUnitConf.getId())
	20
	21	opObj11 = procUnitConf1.addOperation(name='ProfileSelector', optype='other')
	22	opObj11.addParameter(name='profileRangeList', value='120,183', format='intlist')
	23
	24	opObj11 = procUnitConf1.addOperation(name='RTIPlot', optype='other')
	25	opObj11.addParameter(name='wintitle', value='Jicamarca Radio Observatory', format='str')
	26	opObj11.addParameter(name='showprofile', value='0', format='int')
	27	opObj11.addParameter(name='xmin', value='0', format='int')
	28	opObj11.addParameter(name='xmax', value='24', format='int')
	29	opObj11.addParameter(name='figpath', value="/home/nanosat/schain/schainpy/figs", format='str')
	30	opObj11.addParameter(name='wr_period', value='5', format='int')
	31	opObj11.addParameter(name='exp_code', value='22', format='int')
	32
	33
	34	controller.start()

schainpy/utils/__init__.py created 644 0 0

NO CONTENT: new file 100644

schainpy/utils/colors.py created 644 +2 0

@@ -0,0 +1,2
	1	def log():
	2	pass

schaincli/.gitignore ~~schain-cli/.gitignore~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/.gitignore to schaincli/.gitignore

schaincli/README.md ~~schain-cli/README.md~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/README.md to schaincli/README.md

schaincli/__init__.py ~~schain-cli/schaincli/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/schaincli/__init__.py to schaincli/__init__.py

schaincli/asdasd.py ~~schain-cli/asdasd.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/asdasd.py to schaincli/asdasd.py

schaincli/schain.xml ~~schain-cli/schain.xml~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/schain.xml to schaincli/schain.xml

schaincli/schaincli/cli.py ~~schain-cli/schaincli/cli.py~~ renamed +24 -3

             import schainpy
             import subprocess
             from multiprocessing import cpu_count
-            from schaincli import templates
+            from schaincli.schaincli import templates
+            from schainpy import controller_api
             import os
             import sys
             import glob
             def main(command, nextcommand, version, xml):
                 """COMMAND LINE INTERFACE FOR SIGNAL CHAIN - JICAMARCA RADIO OBSERVATORY"""
                 if xml is not None:
-                    subprocess.call(['schain --file=' + xml], shell=True)
+                    runFromXML(xml)
                 elif command == 'generate':
                     generate()
                 elif command == 'test':
                 else:
                     click.echo('\x1b[6;37;41m[ERROR] - Command is not defined.\x1b[0m')
             def basicInputs():
                 inputs = {}
                 inputs['desc'] = click.prompt('Enter a description', default="A schain project", type=str)
                 inputs['figpath'] = inputs['path'] + '/figs'
                 return inputs
             def generate():
                 inputs = basicInputs()
                 inputs['multiprocess'] = click.confirm('Is this a multiprocess script?')
             def test():
-                print templates.basic.format(name='hola', desc= 'desc', path='path', startDate='0', endDate='0')
+                print templates.basic.format(name='hola', desc='desc', path='path', startDate='0', endDate='0')
                 click.echo('testing')
+            def runFromXML(filename):
+                controller = controller_api.ControllerThread()
+                if not controller.readXml(filename):
+                    return
+                plotterObj = controller.useExternalPlotter()
+                controller.start()
+                plotterObj.start()
+                print "Finishing all processes ..."
+                controller.join(5)
+                print "End of script"
+                return

schaincli/schaincli/templates.py ~~schain-cli/schaincli/templates.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/schaincli/templates.py to schaincli/schaincli/templates.py

schaincli/setup.cfg ~~schain-cli/setup.cfg~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/setup.cfg to schaincli/setup.cfg

schaincli/setup.py ~~schain-cli/setup.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/setup.py to schaincli/setup.py

schaincli/tests/__init__.py ~~schain-cli/tests/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/tests/__init__.py to schaincli/tests/__init__.py

schaincli/tests/test_cli.py ~~schain-cli/tests/test_cli.py~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/tests/test_cli.py to schaincli/tests/test_cli.py

schaincli/tox.ini ~~schain-cli/tox.ini~~ renamed 0 0

NO CONTENT: file renamed from schain-cli/tox.ini to schaincli/tox.ini

schainpy/controller.py +2 -2

                     print "Process finished"
-                def start(self):
+                def start(self, filename=None):
-                    self.writeXml()
+                    self.writeXml(filename)
                     self.createObjects()
                     self.connectObjects()
                     self.run()

setup.py +6 -2

                                   'schainpy.gui.figures': ['*.png','*.jpg'],
                                   },
                     include_package_data=False,
-                    scripts =['schainpy/gui/schainGUI',
+                    entry_points={
-                              'schainpy/scripts/schain'],
+                        'console_scripts': [
+                            'schain = schaincli.schaincli.cli:main',
+                        ],
+                    },
+                    scripts =['schainpy/gui/schainGUI'],
                     ext_modules=[Extension("cSchain", ["schainpy/model/proc/extensions.c"])],
                     install_requires=[
                                       "scipy >= 0.14.0",

	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