Changeset 102

Timestamp:

02/03/09 18:48:27 (5 months ago)

Author:

czue

Message:

Updating the graphing module to be separated out by the data and options so we have more control over the plots. Updated the graph that plots a numeric field over time to display dates properly on the x-axis, and updated the histogram to be color-coded, have proper labels, and include a legend.

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• assets/flot/html/basechart.html (modified) (1 diff)
• res/layout/tablerow.xml (modified) (1 diff)
• src/org/rapidandroid/activity/chart/JSONGraphData.java (added)
• src/org/rapidandroid/activity/chart/form/FormDataBroker.java (modified) (11 diffs)

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

@@ -21 +21 @@
         graphObj.style.height = gheight;        
 }
-function GotGraph(gdata) {      
-        $.plot($("#placeholder"), gdata);
+function GotGraph(gData, gOptions) {    
+        $.plot($("#placeholder"), gData, gOptions);
         window.graphdata.finishGraph();
         }

trunk/rapidandroid/org.rapidandroid/res/layout/tablerow.xml

@@ -5 +5 @@
         <TableRow android:id="@+id/TableRow01" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <TextView android:id="@+id/TextView01" android:layout_height="wrap_content" android:text="asdfdasfasfaffdffdfdaadsf" android:layout_weight="1" android:layout_gravity="left"></TextView>
-                        <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:text="qwerqwrqrqrqr" android:layout_weight="1"></TextView>
-                        <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:text="ZXCZXCczCczcCZCC" android:layout_weight="1"></TextView>
-                        <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:text="rutyututuytu" android:layout_weight="1"></TextView>
-                        <TextView android:id="@+id/TextView01" android:layout_height="wrap_content" android:text="fghjfjfjfhjfj" android:layout_weight="1"></TextView>
-                        <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:layout_weight="1" android:text="2345235235243535"></TextView>
+                <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
+                          android:layout_height="wrap_content" android:text="qwerqwrqrqrqr" android:layout_weight="1"></TextView>
+                <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
+                          android:layout_height="wrap_content" android:text="ZXCZXCczCczcCZCC" android:layout_weight="1"></TextView>
+                <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
+                          android:layout_height="wrap_content" android:text="rutyututuytu" android:layout_weight="1"></TextView>
+                <TextView android:id="@+id/TextView01" android:layout_height="wrap_content" android:text="fghjfjfjfhjfj" android:layout_weight="1"></TextView>
+                <TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
+                  android:layout_height="wrap_content" android:layout_weight="1" android:text="2345235235243535"></TextView>
         </TableRow>
 </TableLayout>

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

@@ -6 +6 @@
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.rapidandroid.activity.chart.IChartBroker;
+import org.rapidandroid.activity.chart.JSONGraphData;
 import org.rapidandroid.data.RapidSmsDBConstants;
 import org.rapidandroid.data.SmsDbHelper;
@@ -76 +78 @@
                 height = height - 50;
 
-                JSONArray arr = new JSONArray();
-
+                JSONArray data = getEmptyData();
+                JSONObject options = new JSONObject();
+                JSONGraphData allData  = null;
                 if (fieldToPlot == null) {
                         //we're going to do all messages over timereturn;
-                        arr.put(loadMessageOverTimeHistogram());
+                        allData = loadMessageOverTimeHistogram();
                 } else if (fieldToPlot.getFieldType().getItemType().equals("word")) {
-                        arr.put(loadHistogramFromField());
+                        allData = loadHistogramFromField(); 
                 } else {
-                        arr.put(loadNumericLine());
-                }
-
+                        allData = loadNumericLine(); 
+                        //data.put(loadNumericLine());
+                }
+                if (allData != null) {
+                        data = allData.getData();
+                        options = allData.getOptions();
+                } 
+                System.out.println(data.toString());
+                System.out.println(options.toString());
+                
                 mAppView.loadUrl("javascript:SetGraph(\"" + width + "px\", \"" + height
                                 + "px\")");
