Commits

Chris Leonello  committed 77c52e6

Minor updates to examples. Fix syntax error. Modify default highlighting padding in pyramid renderer.

  • Participants
  • Parent commits 0734c2f

Comments (0)

Files changed (6)

File examples/ages.json

 [0.0085318435343400800,0.0088774027062416400,0.0094714560875224100,0.0101640893891056000,0.0108249758696292000,0.0113773174183149000,0.0117954271696904000,0.0120868766491156000,0.0122726357410028000,0.0123620512208843000,0.0124092312631522000,0.0123929933989534000,0.0123170841477326000,0.0121788940682660000,0.0119848553256476000,0.0117367932349178000,0.0114334768233470000,0.0110840887113746000,0.0107005336950161000,0.0102889073661635000,0.0098746874267631800,0.0094727992165526500,0.0091066817836288100,0.0087853078056091400,0.0085176451289595700,0.0082955898249666400,0.0081021034227657000,0.0079410857437656400,0.0078129432771183200,0.0077041517746791700,0.0076076629996558600,0.0075063773837400400,0.0074212932416191700,0.0073577960797626100,0.0073199937766648000,0.0072872222696609900,0.0072249036551971000,0.0071436496521446000,0.0070535868312601700,0.0069442503777637000,0.0068032069975035000,0.0066093294501292200,0.0063936409488174700,0.0061768176372133200,0.0059737878831400300,0.0057724507581444500,0.0055456647375558400,0.0053139201135624000,0.0050952395722700100,0.0048873227886988200,0.0046839194356973000,0.0044709211871979300,0.0042683374557587400,0.0040886232834079100,0.0039394433696905200,0.0038097165950705600,0.0036797119436340500,0.0035595490798891500,0.0034559622921317600,0.0033586853733251200,0.0032515219944251700,0.0031141174480235800,0.0029601056879342400,0.0027997057390388600,0.0026388958299152400,0.0024706340765107900,0.0022829305753990900,0.0020900571013307600,0.0019037152224417700,0.0017251049256371200,0.0015499961243315000,0.0013709889555399900,0.0011982773790103000,0.0010401790931594200,0.0009015220565900700,0.0007812832602556460,0.0006749752626942340,0.0005833580512023270,0.0005061657847658260,0.0004399544894590220,0.0003808034210932470,0.0003273788998735520,0.0002794993115460400,0.0002369793671257210,0.0001995479850687680,0.0001668101805315270,0.0001383186716039340,0.0001138075253115040,0.0000929924552954457,0.0000755223736670678,0.0000610047525059652,0.0000490638302928227,0.0000396489252832302,0.0000330891826825378,0.0000281195284929135,0.0001070412478036410],
 [0.0071192629623232800,0.0072839317935624000,0.0075693293189514500,0.0079091875498352200,0.0082360857829773300,0.0084979038169712600,0.0086893986451354100,0.0088353986277422900,0.0089633895658643000,0.0090878796761182500,0.0092337667384807200,0.0093792123312149900,0.0095192745279032600,0.0096463104169553400,0.0097588790000607600,0.0098544841215461300,0.0099282199747865200,0.0099763812248601700,0.0099957597226035700,0.0099801585489242500,0.0099375446097938400,0.0098709094654945100,0.0097926096630396900,0.0097014318757340600,0.0095968423362564000,0.0094699215837397400,0.0093120985109391200,0.0091337644254482100,0.0089445678055607600,0.0087423328014590000,0.0085321350430430500,0.0083104164267343500,0.0081040369311665900,0.0079207770770160300,0.0077675098774536000,0.0076284130950824500,0.0074765938644635800,0.0073237591351693500,0.0071772210497332700,0.0070244435483804400,0.0068550745015274400,0.0066526057090785200,0.0064404461001358000,0.0062305720357510500,0.0060342707683446500,0.0058408705961082800,0.0056264339860478000,0.0054065565344313600,0.0051920462742280000,0.0049765895152515200,0.0047558832991186200,0.0045207003388048400,0.0042899070487080500,0.0040745089551306800,0.0038817655555785800,0.0037053224400247200,0.0035332134254902200,0.0033727187145046400,0.0032284905944481100,0.0030937679725170100,0.0029582187048090100,0.0028081834596732200,0.0026513461722362800,0.0024926069125082600,0.0023353006048059200,0.0021744630786167700,0.0020021420693961100,0.0018298895084829500,0.0016671380010344600,0.0015153637133401800,0.0013712248188900700,0.0012284616818527500,0.0010934572254154500,0.0009707133813897040,0.0008622603131043950,0.0007661899219731710,0.0006786114871838230,0.0006005435486257860,0.0005322956370150040,0.0004715229254612440,0.0004158721219136000,0.0003645948643149670,0.0003176904909297340,0.0002751152300590630,0.0002367021156783720,0.0002021700726755280,0.0001712214234345020,0.0001437557719387760,0.0001197138111336940,0.0000989925882290494,0.0000814263200020563,0.0000667991474109870,0.0000549164545704749,0.0000455518367647343,0.0000384480445034309,0.0001437755914949950],
 [1.284165231,1.3059697282,1.3408259576,1.3770498469,1.4083776842,1.4346340126,1.4545779876,1.4658887137,1.4671638972,1.457608962,1.4400548643,1.4158684686,1.3864911961,1.3528812542,1.3159697978,1.27622903,1.2340137083,1.1905291022,1.1471037258,1.1047013276,1.0647737249,1.0283340659,0.9964942039,0.9703629438,0.9510519527,0.9386721807,0.932316307,0.9316292996,0.9359838821,0.9443012277,0.9554470086,0.9678781103,0.9812761433,0.9953894103,1.0098153246,1.0236249732,1.035479081,1.0451994053,1.0530930686,1.0593183708,1.0634438538,1.0645809137,1.0637641578,1.0623066923,1.0608111193,1.0589993944,1.0561690641,1.0531914677,1.0515722425,1.052330754,1.0553372965,1.0597522653,1.0661637808,1.0752634417,1.0874733411,1.1017415355,1.1159815378,1.1309096828,1.1470504754,1.1633078085,1.1777943775,1.1882903501,1.1963378464,1.2035708256,1.2108560457,1.2175013424,1.2218302494,1.2239011525,1.223611334,1.2198647763,1.2112533925,1.1958739376,1.1742717733,1.1482333683,1.1203430352,1.0926602484,1.0658097999,1.040887396,1.0189501507,0.9998112064,0.9811922123,0.9621730704,0.9427349027,0.9230154312,0.903354613,0.8841353287,0.8656369091,0.8483181293,0.8323701879,0.8174967062,0.8028084248,0.7870522949,0.7736454722,0.7783827557,0.7836945697,0.7977724963],
