Merge pull request #3 from PolygonalTree/master

Pull request to merge pySolo-VIdeo-RpiMod with PySolo-Video

Author: ggilestro

accessories/DesktopApp/receive_stream.py

@@ -36,7 +36,9 @@ def open_with_socket():
     # Connect a client socket to my_server:8000 (change my_server to the
     # hostname of your server)
     client_socket = socket.socket()
+
     client_socket.connect(('192.168.1.201', 8000))
+
     connection = client_socket.makefile('rb')
 
     try:

accessories/__init__.pyc

@@ -0,0 +1 @@
+{"referencePoints": "none", "pointsToTrack": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], "serial": "NO_SERIAL", "ROIS": [[[16, 52], [16, 452], [790, 452], [790, 52]], [[16, 52], [16, 78], [403, 78], [403, 52]], [[16, 78], [16, 104], [403, 104], [403, 78]], [[16, 102], [16, 128], [403, 128], [403, 102]], [[16, 128], [16, 153], [403, 153], [403, 128]], [[16, 153], [16, 179], [403, 179], [403, 153]], [[16, 177], [16, 203], [403, 203], [403, 177]], [[16, 203], [16, 228], [403, 228], [403, 203]], [[16, 227], [16, 252], [403, 252], [403, 227]], [[16, 252], [16, 278], [403, 278], [403, 252]], [[16, 278], [16, 304], [403, 304], [403, 278]], [[16, 302], [16, 328], [403, 328], [403, 302]], [[16, 328], [16, 353], [403, 353], [403, 328]], [[16, 353], [16, 379], [403, 379], [403, 353]], [[16, 377], [16, 403], [403, 403], [403, 377]], [[16, 403], [16, 428], [403, 428], [403, 403]], [[16, 427], [16, 452], [403, 452], [403, 427]], [[403, 52], [403, 78], [790, 78], [790, 52]], [[403, 78], [403, 104], [790, 104], [790, 78]], [[403, 102], [403, 128], [790, 128], [790, 102]], [[403, 128], [403, 153], [790, 153], [790, 128]], [[403, 153], [403, 179], [790, 179], [790, 153]], [[403, 177], [403, 203], [790, 203], [790, 177]], [[403, 203], [403, 228], [790, 228], [790, 203]], [[403, 227], [403, 252], [790, 252], [790, 227]], [[403, 252], [403, 278], [790, 278], [790, 252]], [[403, 278], [403, 304], [790, 304], [790, 278]], [[403, 302], [403, 328], [790, 328], [790, 302]], [[403, 328], [403, 353], [790, 353], [790, 328]], [[403, 353], [403, 379], [790, 379], [790, 353]], [[403, 377], [403, 403], [790, 403], [790, 377]], [[403, 403], [403, 428], [790, 428], [790, 403]], [[403, 427], [403, 452], [790, 452], [790, 427]]]}

accessories/sleepdeprivator/__init__.pyc

@@ -0,0 +1,22 @@
+[Folders]
+data_folder = .
+mask_folder = .
+
+[Recording]
+fps_recording = 15
+fps_preview = 5
+resolution = 1280, 720
+
+[General]
+webcams = 1
+monitors = 1
+
+[Monitor1]
+source = 1
+track = 0
+mask_file = 
+track_type = XY_COORDS
+serial_port = NO SD
+inactivity_threshold = 7
+outputfile = 
+

accessories/sleepdeprivator/damrealtime.pyc

@@ -21,7 +21,7 @@
 #       MA 02110-1301, USA.
 #       
 #     
-"""Version 1.3
+"""Version 1.4
 
 Each Monitor has a camera that can be: realCam || VirtualCamMovies || VirtualCamFrames
 The class Monitor is handling the motion detection and data processing while the class Cam only handles
@@ -191,13 +191,23 @@ def startNetworkStream(self, port=8000):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.bind(('', port))
+<<<<<<< HEAD
+        print ("Live stream socket listening on port {p}...".format(p=port))
+=======
         print "Live stream socket listening on port {p}...".format(p=port)
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.pipe = None
 
         self.socket.listen(5)
 
         self.socket_thread_1 = threading.Thread(target=self.socket_listen)
+<<<<<<< HEAD
+        self.socket_thread_1.daemon=True
         self.socket_thread_2 = threading.Thread(target=self.socket_stream)
+        self.socket_thread_2.daemon=True
+=======
+        self.socket_thread_2 = threading.Thread(target=self.socket_stream)
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.keepSocket = True
 
         self.socket_thread_1.start()

accessories/sleepdeprivator/sleepdeprivator.pyc

@@ -0,0 +1,5 @@
+from subprocess import call
+
+call(["ps axf | grep server.py | grep -v grep | awk '{print \"kill -2 \" $1}' | sh"],shell=True)
+
+call(["python2 server.py"],shell=True)

mask.msk

@@ -1,8 +1,19 @@
 import db
+<<<<<<< HEAD
+import zipfile
+import glob
+from subprocess import call
+=======
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 from bottle import *
 
 from os import path
 import json
+<<<<<<< HEAD
+import zipfile
+import glob
+=======
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 
 os.sys.path.append("..")
 from pvg_headless import pvg_cli
@@ -15,7 +26,11 @@ def __init__(self):
         rois = []
         trackingType = 0
 
+<<<<<<< HEAD
+@app.get('/favicon.ico')
+=======
 @get('/favicon.ico')
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 def get_favicon():
     return server_static(path.join(basedir,'static/img/favicon.ico'))
 
@@ -92,7 +107,11 @@ def starStop():
         db.writeMask(data)
 
         #start a python thread and begins tracking
