Changeset 113

Timestamp:

02/05/09 12:03:32 (16 months ago)

Author:

czue

Message:

move the legend axis off center and add the click event to turn on the tooltip. This is not that smooth in execution and we may just want to turn it off.

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• assets/flot/html/basechart.html (modified) (2 diffs)
• src/org/rapidandroid/activity/chart/form/FormDataBroker.java (modified) (3 diffs)

trunk/rapidandroid/org.rapidandroid/assets/flot/html/basechart.html

@@ -10 +10 @@
     
     <script id="source" language="javascript" type="text/javascript">
+    
+     function showTooltip(x, y, contents) {
+        $('<div id="tooltip">' + contents + '</div>').css( {
+            position: 'absolute',
+            display: 'none',
+            top: y + 5,
+            left: x + 5,
+            border: '1px solid #fdd',
+            padding: '2px',
+            'background-color': '#fee',
+            opacity: 0.80
+        }).appendTo("body").fadeIn(200);
+    }
+
+    
 function load(){
         //document.getElementById('graphtitle').innerHTML = window.graphdata.getGraphTitle("wassup", 5);
@@ -22 +37 @@
 }
 function GotGraph(gData, gOptions) {    
+    $("#tooltip").remove();
+            
         $.plot($("#placeholder"), gData, gOptions);
+        $("#placeholder").bind("plotclick", function (event, pos, item) {
+        if (item) {
+            $("#tooltip").remove();
+            var y = item.datapoint[1].toFixed(0);
+            showTooltip(item.pageX, item.pageY,
+                                item.series.label + " = " + y);
+       }
+    });
+        
         window.graphdata.finishGraph();
         }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/chart/form/FormDataBroker.java

@@ -394 +394 @@
                         toReturn.put("legend", getShowTrue());
                 } 
+                toReturn.put("grid", getJSONObject("clickable", false));
                 return toReturn;
         }
@@ -408 +409 @@
                 JSONObject toReturn = new JSONObject();
                 toReturn.put("xaxis", this.getXaxisOptions(labels));
+                toReturn.put("grid", getJSONObject("clickable", true));
+                return toReturn;
+        }
+
+        private JSONObject getJSONObject(String string, Object o) {
+                JSONObject toReturn = new JSONObject();
+                try {
+                        toReturn.put(string, o);
+                } catch (Exception ex) {
+                }
                 return toReturn;
         }
@@ -440 +451 @@
 
                 try {
+                        rootxaxis.put("min", 0);
+                        rootxaxis.put("max", tickvalues.length + tickvalues.length / 5 + 1);
                         rootxaxis.put("ticks", arr);
                         rootxaxis.put("tickFormatter", "string");