-                mAppView.loadUrl("javascript:GotGraph(" + arr.toString() + ")");
-        }
-
-        private JSONObject loadNumericLine() {
+                mAppView.loadUrl("javascript:GotGraph(" + data.toString() + "," + options.toString() + ")");
+        }
+
+        
+        private JSONGraphData loadNumericLine() {
                 JSONObject result = new JSONObject();
                 SQLiteDatabase db = rawDB.getReadableDatabase();
@@ -124 +135 @@
                 if (barCount == 0) {
                         cr.close();
-                        return result;
                 } else {
                         Date[] xVals = new Date[barCount];
@@ -144 +154 @@
 
                         try {
-                                result.put("label", fieldToPlot.getName());
-                                result.put("data", prepareDateData(xVals, yVals));
-                                result.put("label", fieldToPlot.getName());
-                                result.put("lines", getShowTrue());
-                                result.put("points", getShowTrue());
-                                result.put("xaxis", getDateOptions());
+//                              result.put("label", fieldToPlot.getName());
+//                              result.put("data", prepareDateData(xVals, yVals));
+//                              result.put("label", fieldToPlot.getName());
+//                              result.put("lines", getShowTrue());
+//                              result.put("points", getShowTrue());
+//                              result.put("xaxis", getDateOptions());
+                                return new JSONGraphData(prepareDateData(xVals, yVals),loadOptionsForDateGraph(xVals) );
                         } catch (Exception ex) {
 
                         }
-                        cr.close();
-                        return result;
-                }
-
+                        finally {
+                                if (!cr.isClosed()) {
+                                        cr.close();
+                                }
+                        }
+                        
+                }
+                // either there was no data or something bad happened
+                return new JSONGraphData(getEmptyData(), new JSONObject());     
+        }
+
+        
+        private JSONArray getEmptyData() {
+                JSONArray toReturn = new JSONArray();
+                JSONArray innerArray = new JSONArray();
+                innerArray.put(0);
+                innerArray.put(0);
+                toReturn.put(innerArray);
+                return toReturn;
         }
 
