add error if the rois is empty when start is clicked

Author: PolygonalTree

DesktopApp/desktopApp.py

@@ -1,6 +1,6 @@
 import urllib.request as urllib
 import urllib.parse as parse
-import sys, time, subprocess, paramiko
+import sys, time, subprocess
 import view, socket, webbrowser
 import threading
 from PySide import QtCore, QtGui
@@ -73,7 +73,7 @@ class ControlMainWindow(QtGui.QMainWindow):
 
     autosave = AutoSaveData()
 
-    def __init__(self, parent=None):
+    def __init__(self, localIp,parent=None):
         super(ControlMainWindow, self).__init__(parent)
         self.ui = view.Ui_MainWindow()
         self.ui.setupUi(self)
@@ -167,13 +167,17 @@ def askPiId(device, port):
     piId=f.read()
     return piId
 
-        
-
-            
-   
-if __name__ == "__main__":
+    
+def main():
     localIp = socket.gethostbyname(str(socket.gethostname())).split('.')
     app = QtGui.QApplication(sys.argv)
-    mySW = ControlMainWindow()
+    mySW = ControlMainWindow(localIp)
     mySW.show()
     sys.exit(app.exec_())
+
+            
+   
+if __name__ == "__main__":
+    main()
+
+

server.py

@@ -1,15 +1,16 @@
-import bottle
 from bottle import *
 
 import db
 from subprocess import Popen, PIPE, call
-import os, signal, time, json
+from os import path, kill
+from signal import SIGTERM
+import json
 
-basedir=os.path.dirname(__file__)
+basedir=path.dirname(__file__)
 
 app = Bottle()
 
-outputfile = os.path.join(basedir,"output.txt")
+outputfile = path.join(basedir,"output.txt")
 
 
 class RoiData():
@@ -20,18 +21,17 @@ def __init__(self):
 
 @app.route('/static/<filepath:path>')
 def server_static(filepath):
-    return static_file(filepath, root=os.path.join(basedir,"static"))
+    return static_file(filepath, root=path.join(basedir,"static"))
 
 @app.route('/')
 def index():
-    print(os.path.dirname(__file__))
     mid= checkMachineId()
     _,status = checkPid()
     df = subprocess.Popen(["df", "./"], stdout=subprocess.PIPE)
     output = df.communicate()[0]
     device, size, used, available, percent, mountpoint = \
                                                    output.split(b"\n")[1].split()
-    return template(os.path.join(basedir+"/views","index.tpl"), machineId=mid, status=status, freeSpace = percent)
+    return template(path.join(basedir+"/views","index.tpl"), machineId=mid, status=status, freeSpace = percent)
 
 @app.route('/websocket')
 def handle_websocket():
@@ -74,9 +74,7 @@ def list_roi():
 @app.post('/changeMachineId')
 def changeMachineId():
     try:
-        print("changing name")
         name = request.json
-        print(name)
         changeMId(name['newName'])
         return(name['newName'])
     except:
@@ -89,27 +87,26 @@ def starStop():
     try:
         data = request.json
         t = data['time']
-        print(t)
         #set time, given in miliseconds from javascript, used in seconds for date
         setTime = call(['date', '-s', '@'+str(t)[:-3]])
     except:
         print ("no data")
     pid, isAlreadyRunning = checkPid()
 
     if isAlreadyRunning:
-        os.kill(pid,signal.SIGTERM)
+        kill(pid,SIGTERM)
     else:
         db.writeMask(data)
         #f = open('mask.msk','wb')
         #pickle.dump(data['roi'], f)
         #f.close()