-[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,"95+"]]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,"95+", ""]]

File examples/kcp_area.php

             yaxis: {
                 min: 0,
                 max: 100,
-                label: 'Share of Item in Total Expenditure',
+                label: 'Share of Item in Total Expenditure (%)',
                 tickOptions: {
                   showGridline: false,
                   suffix: '%'

File examples/kcp_engel.php

     $title = "Engel Curves";
     // $plotTargets = array (array('id'=>'chart1', 'width'=>600, 'height'=>400));
 ?>
-<?php include "openerNoHeader.php"; ?>
+<?php include "opener.php"; ?>
 
 <!-- Example scripts go here -->
 
     
     plot1 = $.jqplot("chart1", data, {
         title: "Engel Curves",
-        animate: false,
+        animate: true,
         axesDefaults: {
             labelRenderer: $.jqplot.CanvasAxisLabelRenderer
         },
                 }
             },
             yaxis: {
-                label: 'Share in Total Expenditure',
+                label: 'Share in Total Expenditure (%)',
                 tickOptions: {
                     suffix: '%'
                 },

File examples/kcp_pyramid_by_age.php

                             <ul>
                                 <li><input name="gridsVertical" value="vertical" type="checkbox" />Vertical</li>
                                 <li><input name="gridsHorizontal" value="horizontal" type="checkbox" />Horizontal</li>
-                                <li><input name="showMinorTicks" value="true" type="checkbox" />Only major</li>
+                                <li><input name="showMinorTicks" value="true" type="checkbox" checked />Only major</li>
                                 <li><input name="plotBands" value="true" type="checkbox" checked />Plot Bands</li>
                             </ul>
                         </td>
 
         // for this demo, all data is same for each quintile.
         // could do something like this to get the index of the quintile.
-        // <!-- var quintileIndex = parseInt(<?php echo $_GET["qidx"]; ?>); -->
+        // <!-- var quintileIndex = parseInt(< ? php echo $_GET["qidx"]; ? >); -->
 
         var male;
         var female;
             seriesDefaults: {
                 renderer: $.jqplot.PyramidRenderer,
                 rendererOptions: {
-                    barPadding: 2
+                    barPadding: 1.5,
+                    offsetBars: true
                 },
                 yaxis: "yaxis",
                 shadow: false
                     // include empty tick options, they will be used
                     // as users set options with plot controls.
                     tickOptions: {},
-                    showMinorTicks: true,
+                    showMinorTicks: false,
+                    tickInterval: 5,
                     ticks: ticks,
                     rendererOptions: {
-                        tickSpacingFactor: 13,
-                        category: true
+                        tickSpacingFactor: 15,
+                        category: false
                     }
                 },
                 yMidAxis: {
                     // include empty tick options, they will be used
                     // as users set options with plot controls.
                     tickOptions: {},
-                    showMinorTicks: true,
+                    showMinorTicks: false,
+                    tickInterval: 5,
                     ticks: ticks,
                     rendererOptions: {
-                        tickSpacingFactor: 13,
-                        category: true
+                        tickSpacingFactor: 15,
+                        category: false
                     }
                 },
                 y2axis: {
                     // include empty tick options, they will be used
                     // as users set options with plot controls.
                     tickOptions: {},
-                    showMinorTicks: true,
+                    showMinorTicks: false,
+                    tickInterval: 5,
                     ticks: ticks,
                     rendererOptions: {
-                        tickSpacingFactor: 12,
-                        category: true
+                        tickSpacingFactor: 15,
+                        category: false
                     }
                 }
             }
 
         $("input[type=checkbox][name=gridsVertical]").attr("checked", false);
         $("input[type=checkbox][name=gridsHorizontal]").attr("checked", false);
-        $("input[type=checkbox][name=showMinorTicks]").attr("checked", false);
+        $("input[type=checkbox][name=showMinorTicks]").attr("checked", true);
         $("input[type=checkbox][name=plotBands]").attr("checked", true);
         $("input[type=checkbox][name=showContour]").attr("checked", true);
         $("input[type=checkbox][name=barPadding]").attr("checked", true);

File src/jqplot.linearTickGenerator.js

             }
 
             else if (keepMin) {
-                r[0] = axis_min                                         // min
+                r[0] = axis_min;                                        // min
                 r[2] = Math.ceil((axis_max - axis_min) / ss + 1.0);     // number of ticks
                 r[1] = axis_min + (r[2] - 1) * ss;                      // max
                 var digitsMin = gsf(axis_min).digitsRight;

File src/plugins/jqplot.pyramidRenderer.js

         // Expand the highlightable region in the x direction.
         // E.g. a value of 3 will highlight a bar when the mouse is
         // within 3 pixels of the bar in the x direction.
-        this.highlightThreshold = 1.5;
+        this.highlightThreshold = 2;
         // prop: synchronizeHighlight
         // Index of another series to highlight when this series is highlighted.
         // null or false to not synchronize.