Changeset 5665

Timestamp:

10/09/08 12:12:17 (6 weeks ago)

Author:

will

Message:

Printing of Date-Time field

Location:

branches/ProtocolEditor/src

Files:

• ui/components/AlarmSetter.java (modified) (2 diffs)
• util/DefaultExport.java (modified) (6 diffs)

branches/ProtocolEditor/src/ui/components/AlarmSetter.java

@@ -189 +189 @@
                 }
                 
+                int timeUnit = getTimeUnits(secs);
+                int timeValue = getTimeValue(secs);
+                
+                setTimeUnitChooserIndex(timeUnit);
+                setTimeSpinnerValue(timeValue);
+        }
+        
+        /**
+         * Returns the value needed to describe the alarm seconds in the 
+         * units returned by {@link #getTimeUnits(int)};
+         * eg If alarmSecs = 3600, this method will return 1, and 
+         * {@link #getTimeUnits(int)} will return {@link HOURS};
+         * 
+         * @param alarmSecs             time in seconds
+         * @return int                  see above. 
+         */
+        public static int getTimeValue(int alarmSecs) {
                 int timeUnit;
                 int timeValue;
                 
+                if (alarmSecs == 0) return 0;
+                
                 // need to work out what the units are
                 for (timeUnit = 0; timeUnit<timeUnits.length; timeUnit++) {
-                        timeValue = secs/secondsInTimeUnit[timeUnit];
+                        timeValue = alarmSecs/secondsInTimeUnit[timeUnit];
                         // if timeValue > 0 then this is the units you want
                         if (timeValue > 0) {
                                 
                                 // if it is an exact match 
-                                if (secs == timeValue * secondsInTimeUnit[timeUnit]) {
-                                        setTimeUnitChooserIndex(timeUnit);
-                                        setTimeSpinnerValue(timeValue);
-                                        return;
+                                if (alarmSecs == timeValue * secondsInTimeUnit[timeUnit]) {
+                                        return timeValue;
                                 } else {
                                 
@@ -209 +226 @@
                                         if (timeUnit < timeUnits.length -1) {
                                                 timeUnit++;
-                                                timeValue = secs/secondsInTimeUnit[timeUnit];
-                                                setTimeUnitChooserIndex(timeUnit);
-                                                setTimeSpinnerValue(timeValue);
-                                                return;
+                                                timeValue = alarmSecs/secondsInTimeUnit[timeUnit];
+                                                return timeValue;
                                         }
+                                }
+                        }
+                }
+                return 0;
+        }
+        
+        
+        public static String alarmSecsToString(String alarmSecs) {
+                
+                try {
+                        int secs = Integer.parseInt(alarmSecs);
+                        
+                        boolean alarmBefore = false;
+                        if (secs < 0) {         // alarm before event
+                                alarmBefore = true;
+                                secs = secs * -1;
+                        }
+                        
+                        if (secs == 0) return "No alarm";
+                        
+                        int value = getTimeValue(secs);
+                        String units = "No alarm";
+                        if (getTimeUnits(secs) < timeUnits.length) {
+                                units = timeUnits[getTimeUnits(secs)];
+                        }
+                        
+                        return value + " " + units + (alarmBefore ? " Before" : " After");
+                                         
+                } catch (NumberFormatException ex) {
+                        ex.printStackTrace();
+                        return "";
+                }
+        }
+        
+        
+        /**
+         * Returns the units needed to describe the alarm seconds
+         * {@link DAYS}, {@link HOURS}, or {@link MINS} 
+         * 
+         * @param alarmSecs
+         * @return int  the units index {@link DAYS}, {@link HOURS}, or {@link MINS} 
+         */
+        public static int getTimeUnits(int alarmSecs) {
+                
+                int timeUnit;
+                int timeValue;
+                
+                // need to work out what the units are
+                for (timeUnit = 0; timeUnit<timeUnits.length; timeUnit++) {
+                        timeValue = alarmSecs/secondsInTimeUnit[timeUnit];
+                        // if timeValue > 0 then this is the units you want
+                        if (timeValue > 0) {
                                 
+                                // if it is an exact match 
+                                if (alarmSecs == timeValue * secondsInTimeUnit[timeUnit]) {
+                                        return timeUnit;
+                                } else {
+                                
+                                // if any seconds are left over (eg user sets 90 minutes or 36 hours)
+                                        // try smaller units
+                                        if (timeUnit < timeUnits.length -1) {
+                                                return timeUnit + 1;
+                                        }
                                 }
-                                
                         }
                 }
+                return NO_ALARM;
         }
         

branches/ProtocolEditor/src/util/DefaultExport.java

@@ -1 @@
-package util;
-
-import java.awt.Color;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import tree.DataField;
-import tree.DataFieldConstants;
-import tree.DataFieldNode;
-import tree.IAttributeSaver;
-import ui.formFields.FormField;
 
 /*
@@ -40 +22 @@
  */
 
+package util;
+
+import java.awt.Color;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import tree.DataField;
+import tree.DataFieldConstants;
+import tree.DataFieldNode;
+import tree.IAttributeSaver;
+import ui.components.AlarmSetter;
+import ui.formFields.FormField;
+
 public class DefaultExport 
         implements IExport {
@@ -81 +87 @@
         public String TABLE_DATA_END = "";
         
-        
+        /**
+         * Exports the given dataField nodes as a String. 
+         * This method works by creating a temporary file, delegating the
+         * export to that file, using {@link #export(File, List)} and then 
+         * converting the file to a String. The temp file is deleted before 
+         * returning the String.
+         * 
+         * @param rootNodes             A list of the nodes to export
+         * @return String               A string representation of the export. 
+         */
+        public String exportToString(List<DataFieldNode> rootNodes) 
+        {
+                File tempFile = new File("temp");
+                
+                export(tempFile, rootNodes);
+                
+                StringBuffer fileData = new StringBuffer(1000);
+                BufferedReader reader;
+                try {
+                        reader = new BufferedReader(new FileReader(tempFile));
+                        char[] buf = new char[1024];
+                        int numRead=0;
+                        while((numRead=reader.read(buf)) != -1){
+                                String readData = String.valueOf(buf, 0, numRead);
+                                fileData.append(readData);
+                                buf = new char[1024];
+                        }
+                        reader.close();
+                } catch (FileNotFoundException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                
+                String exportString = fileData.toString();
+                
+                //tempFile.delete();
+                
+                return exportString;
+        }
         
         /**
@@ -98 +145 @@
                 exportPreferences.put(SHOW_URL, true);
                 exportPreferences.put(SHOW_TABLE_DATA, true);
-                exportPreferences.put(SHOW_OTHER_ATTRIBUTES, true);
+                exportPreferences.put(SHOW_OTHER_ATTRIBUTES, false);
                 
                 export(file, rootNodes, exportPreferences);
@@ -214 +261 @@
         else divHeader = DIV;
         
-        if (true) {
-                String colour = dataField.getAttribute(DataFieldConstants.BACKGROUND_COLOUR);
+        String colour = dataField.getAttribute(DataFieldConstants.BACKGROUND_COLOUR);
+        if (colour != null) {
                 Color bgColour = FormField.getColorFromString(colour);
                 if (bgColour != null) {
@@ -250 +297 @@
         outputStream.println(SPAN_END);
                 
+        if (DataFieldConstants.DATE_TIME_FIELD.equals(inputType)) {
+                String date = "Date: ";
+                String UTCmillisecs = dataField.getAttribute(DataFieldConstants.UTC_MILLISECS);
+                        if (UTCmillisecs != null) {
+                                SimpleDateFormat sdf = new SimpleDateFormat("MMM d, yyyy");
+                                date = date + sdf.format(new Long(UTCmillisecs));
+                        } else {
+                                date = date + "none set.";
+                        }
+                        
+                        String time = dataField.getAttribute(DataFieldConstants.SECONDS);
+                        if (time != null) {
+                                SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+                                date = date + " at " + sdf.format(new Long(time + "000")) + ".";
+                        }
+                        
+                        String alarmSecs = dataField.getAttribute(DataFieldConstants.ALARM_SECONDS);
+                        if (alarmSecs != null) {
+                                date = date + " Alarm: " + AlarmSetter.alarmSecsToString(alarmSecs);
+                        }
+                        date = DIV_CLASS_ATTRIBUTE + date + DIV_END;
+                        
+                        outputStream.print(date);
+        }
+        
         if ((showDefaultValues) && (allAttributes.get(DataFieldConstants.DEFAULT) != null)) {
                 outputStream.print(DIV_CLASS_ATTRIBUTE + "Default Value = " +