@@ -171 +197 @@
 
         private JSONArray prepareDateData(Date[] xvals, int[] yvals) {
-                JSONArray arr = new JSONArray();
+                JSONArray outerArray = new JSONArray();
+                JSONArray innerArray = new JSONArray();
                 int datalen = xvals.length;
                 for (int i = 0; i < datalen; i++) {
@@ -177 +204 @@
                         elem.put(xvals[i].getTime());
                         elem.put(yvals[i]);
-                        arr.put(elem);
-                }
-                return arr;
-        }
-        
-        private JSONObject loadMessageOverTimeHistogram() {
-                JSONObject result = new JSONObject();
+                        innerArray.put(elem);
+                }
+                outerArray.put(innerArray);
+                return outerArray;
+        }
+        
+        private JSONGraphData loadMessageOverTimeHistogram() {
                 SQLiteDatabase db = rawDB.getReadableDatabase();
                 Calendar startCal = Calendar.getInstance();
@@ -246 +273 @@
                 if (barCount == 0) {
                         cr.close();
-                        return result;
                 } else {
                         String[] xVals = new String[barCount];
@@ -259 +285 @@
 
                         try {
+                                //result.put("label", fieldToPlot.getName());
+                                //result.put("data", prepareData(xVals, yVals));
+                                //result.put("bars", getShowTrue());
+                                //result.put("xaxis", getXaxisOptions(xVals));
+                                // todo 
+                                JSONObject result = new JSONObject();
+                                //return new JSONGraphData(prepareHistogramData(xVals, yVals),loadOptionsForHistogram(xVals) );
+                                
                                 result.put("label", legend);
                                 result.put("data", prepareData(yVals));
@@ -264 +298 @@
                                 result.put("points", getShowFalse());
                                 result.put("xaxis", getXaxisOptions(xVals));
+                                JSONArray values = new JSONArray();
+                                values.put(result);
+                                return new JSONGraphData(values, new JSONObject());
 
                         } catch (Exception ex) {
 
+                        } finally {
+                                if (!cr.isClosed()) {
+                                        cr.close();
+                                }
                         }
-                        cr.close();
-                        return result;
-                }
-
-        }
-        
-
-        private JSONObject loadHistogramFromField() {
-                JSONObject result = new JSONObject();
+                }
+                // either there was no data or something bad happened
+                return new JSONGraphData(getEmptyData(), new JSONObject());     
+        }
+        
+
+        /**
+         * Should return a two element array - the first element is the data, 
+         * the second are the options
+         * @return
+         */
+        private JSONGraphData loadHistogramFromField() {
+                //JSONObject result = new JSONObject();
                 SQLiteDatabase db = rawDB.getReadableDatabase();
 
@@ -307 +352 @@
                 int barCount = cr.getCount();
 
-                if (barCount == 0) {
-                        return result;
-                } else {
+                if (barCount != 0) {
                         String[] xVals = new String[barCount];
                         int[] yVals = new int[barCount];
@@ -324 +367 @@
 
                         try {
-                                result.put("label", fieldToPlot.getName());
-                                result.put("data", prepareData(yVals));
-                                result.put("bars", getShowTrue());
-                                result.put("xaxis", getXaxisOptions(xVals));
-
+                                //result.put("label", fieldToPlot.getName());
+                                //result.put("data", prepareData(xVals, yVals));
+                                //result.put("bars", getShowTrue());
+                                //result.put("xaxis", getXaxisOptions(xVals));
+                                return new JSONGraphData(prepareHistogramData(xVals, yVals),loadOptionsForHistogram(xVals) );
                         } catch (Exception ex) {
 
+                        } finally {
+                                if (!cr.isClosed()) {
+                                        cr.close();
+                                }
                         }
-                        cr.close();
-                        return result;
-                }
-
+                }
+                // either there was no data or something bad happened
+                return new JSONGraphData(getEmptyData(), new JSONObject());
+        }
+
+        private JSONArray prepareHistogramData(String[] names, int[] counts) throws JSONException {
+                // TODO Auto-generated method stub
+                JSONArray arr = new JSONArray();
+                int datalen = names.length;
+                for (int i = 0; i < datalen; i++) {
+                        
+                        JSONObject elem = new JSONObject();
+                        // values will just be an array of length 1 with a single value
+                        JSONArray values = new JSONArray();
+                        JSONArray value = new JSONArray();
+                        value.put(i);
+                        value.put(counts[i]);
+                        values.put(value);
+                        elem.put("data", values);
+                        elem.put("bars", getShowTrue());
+                        elem.put("label", names[i]);
+                        arr.put(elem);
+                }
+                return arr;
+        }
+
+        private JSONObject loadOptionsForDateGraph(Date[] vals) throws JSONException {
+
+                JSONObject toReturn = new JSONObject();
+                //bars: { show: true }, points: { show: false }, xaxis: { mode: "time", timeformat:"%y/%m/%d" }
+                toReturn.put("bars", getShowTrue());
+                toReturn.put("points", getShowFalse());
+                toReturn.put("xaxis", getXaxisOptionsForDate());
+                return toReturn;
+        }
+        
+        private JSONObject getXaxisOptionsForDate() throws JSONException {
+                JSONObject toReturn = new JSONObject();
+                toReturn.put("mode", "time");
+                toReturn.put("timeformat", "%m/%d/%y");
+                return toReturn;
+        }
+
+        private JSONObject loadOptionsForHistogram(String[] labels) throws JSONException {
+                
+                JSONObject toReturn = new JSONObject();
+                toReturn.put("xaxis", this.getXaxisOptions(labels));
+                return toReturn;
         }