From a1580eb825733ef9c690802a93c151b3611b072e Mon Sep 17 00:00:00 2001
From: Tgui <Tgui@romraider.forum>
Date: Mon, 26 Feb 2007 03:42:21 +0000
Subject: [PATCH] Utec logging back in place

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@540 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
---
 .../logger/utec/comm/SerialParameters.java    |  4 ++--
 .../utec/comm/UtecSerialConnection.java       | 22 ++++++++++++-------
 .../logger/utec/commEvent/CommEvent.java      |  8 +++++++
 .../utec/commInterface/UtecInterface.java     |  4 +++-
 src/enginuity/logger/utec/gui/JutecGUI.java   |  2 ++
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/enginuity/logger/utec/comm/SerialParameters.java b/src/enginuity/logger/utec/comm/SerialParameters.java
index d05e9187..bdb4be98 100755
--- a/src/enginuity/logger/utec/comm/SerialParameters.java
+++ b/src/enginuity/logger/utec/comm/SerialParameters.java
@@ -39,8 +39,8 @@ public class SerialParameters {
     @param portName New port name.
     */
     public void setPortName(String portName) {
-    	//System.out.println("Set portName requested");
-	this.portName = portName;
+    	System.out.println("Set portName chosen: "+portName);
+    	this.portName = portName;
     }
 
     /**
diff --git a/src/enginuity/logger/utec/comm/UtecSerialConnection.java b/src/enginuity/logger/utec/comm/UtecSerialConnection.java
index 2ee5033b..891afa63 100755
--- a/src/enginuity/logger/utec/comm/UtecSerialConnection.java
+++ b/src/enginuity/logger/utec/comm/UtecSerialConnection.java
@@ -230,9 +230,12 @@ public class UtecSerialConnection implements SerialPortEventListener {
 	 */
 	public void openConnection() throws SerialConnectionException {
 		
-		 if(sPort == null){ System.err.println("No port selected or available to open."); return; }
+		// if(sPort == null){ System.err.println("No port selected or available to open."); return; }
 		 
-
+		if(parameters == null){
+			System.err.println("No port selected or available to open."); 
+			return; 
+		}
 		// Obtain a CommPortIdentifier object for the port you want to open.
 		try {
 			// System.out.println("PORT: "+parameters.getPortName());
@@ -240,7 +243,8 @@ public class UtecSerialConnection implements SerialPortEventListener {
 					.getPortName());
 		} catch (NoSuchPortException e) {
 			System.err.println("Can't get commport identifier");
-			throw new SerialConnectionException(e.getMessage());
+			return;
+			//throw new SerialConnectionException(e.getMessage());
 		}
 
 		// Open the port represented by the CommPortIdentifier object. Give
@@ -308,6 +312,7 @@ public class UtecSerialConnection implements SerialPortEventListener {
 		// portId.addPortOwnershipListener(this);
 
 		open = true;
+		System.out.println("Port opened with success.");
 	}
 
 	/**
@@ -508,18 +513,19 @@ public class UtecSerialConnection implements SerialPortEventListener {
 
 			// Logger data
 			else {
-				/*
+				
 				CommEvent commEvent = new CommEvent();
 				commEvent.setLoggerData(new String(inputBuffer));
 				commEvent.setLoggerData(true);
 
 				Iterator portIterator = portListeners.iterator();
 				while (portIterator.hasNext()) {
-					CommListener theListener = (CommListener) portIterator
-							.next();
-					theListener.getCommEvent(commEvent);
+					CommListener theListener = (CommListener) portIterator.next();
+					if(commEvent.isValidData() == true){
+						theListener.getCommEvent(commEvent);
+					}
 				}
-				*/
+				
 				break;
 			}
 
diff --git a/src/enginuity/logger/utec/commEvent/CommEvent.java b/src/enginuity/logger/utec/commEvent/CommEvent.java
index 6a8a2fcf..0246711d 100755
--- a/src/enginuity/logger/utec/commEvent/CommEvent.java
+++ b/src/enginuity/logger/utec/commEvent/CommEvent.java
@@ -28,6 +28,8 @@ public class CommEvent {
 	
 	private UtecMapData mapData = null;
 	
+	private boolean isValidData = true;
+	
 	public void setLoggerData(String buffer){
 		UtecBuffer = buffer;
 		StringTokenizer st = new StringTokenizer(UtecBuffer, ",");
@@ -82,6 +84,7 @@ public class CommEvent {
 				doubleData[i] = Double.parseDouble(theData);
 			}catch (NumberFormatException e) {
 				System.out.println("Number error in commevent.");
+				this.isValidData = false;
 				return;
 	        }
 		}
@@ -147,4 +150,9 @@ public class CommEvent {
 	public void setUtecBuffer(String utecBuffer) {
 		UtecBuffer = utecBuffer;
 	}
+
+
+	public boolean isValidData() {
+		return isValidData;
+	}
 }
diff --git a/src/enginuity/logger/utec/commInterface/UtecInterface.java b/src/enginuity/logger/utec/commInterface/UtecInterface.java
index c217ff42..3e7b556f 100755
--- a/src/enginuity/logger/utec/commInterface/UtecInterface.java
+++ b/src/enginuity/logger/utec/commInterface/UtecInterface.java
@@ -73,11 +73,12 @@ public class UtecInterface{
 		 }
 		 
 		//No port yet chosen
+		 /*
 		if(utecControl.parameters.getPortName().equalsIgnoreCase("")){
 					System.err.println("No Port Yet Chosen, nothing to open");
 					return;
 		}
-	 	
+	 	*/
 	 	//Port is already opened, any port is open
 	 	/*
 	 	if(ISOPEN){
@@ -106,6 +107,7 @@ public class UtecInterface{
 	public static void setPortChoice(String port){
 		utecControl.closeConnection();
 		utecControl.parameters.setPortName(port);
+		openConnection();
 	}
 	
 	/**
diff --git a/src/enginuity/logger/utec/gui/JutecGUI.java b/src/enginuity/logger/utec/gui/JutecGUI.java
index ce8aafe0..e741c351 100755
--- a/src/enginuity/logger/utec/gui/JutecGUI.java
+++ b/src/enginuity/logger/utec/gui/JutecGUI.java
@@ -177,10 +177,12 @@ public class JutecGUI extends JFrame implements ActionListener,GetMapFromUtecLis
 			item.setName(theName);
 			item.addActionListener(this);
 			portsMenu.add(item);
+			/*
 			if (counter == 1) {
 				defaultPort = theName;
 				UtecInterface.setPortChoice(defaultPort);
 			}
+			*/
 		}
 		menuBar.add(portsMenu);