Release v.0.9.35

Author: arnebp

README.md

@@ -44,6 +44,11 @@ The complete API specification used by the Java SDK to communicate with the serv
 Changelog
 ----
 
+0.9.35 (2014-05-20)
+
+-	Updated license
+-	Fixed bug related to ICalibrationResultListener
+
 0.9.34 (2014-05-09)
 
 -	Improved documentation

src/com/theeyetribe/client/GazeApiManager.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import java.io.BufferedReader;
@@ -101,6 +109,7 @@ public void requestCalibrationStates()
 				{
 				Protocol.TRACKER_ISCALIBRATED,
 				Protocol.TRACKER_ISCALIBRATING,
+				Protocol.TRACKER_CALIBRATIONRESULT
 				};
 
 		request(gson.toJsonTree(gr, TrackerGetRequest.class).toString());
@@ -237,17 +246,17 @@ public boolean connect(String host, int port)
 			outgoingStreamHandler = new OutgoingStreamHandler();
 			outgoingStreamHandler.start();
 		}
-		catch (IOException ioe)
-		{
-			System.out.println("Unable to open socket. Is EyeTribe Server running? Exception: " + ioe.getLocalizedMessage());
+        catch (IOException ioe)
+        {
+        	System.out.println("Unable to open socket. Is EyeTribe Server running? Exception: " + ioe.getLocalizedMessage());
 
-			//notify connection change
-			if (null != connectionListener)
-				connectionListener.onGazeApiConnectionStateChanged(false);
+            //notify connection change
+            if (null != connectionListener)
+                connectionListener.onGazeApiConnectionStateChanged(false);
 
-			close();
-			return false;
-		}
+            close();
+            return false;
+        }
 		catch (Exception e) 
 		{
 			System.out.println("Exception while establishing socket connection. Is EyeTribe Server running? Exception: " + e.getLocalizedMessage());

src/com/theeyetribe/client/GazeManager.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import java.net.HttpURLConnection;
@@ -133,23 +141,23 @@ public boolean activate(final ApiVersion version, final ClientMode mode, final S
 			//if already running, deactivate before starting anew		
 			if(isActivated())
 				deactivate();
-
+			
 			//lock calling thread while initializing
 			Object threadLock = Thread.currentThread();
-
+			
 			synchronized (threadLock)
 			{
 				synchronized (initializationLock)
 				{
 					if(!isActivated())
 					{
 						isInitializing = true;
-
+						
 						try 
 						{
 							//threadPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 							threadPool = Executors.newCachedThreadPool();
-
+							
 							//make sure we do not init networking on calling thread
 							threadPool.execute(new Runnable() 
 							{
@@ -160,7 +168,7 @@ public void run()
 									{
 										apiManager = new GazeApiManager(GazeManager.this, GazeManager.this);
 										apiManager.connect(hostname, portnumber);
-
+										
 										if(apiManager.isConnected())
 										{
 											apiManager.requestTracker( mode, version);
@@ -173,10 +181,10 @@ public void run()
 									}
 								}
 							});
-
+							
 							//We wait until above requests have been handled by server or timeout occurs
 							initializationLock.wait( INIT_TIME_DELAY_SECONDS * 1000);
-
+							
 							if(!isInitialized)
 							{
 								deactivate();
@@ -186,7 +194,7 @@ public void run()
 							{
 								if(!heartbeatHandler.isAlive())
 									heartbeatHandler.start();
-
+								
 								isActive = true;
 							}
 						}
@@ -198,7 +206,7 @@ public void run()
 					}
 				}
 			}
-
+			
 			return isActivated();
 		}
 	}
@@ -354,17 +362,17 @@ public ClientMode getClientMode()
 	{ 
 		return clientMode;
 	}
-
+	
 	/**
 	 * Initiate a new calibration process. Must be called before any call to {@link #calibrationPointStart(int, int) CalibrationPointStart} 
 	 * or {@link #calibrationPointEnd() calibrationPointEnd}.
-	 * <p>
-	 * Any previous (and possible running) calibration process must be completed or aborted before calling this.
-	 * <p>
-	 * A full calibration process consists of a number of calls to {@link #calibrationPointStart(int, int) calibrationPointStart} and
-	 * {@link #calibrationPointEnd() calibrationPointEnd} matching the total number of calibration points set by the numCalibrationPoints
-	 * parameter.
-	 * 
+     * <p>
+     * Any previous (and possible running) calibration process must be completed or aborted before calling this.
+     * <p>
+     * A full calibration process consists of a number of calls to {@link #calibrationPointStart(int, int) calibrationPointStart} and
+     * {@link #calibrationPointEnd() calibrationPointEnd} matching the total number of calibration points set by the numCalibrationPoints
+     * parameter.
+     * 
 	 * @param numCalibrationPoints The number of calibration points that will be used in this calibration
 	 * @param listener The {@link com.theeyetribe.client.ICalibrationProcessHandler} instance that will receive callbacks during the
 	 * calibration process
@@ -381,14 +389,14 @@ public void calibrationStart(int numCalibrationPoints, ICalibrationProcessHandle
 		else
 			System.out.println("TET Java Client not activated!");
 	}
-
+	
 	/**
 	 * Called for every calibration point during a calibration process. This call should be followed by a call to
 	 * {@link #calibrationPointEnd() calibrationPointEnd} 1-2 seconds later.
 	 * <p>
 	 * The calibration process must be initiated by a call to {@link #calibrationStart(int, ICalibrationProcessHandler) calibrationStart} before
 	 * calling this.
-	 * 
+     * 
 	 * @param x X coordinate of the calibration point
 	 * @param y Y coordinate of the calibration point
 	 */
@@ -406,7 +414,7 @@ public void calibrationPointStart(int x, int y)
 		else
 			System.out.println("TET Java Client not activated!");
 	}
