Commits

Anonymous committed 6bff8bc

Improvements to docs and tests.

  • Participants
  • Parent commits f88b244
  • Tags 0.9.0

Comments (0)

Files changed (10)

File NDdata/Menu.txt

 
    Group: Core Renderers  {
 
-      File: jqPlot Charts  (jquery.jqplot.js)
+      File: jqPlot Charts  (no auto-title, jqplot.core.js)
       File: AxisTickRenderer  (no auto-title, jqplot.axisTickRenderer.js)
       File: CanvasGridRenderer  (no auto-title, jqplot.canvasGridRenderer.js)
       File: DivTitleRenderer  (no auto-title, jqplot.divTitleRenderer.js)
       File: MarkerRenderer  (no auto-title, jqplot.markerRenderer.js)
       File: ShapeRenderer  (no auto-title, jqplot.shapeRenderer.js)
       File: ShadowRenderer  (no auto-title, jqplot.shadowRenderer.js)
-      File: $.jqplot.LineRenderer  (jqplot.lineRenderer.js)
-      File: jqPlot Charts  (jqplot.core.js)
+      File: Line Renderer  (no auto-title, jqplot.lineRenderer.js)
       }  # Group: Core Renderers
 
    Group: Plugins  {
             <include name="*.php" />
             <include name="style.css" />
           </fileset>
+          <fileset dir=".">
+            <include name="config.xml" />
+          </fileset>
         </copy>
         <copy todir="${WEB_DIR}/images">
           <fileset dir="${DIST_DIR}/images"/>
         <copy todir="${DIST_DIR}/tests">
           <fileset dir="tests" includes="*" />
         </copy>
-        <copy todir="${DIST_DIR}/tests/jspec/lib">
-          <fileset dir="tests/jspec/lib" includes="jspec.min.*" />
-        </copy>
-        <copy todir="${DIST_DIR}/tests/jspec/lib/images">
-          <fileset dir="tests/jspec/lib/images" includes="*" />
-        </copy>
         <copy todir="${DIST_DIR}/tests/images">
           <fileset dir="tests/images" includes="*" />
         </copy>
 		  <!-- don't want to process jquery itself -->
 		    <move file="${BUILD_DIR}/jquery-1.3.2.js" tofile="${BUILD_DIR}/jquery-1.3.2.js.bak" />
         <mkdir dir="${DIST_DIR}/docs" />
+        <!-- rename files we don't used for docs -->
+        <move file="${BUILD_DIR}/jquery.jqplot.js" tofile="${BUILD_DIR}/jquery.jqplot.js.bak"/>
         <exec executable="${ND}">
           <arg value="-r" />
           <arg value="-i" />
           <arg path="NDdata/" />
           <arg line="-s Default docstyles" />
         </exec>
+        <!-- put files back -->
+        <move file="${BUILD_DIR}/jquery.jqplot.js.bak" tofile="${BUILD_DIR}/jquery.jqplot.js"/>
         <replaceregexp match="@VERSION" replace="${version}" flags="g">
           <fileset dir="${DIST_DIR}/docs/index" includes="*.html" />
           <fileset dir="${DIST_DIR}/docs/files" includes="*.html" />
   <script language="javascript" type="text/javascript" src="./src/plugins/jqplot.dateAxisRenderer.js"></script>
   <script language="javascript" type="text/javascript" src="./src/plugins/jqplot.ohlcRenderer.js"></script>
   <script language="javascript" type="text/javascript" src="./src/plugins/jqplot.highlighter.js"></script>
-  <script language="javascript" type="text/javascript" src="./src/plugins/jqplot.cursor.js"></script>
-
+<!--  <script language="javascript" type="text/javascript" src="./src/plugins/jqplot.cursor.js"></script>
+-->
 
   <!-- END: load jqplot -->
 <script language="javascript" type="text/javascript">

File tests/OHLCTests.php

     
 </script>
 
-<p class="description">jqPlot supports Open Hi Low Close charts through the "jqplot.OHLCRenderer.js" plugin.  For best display, the x axis should use a "DateAxisRenderer".  Data series should be supplied with all the necessary data in the data point arrays such as: [['07/06/2009', 138.7, 139.68, 135.18, 135.4], ['06/29/2009', 143.46, 144.66, 139.79, 140.02], ...].</p>
+<p class="description">jqPlot supports Open Hi Low Close charts through the OHLCRenderer plugin.  For best display, the x axis should use a "DateAxisRenderer".  Data series should be supplied with all the necessary data in the data point arrays such as: [['07/06/2009', 138.7, 139.68, 135.18, 135.4], ['06/29/2009', 143.46, 144.66, 139.79, 140.02], ...].</p>
 
 <p class="description">The jqPlot highlighter plugin's tooltip works with the extra data in the OHLC series also.  You can specify the number of y data values to display in the tooltip with the "yvalues" option of the highlighter plugin.  The default is to display 1 y value (for simple [x,y] data).  Set this to 4 to display the open, hi, low and close value.</p>
       

File tests/barRendererTests.php

   require("opener.php");
 ?>
 
-<p class="description">Bar charts are rendered with the "jqplot.barRenderer.js" plugin.  Bar charts work best when displayed on a category axis.</p> 
+<p class="description">Bar charts are rendered with the barRenderer plugin.  Bar charts work best when displayed on a category axis.</p> 
 
 <div class="jqPlot" id="chart1" style="height:320px; width:480px;"></div>
 

File tests/index.html

               <tr class="description"><td><a href="logAxisTests.php">Log Axes</a></td></tr>
               <tr class="description"><td><a href="dateAxisTests.php">Date Axes</a></td></tr>
               <tr class="description"><td><a href="highlighterTests.php">Data Point Highlighter</a></td></tr>
+              <tr class="description"><td><a href="OHLCTests.php">Open Hi Low Close and Candlestick Charts</a></td></tr>
               <tr class="description"><td><a href="zoomTests.php">Plot Zooming</a></td></tr>
               <tr class="description"><td><a href="categoryAxisTests.php">Category Axes</a></td></tr>
               <tr class="description"><td><a href="barRendererTests.php">Bar Charts</a></td></tr>

File tests/opener.php

   </script>
   
 <?php
-  $pages = array('coretests.php', 'pieTests.php', 'multipleYAxesTests.php', 'logAxisTests.php', 'dateAxisTests.php', 'highlighterTests.php', 'zoomTests.php', 'categoryAxisTests.php', 'barRendererTests.php', 'dragableTests.php', 'stackedTests.php', 'canvasAxisTests.php');
+  $pages = array('coretests.php', 'pieTests.php', 'multipleYAxesTests.php', 'logAxisTests.php', 'dateAxisTests.php', 'highlighterTests.php', 'OHLCTests.php', 'zoomTests.php', 'categoryAxisTests.php', 'barRendererTests.php', 'dragableTests.php', 'stackedTests.php', 'pointLabelTests.php', 'canvasAxisTests.php');
         
   $len = count($pages);
   $parts = explode("/", $_SERVER["REQUEST_URI"]);
         
   <?php
     if (count($jqplot_js_includes)==1) {
-      echo '<p class="description">The plot(s) on this page require the following plugin:</p>';
+      echo '<p class="description">The plot(s) on this page use the following plugin:</p>';
       echo '<pre class="prettyprint">&lt;script type="text/javascript" src="'.$jqplot_js_includes[0].'" /&gt;</pre>';
     }
     else if (count($jqplot_js_includes)>1) {
-      echo '<p class="description">The plot(s) on this page require the following plugins:</p><pre class="prettyprint">';
+      echo '<p class="description">The plot(s) on this page use the following plugins:</p><pre class="prettyprint">';
       foreach ($jqplot_js_includes as $ji) {
         echo '&lt;script type="text/javascript" src="'.$ji.'" /&gt;';
         echo '<br />';

File tests/pointLabelTests.php

   require("opener.php");
 ?>  
 
-<p class="description">The "jqplot.pointLabels.js" plugin places labels on the plot at the data point locations.  Labeles can use the series data array or a separate labels array.  If using the series data, the last value in the data point array is used as the label by default.</p>
+<p class="description">The pointLabels plugin places labels on the plot at the data point locations.  Labeles can use the series data array or a separate labels array.  If using the series data, the last value in the data point array is used as the label by default.</p>
       
 <div class="jqPlot" id="chart1" style="height:320px; width:540px;"></div>
 

File tests/unittests.css

   font-family: "Andale Mono", monospace;
   font-size: 9pt;
   text-align: left;
-  margin: auto;
+  margin: 1em auto;
   padding: 15px;
   width: 690px;
   background: #fffdf6;

File tests/zoomTests.php

 [2450.0,0.],[2460.0,0.],[2470.0,0.],[2480.0,0.],[2490.0,0.],[2500.0,0.],[2510.0,0.],[2520.0,0.],[2530.0,0.],[2540.0,0.],[2550.0,0.],[2560.0,0.],[2570.0,0.],[2580.0,0.],[2590.0,0.],[2600.0,0.],[2610.0,0.],[2620.0,0.],[2630.0,0.],[2640.0,0.],[2650.0,0.],[2660.0,0.],[2670.0,0.],[2680.0,0.],[2690.0,0.],[2700.0,0.],[2710.0,0.],[2720.0,0.],[2730.0,0.],[2740.0,0.],[2750.0,0.],[2760.0,0.],[2770.0,0.],[2780.0,0.],[2790.0,0.],[2800.0,0.]];
 </script>
       
-<p class="description">The jqplot.cursor.js plugin also enables plot zooming functionality.  Click and drag on the plot to zoom.  Double click to reset.</p>
+<p class="description">The cursor plugin also enables plot zooming functionality.  Click and drag on the plot to zoom.  Double click to reset.</p>
 
 <p class="description">You can also enaable single click zoom reset, or disable the double click zoom reset.  The cursor plugin also exposes the $.jqplot.Cursor.resetZoom() function which can be called from user code or other html element (a button for example) to reset the plot zoom.</p>