+<<<<<<< HEAD
+        print ("tracking type", data['trackingType'])
+=======
         print "tracking type", data['trackingType']
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         pysolo_headless.setTracking(track_type=data['trackingType'], mask_file="mask.msk", output_file=outputfile)
         pysolo_headless.startTracking()
 
@@ -150,7 +169,33 @@ def poweroff(machineID):
         if isTracking():
             startStop()
         off = call("poweroff")
+<<<<<<< HEAD
+		
+@app.post('/update')
+def do_update():
+    
+    if isTracking():
+        startStop()
+    #close sockets
+    pysolo_headless.mon.cam.stopNetworkStream()
+    
+    data = request.files.data
+    
+    if data and data.file:
+        filename = data.filename
+        with open(filename,'wb') as open_file:
+            open_file.write(data.file.read())
+        with zipfile.ZipFile(data.filename, "r") as z:
+            z.extractall()
+        for hgx in glob.glob(data.filename):
+            os.remove(hgx)
+    
+    #change this for a service restart:
+    return call(["python3 restartScript.py"],shell=True)
+
+=======
 
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 """helpers methods."""
 
 def isTracking():

pysolo_video.cfg

@@ -396,6 +396,29 @@ app.controller('poweroffCtrl',['$scope', '$http',function($scope,$http){
         }
     };
 }]);
+<<<<<<< HEAD
+app.controller('uploadCtrl',['$scope', '$http',function($scope,$http){
+           $scope.upload = function(){  
+              var ext = $('#data').val().split('.').pop().toLowerCase();
+             
+              if (confirm("WARNING: updating the package will stop tracking. Do you wish to continue?")) {
+                    if($.inArray(ext, ['zip']) == -1) {
+                         alert('File must be in .zip format.');
+                         return false;
+                     } else {
+                         var form_data = new FormData($('#upload-file')[0]);
+                          console.log(form_data);
+                         $http.post("/update", form_data, { headers: {"Content-type"  : "application/x-www-form-urlencoded; charset=utf-8";}}).success(function(data) {
+                                 setTimeout(function() {alert("File uploaded successfully. Please restart tracking.")}, 5000);
+                             });
+                     }
+              } else {
+                 return false;
+              }
+          };
+}]);
+=======
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 
 })(); 
 

pysolovide.zip

@@ -22,7 +22,11 @@
         <link rel="stylesheet" href="static/css/main.css">
 
         <script src="static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
+<<<<<<< HEAD
+	<script></script>
+=======
 
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 
     </head>
     <body ng-app="fly">
@@ -38,7 +42,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
+<<<<<<< HEAD
+          <span class="navbar-brand" >PySolo ControlPanel:</span><a id="machineid" class="navbar-brand" href=""  ng-click="changeName()" data-toggle="tooltip" data-placement="right" title="Click to edit">{{machineId}}</a>
+=======
           <span class="navbar-brand" > PySolo ControlPanel:</span><a id="machineid" class="navbar-brand" href=""  ng-click="changeName()" data-toggle="tooltip" data-placement="right" title="Click to edit">{{machineId}}</a>
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
 
         </div>
         <div class="navbar-collapse collapse">
@@ -50,20 +58,33 @@
               <input type="password" placeholder="Password" class="form-control">
             </div>
             <button type="submit" class="btn btn-success">Sign in</button>
+<<<<<<< HEAD
+=======
             <img src='static/img/logo.png' height=30>
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
           </form>
         </div><!--/.navbar-collapse -->
       </div>
     </div>
 
     <!-- Main jumbotron for a primary marketing message or call to action -->
+<<<<<<< HEAD
+    <div class="jumbotron">
+      <div class="container text-center">
+        <div class="row">
+        <h2>PySolo-Video Browser editor</h2>
+          <div id="ROI-input" class="col-md-12">
+            <canvas id="ROIView" width="500" height="300"></canvas>
+              <!--<canvas id="drawingCanvas" width="500" height="3i00"></canvas>-->
+=======
     <div class="snapshot">
       <div class="container text-center">
         <div class="row">
         <h2>Camera Snapshot</h2>
           <div id="ROI-input" class="col-md-12">
             <canvas id="ROIView" width="500" height="375"></canvas>
               <!--<canvas id="drawingCanvas" width="500" height="300"></canvas>-->
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
          </div>
           </div>
           <div class="row ">
@@ -93,7 +114,11 @@
         <div class="col-md-4">
           <h2>Refresh</h2>
           <p>Click Here to refresh the camera image</p>
+<<<<<<< HEAD
+          <p><button type="submit" id="refreshBackground" class="btn btn-default" href="#" role="button" action="/refresh" method="get">Refresh</button></p>
+=======
           <p><button type="button" id="refreshBackground"class="btn btn-default" href="#" role="button">Refresh</button></p>
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         </div>
 %if status == True:
           <div class="col-md-4">
@@ -203,7 +228,22 @@
       </div>
    </div>
       <hr>
+<<<<<<< HEAD
+
+	<div class = "col-md-12" ng-controller="uploadCtrl">	
+	 <form id="upload-file" method="post" enctype="multipart/form-data">  
+	  <div class="form-group">
+	   <input type="file" name="data" id="data" />
+	    <p class="help-block">Select version to upload.</p>
+	</div>
+	<button  ng-click="upload()" type="button" class="btn btn-default btn-sm" id="upload-file-btn">Submit</button>
+	  </form>
+	 </div>
+	<hr>
+
+=======
 
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
       <footer>
         <p>&copy; Polygonal Tree 2014</p>
       </footer>
@@ -216,6 +256,11 @@
         $('#machineid').tooltip();
             $('#autoMask').tooltip();
         </script>
+<<<<<<< HEAD
+
+	
+=======
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
     </body>
 </html>