Merge branch 'master' of https://github.com/arnefmeyer/plugin-GUI

Author: jonaskn

Resources/Python/record_control_example_client.py

@@ -37,32 +37,43 @@ def run_client():
             socket.RCVTIMEO = int(timeout * 1000)  # timeout in milliseconds
             socket.connect(url)
 
-            # Finally, start data acquisition
+            # Start data acquisition
             socket.send('StartAcquisition')
-            answer = socket.recv()
-            print answer
+            print socket.recv()
             time.sleep(5)
 
+            socket.send('IsAcquiring')
+            print "IsAcquiring:", socket.recv()
+            print ""
+
             for start_cmd in commands:
 
                 for cmd in [start_cmd, stop_cmd]:
                     socket.send(cmd)
-                    answer = socket.recv()
-                    print answer
+                    print socket.recv()
 
                     if 'StartRecord' in cmd:
                         # Record data for 5 seconds
+                        socket.send('IsRecording')
+                        print "IsRecording:", socket.recv()
+
+                        socket.send('GetRecordingPath')
+                        print "Recording path:", socket.recv()
+
                         time.sleep(5)
                     else:
                         # Stop for 1 second
+                        socket.send('IsRecording')
+                        print "IsRecording:", socket.recv()
                         time.sleep(1)
 
-            # Finally, stop data acquisition; it might be a good idea to 
+                print ""
+
+            # Finally, stop data acquisition; it might be a good idea to
             # wait a little bit until all data have been written to hard drive
             time.sleep(0.5)
             socket.send('StopAcquisition')
-            answer = socket.recv()
-            print answer
+            print socket.recv()
 
 
 if __name__ == '__main__':

Source/Plugins/NetworkEvents/NetworkEvents.cpp

@@ -479,6 +479,22 @@ String NetworkEvents::handleSpecialMessages(StringTS msg)
 			return String("StoppedRecording");
 		}
 	}
+	else if (cmd.compareIgnoreCase("IsAcquiring") == 0)
+	{
+		String status = CoreServices::getAcquisitionStatus() ? String("1") : String("0");
+		return status;
+	}
+	else if (cmd.compareIgnoreCase("IsRecording") == 0)
+	{
+		String status = CoreServices::getRecordingStatus() ? String("1") : String("0");
+		return status;
+	}
+	else if (cmd.compareIgnoreCase("GetRecordingPath") == 0)
+	{
+		File file = CoreServices::RecordNode::getRecordingPath();
+		String msg(file.getFullPathName());
+		return msg;
+	}
 	else
 	{
 	    return String("NotHandled");