-
+	
 	/**
 	 * Called for every calibration point during a calibration process. This should be called 1-2 seconds after 
 	 * {@link #calibrationPointStart(int, int) calibrationPointStart}.
@@ -545,7 +553,7 @@ public int getNumGazeListeners()
 
 		return -1;
 	}
-
+	
 	/**
 	 * Checks if a given instance of {@link com.theeyetribe.client.IGazeListener} is currently attached.
 	 * 
@@ -807,9 +815,6 @@ public void clearListeners()
 			gazeBroadcaster.stop();
 	}
 
-	long total;
-	long frameCount;
-
 	@Override
 	public void onGazeApiResponse(final String response)
 	{
@@ -827,10 +832,6 @@ public void run()
 					{
 						if(reply.request.compareTo(Protocol.TRACKER_REQUEST_GET) == 0)
 						{
-							frameCount++; 
-
-							long timeStamp = System.currentTimeMillis();
-
 							JsonParser jsonParser = new JsonParser();
 							JsonObject jo = (JsonObject)jsonParser.parse(response);
 							TrackerGetReply tgr = gson.fromJson(jo, TrackerGetReply.class);
@@ -888,15 +889,15 @@ public void run()
 								isCalibrating = tgr.values.isCalibrating;
 							if(null != tgr.values.isCalibrated)
 								isCalibrated = tgr.values.isCalibrated;
-
+							
 							//if defined in json response, then set
 							if (((JsonObject)jo.get(Protocol.KEY_VALUES)).has(Protocol.TRACKER_CALIBRATIONRESULT))
 							{
 								//is calibration result different from current?
 								if(null == lastCalibrationResult || !lastCalibrationResult.equals(tgr.values.calibrationResult) )
 								{
 									lastCalibrationResult = tgr.values.calibrationResult;
-
+									
 									synchronized (calibrationResultListeners) 
 									{
 										for(final ICalibrationResultListener listener : calibrationResultListeners)
@@ -993,8 +994,6 @@ public void run()
 									initializationLock.notify();
 								}
 							}
-
-							total += System.currentTimeMillis() - timeStamp;
 						}
 						else if(reply.request.compareTo(Protocol.TRACKER_REQUEST_SET) == 0)
 						{
@@ -1009,14 +1008,14 @@ else if(reply.category.compareTo(Protocol.CATEGORY_CALIBRATION) == 0)
 
 							if(null != calibrationListener)
 								try 
-							{
-									calibrationListener.onCalibrationStarted();
-							}
-							catch (Exception e) 
-							{
-								System.out.println("Exception while calling ICalibrationProcessHandler.onCalibrationStarted() " +
-										"on listener " + calibrationListener + ": " + e.getLocalizedMessage());
-							}
+								{
+										calibrationListener.onCalibrationStarted();
+								}
+								catch (Exception e) 
+								{
+									System.out.println("Exception while calling ICalibrationProcessHandler.onCalibrationStarted() " +
+											"on listener " + calibrationListener + ": " + e.getLocalizedMessage());
+								}
 						}
 						else if(reply.request.compareTo(Protocol.CALIBRATION_REQUEST_POINTSTART) == 0)
 						{
@@ -1043,14 +1042,14 @@ else if(reply.request.compareTo(Protocol.CALIBRATION_REQUEST_POINTEND) == 0)
 								if (sampledCalibrationPoints == totalCalibrationPoints)
 									//Notify calibration listener that all calibration points have been sampled and the analysis of the calibration results has begun 
 									try
-								{
-										calibrationListener.onCalibrationProcessing();
-								}
-								catch (Exception e)
-								{
-									System.out.println("Exception while calling ICalibrationProcessHandler.OnCalibrationProcessing() on listener " +
-											calibrationListener + ": " + e.getLocalizedMessage());
-								}
+									{
+											calibrationListener.onCalibrationProcessing();
+									}
+									catch (Exception e)
+									{
+										System.out.println("Exception while calling ICalibrationProcessHandler.OnCalibrationProcessing() on listener " +
+												calibrationListener + ": " + e.getLocalizedMessage());
+									}
 							}
 
 							final CalibrationPointEndReply cper = gson.fromJson(response, CalibrationPointEndReply.class);

src/com/theeyetribe/client/GazeUtils.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import com.theeyetribe.client.data.GazeData;
@@ -95,17 +103,17 @@ public static double getEyesDistanceNormalized(Eye leftEye, Eye rightEye)
 		if(null != leftEye && null != rightEye)
 		{
 			double dist = Math.abs(getDistancePoint2D(leftEye.pupilCenterCoordinates, rightEye.pupilCenterCoordinates));
-
+			
 			if (dist < _MinimumEyesDistance)
 				_MinimumEyesDistance = dist;
-
+			
 			if (dist > _MaximumEyesDistance)
 				_MaximumEyesDistance = dist;
-
+			
 			//return normalized
 			return dist / (_MaximumEyesDistance - _MinimumEyesDistance);
 		}
-
+		
 		return -1;
 	}
 
@@ -189,14 +197,14 @@ public static Point2D getNormalizedMapping(Point2D point, int screenWidth, int s
 	{
 		Point2D normMap = getNormalizedCoords(point, screenWidth, screenHeight);
 
-		if (null != normMap)
-		{
-			//scale up and shift
-			normMap.x *= 2f;
-			normMap.x -= 1f;
-			normMap.y *= 2f;
-			normMap.y -= 1f;
-		}
+        if (null != normMap)
+        {
+            //scale up and shift
+            normMap.x *= 2f;
+            normMap.x -= 1f;
+            normMap.y *= 2f;
+            normMap.y -= 1f;
+        }
 
 		return normMap;
 	}

src/com/theeyetribe/client/ICalibrationProcessHandler.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import com.theeyetribe.client.data.CalibrationResult;

src/com/theeyetribe/client/ICalibrationResultListener.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import com.theeyetribe.client.data.CalibrationResult;

src/com/theeyetribe/client/IConnectionStateListener.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 /**

src/com/theeyetribe/client/IGazeListener.java

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013-present, The Eye Tribe. 
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree. 
+ *
+ */
+
 package com.theeyetribe.client;
 
 import com.theeyetribe.client.data.GazeData;