From c193b27159d8943346bd33982625fe9457c3d9e3 2017-04-24 17:15:30
From: jespinoza <jucar.espinoza@gmail.com>
Date: 2017-04-24 17:15:30
Subject: [PATCH] Merge branch 'schain_mp' of http://10.10.110.76/rhodecode/schain into schain_mp

---

diff --git a/schainpy/ROADMAP.md b/schainpy/ROADMAP.md
new file mode 100644
index 0000000..a808c50
--- /dev/null
+++ b/schainpy/ROADMAP.md
@@ -0,0 +1,11 @@
+## ROADMAP
+## SCHAIN BRANCHES
+
+### BRANCH - SCHAIN_MP
+
+* Revisar si funciona con varios publishers.
+* Revisar xRange y reinicialización de gráfico.
+* Grabar cada spectra independientemente.
+* Agregar kwargs al init
+* Agregar gráficos restantes
+* Presentación
diff --git a/schainpy/model/graphics/jroplot_data.py b/schainpy/model/graphics/jroplot_data.py
index 518a445..df9299d 100644
--- a/schainpy/model/graphics/jroplot_data.py
+++ b/schainpy/model/graphics/jroplot_data.py
@@ -126,8 +126,8 @@ class PlotData(Operation, Process):
                 self.__plot()
 
                 if 'ENDED' in self.data:
-                    #self.setup()
-                    #self.__plot()
+                    # self.setup()
+                    # self.__plot()
                     pass
 
             except zmq.Again as e:
diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py
index 2362475..53d3550 100644
--- a/schainpy/model/proc/jroproc_base.py
+++ b/schainpy/model/proc/jroproc_base.py
@@ -39,6 +39,8 @@ class ProcessingUnit(object):
         self.isConfig = False
 
         self.args = args
+        # if (kwargs):
+        #     self.kwargs = kwargs
         self.kwargs = kwargs
 
     def addOperation(self, opObj, objId):
diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py
index e47fd2f..c47f389 100644
--- a/schainpy/model/utils/jroutils_publish.py
+++ b/schainpy/model/utils/jroutils_publish.py
@@ -363,7 +363,7 @@ class ReceiverData(ProcessingUnit, Process):
             if self.dataOut.finished is True:
                 self.send(self.data)
                 self.connections -= 1
-                if self.connections==0 and self.started:
+                if self.connections == 0 and self.started:
                     self.ended = True
                     self.data['ENDED'] = True
                     self.send(self.data)
diff --git a/schainpy/scripts/julia_mp.py b/schainpy/scripts/julia_mp.py
index 875df5f..160b137 100644
--- a/schainpy/scripts/julia_mp.py
+++ b/schainpy/scripts/julia_mp.py
@@ -13,10 +13,10 @@ def main(date):
 
     controllerObj = Project()
 
-    controllerObj.setup(id = '191', name='test01', description='')
+    controllerObj.setup(id='191', name='test01', description='')
 
     readUnitConfObj = controllerObj.addReadUnit(datatype='Spectra',
-                                                path='/data/workspace/data/zeus/',
+                                                path='/home/nanosat/data/zeus',
                                                 startDate=date,
                                                 endDate=date,
                                                 startTime='00:00:00',
@@ -44,7 +44,7 @@ def main(date):
 #     opObj11.addParameter(name='zmin', value='10', format='int')
 #     opObj11.addParameter(name='zmax', value='35', format='int')
 
-    
+
 
 
     opObj11 = procUnitConfObj1.addOperation(name='PlotRTIData', optype='other')
@@ -66,12 +66,10 @@ def main(date):
     controllerObj.start()
 
 if __name__=='__main__':
-    
+
     dt = datetime(2017, 1, 12)
-    
-    dates = [(dt+timedelta(x)).strftime('%Y/%m/%d')  for x in range(20)]
-    
+
+    dates = [(dt+timedelta(x)).strftime('%Y/%m/%d') for x in range(20)]
+
     p = multiprocessing.Pool(4)
     p.map(main, dates)
-    
-    
\ No newline at end of file
diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py
index 54674b8..02685f0 100644
--- a/schainpy/scripts/receiver.py
+++ b/schainpy/scripts/receiver.py
@@ -12,7 +12,7 @@ if __name__ == '__main__':
     desc = "Segundo Test"
 
     controllerObj = Project()
-    controllerObj.setup(id = '191', name='test01', description=desc)
+    controllerObj.setup(id='191', name='test01', description=desc)
 
     proc1 = controllerObj.addProcUnit(name='ReceiverData')
     # proc1.addParameter(name='server', value='tcp://10.10.10.87:3000', format='str')