@@ -80,13 +80,15 @@ Bluff.TableReader = new JS.Class({ case 'TD': if (!this._has_data) this._col_offset = this._col; + this._has_data = true; this._col += 1; - content = parseFloat(content.match(this.NUMBER_FORMAT)[0]); - if (typeof content == 'number') { - this._has_data = true; + content = content.match(this.NUMBER_FORMAT); + if (content === null) { + this.get_series(x).points[y] = null; + } else { x = this._col - this._col_offset - 1; y = this._row - this._row_offset - 1; - this.get_series(x).points[y] = parseFloat(content); + this.get_series(x).points[y] = parseFloat(content[0]); } break; source/table_reader.js @@ -70,6 +70,126 @@ <th>Pears</th><td>11</td><td>8</td><td>9</td><td>4</td><td>3</td> </tr> </table> + + <canvas id="missing"></canvas> + <table id="missing_graph" border="1" cellpadding="5" cellspacing="0"> + <caption>Turbine Monthly and Yearly Production</caption> + <tr> + <th>Month</th> + <th>2004</th> + <th>2005</th> + <th>2006</th> + <th>2007</th> + <th>2008</th> + </tr> + <tr> + <th>Jan</th> + + <td>-</td> + <td>198100</td> + <td>448000</td> + <td>529200</td> + <td>408800</td> + </tr> + <tr> + <th>Feb</th> + <td>-</td> + <td>326200</td> + + <td>382900</td> + <td>363300</td> + <td>245000</td> + </tr> + <tr> + <th>Mar</th> + <td>-</td> + <td>431900</td> + <td>419300</td> + <td>543200</td> + + <td>343000</td> + </tr> + <tr> + <th>Apr</th> + <td>-</td> + <td>413700</td> + <td>561400</td> + <td>491400</td> + <td>507500</td> + </tr> + + <tr> + <th>May</th> + <td>-</td> + <td>515200</td> + <td>410900</td> + <td>539700</td> + <td>434000</td> + </tr> + <tr> + <th>Jun</th> + + <td>-</td> + <td>339500</td> + <td>262500</td> + <td>297500</td> + <td>291900</td> + </tr> + <tr> + <th>Jul</th> + <td>-</td> + <td>228200</td> + + <td>278600</td> + <td>240800</td> + <td>256200</td> + </tr> + <tr> + <th>Aug</th> + <td>-</td> + <td>266700</td> + <td>206500</td> + <td>226100</td> + + <td>238700</td> + </tr> + <tr> + <th>Sep</th> + <td>178500</td> + <td>432600</td> + <td>403900</td> + <td>412300</td> + <td>323400</td> + </tr> + + <tr> + <th>Oct</th> + <td>411600</td> + <td>395500</td> + <td>368200</td> + <td>12600</td> + <td>-</td> + </tr> + <tr> + <th>Nov</th> + + <td>423500</td> + <td>431900</td> + <td>389900</td> + <td>-</td> + <td>-</td> + </tr> + <tr> + <th>Dec</th> + <td>536900</td> + <td>318500</td> + + <td>517300</td> + <td>270900</td> + <td>-</td> + </tr> + </table> + <script type="text/javascript" language="javascript" charset="utf-8"> window.onload = function() { @@ -89,6 +209,10 @@ g.theme_37signals(); g.data_from_table('wide_data'); g.draw(); + + g = new Bluff.Bar('missing', 400); + g.data_from_table('missing_graph'); + g.draw(); }; </script> test/table_test.html ff0ae40bfd939f27c72148795e566b6b4c56002d James Coglan jcoglan@googlemail.com http://github.com/jcoglan/bluff/commit/fb59ec2507ed8d8db844b56c7af0766abf0d92d0 fb59ec2507ed8d8db844b56c7af0766abf0d92d0 2009-02-21T11:25:00-08:00 2009-02-21T11:25:00-08:00 Improved TableReader handling of empty/non-numeric cells. 6eaa0af9bada5217d3116ec509bd3609e6da091a James Coglan jcoglan@googlemail.com