Changeset 7 for trunk/src/org/expeditee/stats

Timestamp:

05/01/08 12:26:53 (16 years ago)

Author:

ra33

Message:

New expeditee version

File:

• trunk/src/org/expeditee/stats/SessionStats.java (modified) (9 diffs)

trunk/src/org/expeditee/stats/SessionStats.java

@@ -16 +16 @@
 public class SessionStats {
 
-        private static final long MILLISECONDS_PER_MINUTE = 6000;
+        private static final long MILLISECONDS_PER_MINUTE = 60000;
 
         private static Date _FrameAccessTime = new Date();
@@ -23 +23 @@
 
         // statistics counters
-        private static final int MOUSE_BUTTONS = 3;
+        private static final int MOUSE_BUTTONS = 4;
 
         private static StringBuffer _FramesEdited = new StringBuffer();
@@ -59 +59 @@
                 stats.append(Logger.EasyDateFormat("ddMMMyyyy")).append("\n");
                 stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
-                stats.append("DarkTime: ").append( new SimpleDateFormat("m").format(_DarkTime) ).append("\n");
+                
+                long elapsedTime = (new Date()).getTime()-_StartTime.getTime();
+                stats.append("DarkTime: ").append(_DarkTime.getTime()/MILLISECONDS_PER_MINUTE).append("-->" + 
+                                _DarkTime.getTime() * 100 / elapsedTime + "%\n");
                 
                 stats.append(getFrameStats());
@@ -74 +77 @@
                 SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
                 Date currentTime = new Date();
-                Time elapsedTime = new Time(currentTime.getTime()-_StartTime.getTime());
+                long elapsedTime = currentTime.getTime()-_StartTime.getTime();
                 String time = formatter.format(_StartTime);
                 time += " --> " + formatter.format(currentTime);
-                time += " = " + (new SimpleDateFormat("m").format(elapsedTime));
+                time += " = " + (int)(elapsedTime / MILLISECONDS_PER_MINUTE);   //(new SimpleDateFormat("m").format(elapsedTime));
 
                 return time;
@@ -109 +112 @@
         }
 
-        private static int getMinutesUsed() {
+        private static double getMinutesUsed() {
                 long elapsedTime = new Date().getTime() - _StartTime.getTime() - _DarkTime.getTime();
                 
-                return (int) (elapsedTime / MILLISECONDS_PER_MINUTE);
+                return (double) elapsedTime / MILLISECONDS_PER_MINUTE;
         }
 
@@ -145 +148 @@
                 appendStat(stats, "Frames", _CreatedFrames);
                 appendStat(stats, "Escape", _EscapeCount);
-                appendStat(stats, "Left", _MouseCounters[MouseEvent.BUTTON1 - 1]);
-                appendStat(stats, "Middle", _MouseCounters[MouseEvent.BUTTON2 - 1]);
-                appendStat(stats, "Right", _MouseCounters[MouseEvent.BUTTON3 - 1]);
+                appendStat(stats, "Left", _MouseCounters[MouseEvent.BUTTON1]);
+                appendStat(stats, "Middle", _MouseCounters[MouseEvent.BUTTON2]);
+                appendStat(stats, "Right", _MouseCounters[MouseEvent.BUTTON3]);
 
                 return stats.toString();
@@ -169 +172 @@
                         value = 0;
 
-                int perHour = value * 60 / Math.max(1, getMinutesUsed());
+                int perHour = (int)(value * 60 / getMinutesUsed());
 
                 stats.append(value).append(" ").append(name).append(" @ ").append(perHour).append("/hour");
@@ -262 +265 @@
         public static void MouseClicked(int button) {
                 UserEvent();
-                _MouseCounters[button - 1]++;
+                _MouseCounters[button]++;
         }
 
@@ -277 +280 @@
                 return _FramesEdited.toString();
         }
+
+        public static StringBuffer getShortStats() {
+                StringBuffer sb = new StringBuffer();
+                sb.append("FramesA:").append(_AccessedFrames);
+                sb.append(", FramesE:").append(_SavedFrames);
+                sb.append(", ").append(getResponseStats());
+                return sb;
+        }
 }