From 416bc181341719ff326a76fd879639882ceb39c9 Mon Sep 17 00:00:00 2001
From: Suyash458 <sne9x@outlook.com>
Date: Sat, 23 Jan 2016 22:43:04 +0530
Subject: [PATCH] Add socket and generic streams

---
 SoftOscilloscope.py | 97 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 17 deletions(-)

diff --git a/SoftOscilloscope.py b/SoftOscilloscope.py
index b8b70d3..c95d0f2 100644
--- a/SoftOscilloscope.py
+++ b/SoftOscilloscope.py
@@ -1,18 +1,80 @@
-import serial, multiprocessing
+import serial, multiprocessing, socket
 import matplotlib.pyplot as plt
 from matplotlib import animation
 import numpy as np
 
 class Oscilloscope(object):
-    def __init__(self, com_port, baud_rate):
-        self.serial_args = (com_port, baud_rate)
-        self.port = None
+    def __init__(self, stream=None):
+        self.stream = None
+        self.stream_type = None
         self.fig = plt.figure()
         self.fig.canvas.mpl_connect('close_event', self.handle_close)
         self.plot_list = []
-        
+        self.stream_is_open = False
+        self.stream_args = None
+            
+    def init_serial(self, com_port, baud_rate):
+        try:
+            self.stream = serial.Serial()
+            self.stream.port = com_port
+            self.stream.baud_rate = baud_rate
+            self.stream_type = 'serial'
+            self.stream_args = (com_port, baud_rate)
+        except SerialException, message:
+            print message
+            return
+            
+    def init_socket(self, address, port):
+        try:
+            self.stream = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            self.stream.connect((address, port))
+            self.settimeout(5)
+            self.stream = self.stream.makefile()
+            self.stream_is_open = True
+            self.stream_type = 'socket'
+            self.stream_args = (address, port)
+        except SocketException, message:
+            print message
+            return
+            
+    def init_stream(self, stream):
+        if hasattr(stream, 'readline'):
+            if hasattr(stream, 'open') or hasattr(stream, 'connect'):
+                self.stream = stream
+                self.stream_type = 'generic'                  
+            else:
+                return
+        else:
+            return
+            
+    def open_stream(self):
+        if self.stream is None:
+            print "Stream not initialized."
+            return
+        if not self.stream_is_open
+            try:
+                if self.stream_type == 'serial':
+                    self.stream.open()
+                elif self.stream_type == 'socket':
+                    self.init_socket()
+                elif self.stream_type == 'generic':
+                    if hasattr(self.stream, 'open'):
+                        self.stream.open()
+                    elif hasattr(self.stream, 'connect'):
+                        self.stream.connect()
+                    else
+                        return
+                 else:
+                    return
+                 self.stream_is_open = True
+            except error, message:
+                print message
+                return
+        else:
+            return
+            
     def plot_init(self):
-        trial_data = self.port.readline().rstrip().split()
+        trial_data = self.stream.readline().rstrip().split()
         for i in xrange(1, len(trial_data) + 1):
             ax = self.fig.add_subplot(len(trial_data), 1, i)
             ax.set_xlim(0, 50, auto=False)
@@ -25,11 +87,11 @@ def plot_init(self):
         return [x[1] for x in self.plot_list]
         
     def plot_animate(self, fn, read_size=1):
-        serial_data = []
+        stream_data = []
         for _ in xrange(read_size):
-            serial_data.append(self.port.readline().rstrip().split())
-        serial_data = np.array(serial_data).T 
-        for data, plot in zip(serial_data, self.plot_list):
+            stream_data.append(self.stream.readline().rstrip().split())
+        stream_data = np.array(stream_data).T 
+        for data, plot in zip(stream_data, self.plot_list):
             try:
                 if(read_size < plot[0].get_ylim()):
                     plot[1]._yorig = np.roll(plot[1]._yorig, -read_size)
@@ -37,8 +99,6 @@ def plot_animate(self, fn, read_size=1):
                 else:
                     plot[1]._yorig = data
                 plot[1]._invalidy = True
-                #plot[0].relim()
-                #plot[0].autoscale()
             except ValueError:
                 pass
         return [x[1] for x in self.plot_list]
@@ -47,13 +107,16 @@ def handle_close(self, evt):
         self.close_stream()
      
     def close_stream(self):
-        self.port.flushInput()
-        self.port.flushOutput()
-        self.port.close()
-        print "Port closed"
+        if hasattr(self.stream, 'flushInput'):
+            self.stream.flushInput()
+        if hasattr(self.stream, 'flushOutput'):
+            self.stream.flushOutput()
+        if hasattr(self.stream, 'close'):
+            self.stream.close()
+            print "stream closed"
           
     def start(self, read_size=1):
-        self.port = serial.Serial(self.serial_args[0], self.serial_args[1])
+        self.open_stream()
         animated_plot = animation.FuncAnimation(
             self.fig, 
             self.plot_animate,