-        pySolo = Popen(["python2",os.path.join(basedir,"pvg_standalone.py"), 
-                        "-c", os.path.join(basedir,"pysolo_video.cfg"),
+        pySolo = Popen(["python2",path.join(basedir,"pvg_standalone.py"), 
+                        "-c", path.join(basedir,"pysolo_video.cfg"),
                         "-i","0",
                         "-k", "mask.msk",
                         "-t", str(data['trackingType']),
                         "-o", outputfile,
-                        "--showmask",
+                        "--showmask",#useful?
                         "--trackonly"])
 
         #pySolo = Popen(["python2", "pvg.py"])# -c pysolo_video.cfg -i 0 -k mask.msk -t 0 -o output.txt", shell=True)
@@ -123,11 +120,12 @@ def state():
 def refresh():
     pid, isAlreadyRunning = checkPid()
     if isAlreadyRunning:
-        #add a call to a function to update snapshot
+        #add a call to a function to update snapshot when trackingType
+        #for now, do nothing
         pass 
     else:
-        pySolo = call(["python2",os.path.join(basedir,"pvg_standalone.py"), 
-                        "-c", os.path.join(basedir,"pysolo_video.cfg"),
+        pySolo = call(["python2",path.join(basedir,"pvg_standalone.py"), 
+                        "-c", path.join(basedir,"pysolo_video.cfg"),
                         "-i","0",
                         "--snapshot",])
     redirect("/")
@@ -140,8 +138,8 @@ def downloadData(machineID):
     pid, isAlreadyRunning = checkPid()
     mid = checkMachineId()
     if mid == machineID:
-        #Add a "last downloaded" and "free space available"
-        return static_file(outputfile, root='')
+        #TODO:Add a "last downloaded"
+        return static_file(outputfile, root='/', download=outputfile)
     else:
         redirect("/")
 
@@ -185,7 +183,7 @@ def poweroff(machineID):
 
 def checkPid():
     proc = Popen(["pgrep", "-f", 
-                  "python2 "+os.path.join(basedir,"pvg_standalone.py")]
+                  "python2 "+path.join(basedir,"pvg_standalone.py")]
                  , stdout=PIPE)
     try:
         pid=int(proc.stdout.readline())
@@ -197,13 +195,13 @@ def checkPid():
     return pid, started
 
 def changeMId(name):
-    f = open(os.path.join(basedir,'machineId'),'w')
+    f = open(path.join(basedir,'machineId'),'w')
     piId = f.write(name)
     f.close()
     return True
 
 def checkMachineId():
-    f = open(os.path.join(basedir,'machineId'),'r')
+    f = open(path.join(basedir,'machineId'),'r')
     piId = f.read().rstrip()
     f.close()
     return piId
@@ -217,7 +215,7 @@ def readData():
         lastData = lines[-1]
         splitedData = lastData.split('\t')
         jsonData = json.dumps(splitedData)
-        print (jsonData)
+        #print (jsonData)
     return jsonData
 
 """The main program"""    

static/js/main.js

@@ -300,15 +300,21 @@ function ev_start(){
     var tracking = $('input[name=optionTrack]:checked').val();
     var d = new Date();
     var t = d.getTime();
-    var data = JSON.stringify({time:t,trackingType:tracking,roi:RoiObj}); 
-    var oReq = new XMLHttpRequest();
-    oReq.open("put", "/started", false);
-    oReq.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    oReq.send(data);
-    console.log("start");
-    console.log(t);
-    console.log(data);
-    location.reload();
+    if (RoiObj.rois.length<1){
+        alert("There is no ROI selected. You can't start tracking.");
+    }else if (typeof tracking == 'undefined'){
+        alert("There is no tracking type selected. You can't start tracking.");
+    }else{
+        var data = JSON.stringify({time:t,trackingType:tracking,roi:RoiObj}); 
+        var oReq = new XMLHttpRequest();
+        oReq.open("put", "/started", false);
+        oReq.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+        oReq.send(data);
+        console.log("start");
+        console.log(t);
+        console.log(data);
+        location.reload();
+    }
 
 }
 /// Stop

views/index.tpl

@@ -113,12 +113,12 @@
               <div class="track-select">
                 <div class="input-group"><label>
                     <input type="radio" name="optionTrack" id="optionTrack0" value="0">
-                    Position</label>
+                    Virtual Beam</label>
 
                 </div>
                 <div class="input-group ">
                     <input type="radio" name="optionTrack" id="optionTrack1" value="1">
-                    <label>Distance</label>
+                    <label>Distance Walked</label>
                 </div>
                 <div class="input-group">
                     <input type="radio" name="optionTrack" id="optionTrack2" value="2">