Changeset 114

Timestamp:

02/05/09 13:28:32 (16 months ago)

Author:

czue

Message:

Add a "no data available" screen when there's no data.

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• assets/flot/html/empty.html (added)
• src/org/rapidandroid/activity/ChartData.java (modified) (4 diffs)
• src/org/rapidandroid/activity/chart/ChartBroker.java (modified) (4 diffs)
• src/org/rapidandroid/activity/chart/form/FormDataBroker.java (modified) (1 diff)

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/ChartData.java

@@ -49 +49 @@
         private static final String STATE_GRAPH_OPTION = "graphoption";
 
-        private static final String CHART_FILE = "file:///android_asset/flot/html/basechart.html";
-        private static final String JAVASCRIPT_PROPERTYNAME = "graphdata";
-
         private static final int MENU_DONE = Menu.FIRST;
         private static final int MENU_CHANGE_VARIABLE = Menu.FIRST + 1;
@@ -108 +105 @@
 
                         }                       
-                        mWebView.addJavascriptInterface(mBroker, JAVASCRIPT_PROPERTYNAME);              
-                        mWebView.loadUrl(CHART_FILE);
+                        mBroker.loadChartPage();
                         //mBroker.loadGraph();
                 }               
@@ -149 +145 @@
                 }
                 
-                mWebView.addJavascriptInterface(mBroker, JAVASCRIPT_PROPERTYNAME);              
-                mWebView.loadUrl(CHART_FILE);
+                mBroker.loadChartPage();
                 //mBroker.loadGraph();
                 //mWebView.debugDump();
@@ -275 +270 @@
 
         }
+        
+        
+
 
         @Override

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/chart/ChartBroker.java

@@ -32 +32 @@
  */
 public abstract class ChartBroker {
+
+        private static final String CHART_FILE = "file:///android_asset/flot/html/basechart.html";
+        private static final String JAVASCRIPT_PROPERTYNAME = "graphdata";
+        private static final String EMPTY_FILE = "file:///android_asset/flot/html/empty.html";
         
         /**
@@ -81 +85 @@
         };
         
+        protected boolean mGotData;
+        private boolean mChartPageLoaded;
+        private boolean mAlreadyLoading;
+        
         protected ChartBroker(Activity activity, WebView appView, Date startDate, Date endDate) {
                 mParentActivity = activity;
@@ -131 +139 @@
          */
         public synchronized final void loadGraph() {
-                mToggleThinkerHandler.post(mToggleThinker);
-                if(mGraphData == null && mGraphOptions == null) {
-                        doLoadGraph();
-                }
-                loadGraphFinish();
-        }
+                if (!mAlreadyLoading) {
+                        mToggleThinkerHandler.post(mToggleThinker);
+                        if(mGraphData == null && mGraphOptions == null) {
+                                doLoadGraph();
+                        }
+                        loadGraphFinish();      
+                } 
+                mAlreadyLoading = false;
+        }
+        
         protected void loadGraphFinish(){
+                if (!mGotData) {
+                        mAppView.loadUrl(EMPTY_FILE);
+                        mChartPageLoaded = false;
+                        finishGraph();
+                        return;
+                } 
+                else if (!mChartPageLoaded) {
+                        mAlreadyLoading = true;
+                        reloadChartPage();
+                }
                 int width = mAppView.getWidth();
                 int height = 0;
@@ -148 +170 @@
                 mAppView.loadUrl("javascript:SetGraph(\"" + width + "px\", \"" + height + "px\")");
                 mAppView.loadUrl("javascript:GotGraph(" + mGraphData.toString() + "," + mGraphOptions.toString() + ")");
+        }
+
+        private void reloadChartPage() {
+                // don't add the js interface
+                mAppView.loadUrl(CHART_FILE);
+                mChartPageLoaded = true;
+        }
+
+        public void loadChartPage() {
+                mAppView.addJavascriptInterface(this, JAVASCRIPT_PROPERTYNAME);         
+                mAppView.loadUrl(CHART_FILE);
+                mChartPageLoaded = true;
         }
 

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

@@ -68 +68 @@
                         mGraphOptions = allData.getOptions();
                 } 
+                if (mGraphData.toString().equals(this.getEmptyData().toString())) {
+                        this.mGotData = false;
+                } else {
+                        this.mGotData = true;
+                }
                 Log.d("FormDataBroker",mGraphData.toString());
                 Log.d("FormDataBroker",mGraphOptions.toString());