Commit 9ca4ae97 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

port barchart to new API interface

parent 4b514378

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ add_library(plotfxlib STATIC 
    source/plot.cc

    source/plot_area.cc

    source/plot_axis.cc

    source/plot_bars.cc

    source/plot_gridlines.cc

    source/plot_labels.cc

    source/plot_lines.cc

examples/barcharts/barsandlines.ptx

0 → 100644
+27 −0
Original line number Diff line number Diff line 
width: 1280px;

height: 480px;



plot {



  axis-y-max: 34;



  layer {

    type: bars;

    x: csv(tests/testdata/city_temperatures_london.csv, month);

    y: csv(tests/testdata/city_temperatures_london.csv, temperature);

  }



  layer {

    type: lines;

    x: csv(tests/testdata/city_temperatures_tokyo.csv, month);

    y: csv(tests/testdata/city_temperatures_tokyo.csv, temperature);

    color: #aa4643;

  }



  layer {

    type: points;

    x: csv(tests/testdata/city_temperatures_tokyo.csv, month);

    y: csv(tests/testdata/city_temperatures_tokyo.csv, temperature);

    color: #aa4643;

  }

}

examples/barcharts/barsandlines.sql

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
IMPORT TABLE city_temperatures

    FROM 'csv:examples/data/city_temperatures.csv?headers=true';



DRAW BARCHART WITH

    ORIENTATION VERTICAL

    YDOMAIN 0, 50

    AXIS RIGHT

    AXIS TOP;



SELECT city AS series, month AS x, temperature AS y

    FROM city_temperatures

    WHERE city = "London";



DRAW LINECHART WITH

    YDOMAIN 0, 70

    AXIS BOTTOM

    AXIS LEFT;



SELECT city AS series, month AS x, temperature * 2 AS y, "circle" as pointstyle, "color2" as color

    FROM city_temperatures

    WHERE city = "Tokyo";

examples/barcharts/barsandlines.svg

0 → 100644
+114 −0
Original line number Diff line number Diff line 
<svg xmlns="http://www.w3.org/2000/svg" width="1280.000000" height="480.000000" viewBox="0 0 1280.0 480.0">

  <rect width="1280.000000" height="480.000000" fill="#ffffff"/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 44.4 L1225.053125 44.4 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 44.4 L54.946875 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M152.455732 44.4 L152.455732 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M249.964589 44.4 L249.964589 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M347.473438 44.4 L347.473438 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M444.982303 44.4 L444.982303 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M542.491169 44.4 L542.491169 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M640.0 44.4 L640.0 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M737.508901 44.4 L737.508901 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M835.017732 44.4 L835.017732 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M932.526563 44.4 L932.526563 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1030.035463 44.4 L1030.035463 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1127.544294 44.4 L1127.544294 49.733333 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 44.4 L1225.053125 49.733333 "/>

  <text x="91.873180" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jan</text>

  <text x="188.569537" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Feb</text>

  <text x="286.086198" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Mar</text>

  <text x="384.813814" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Apr</text>

  <text x="479.877367" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">May</text>

  <text x="579.417448" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jun</text>

  <text x="679.371661" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jul</text>

  <text x="773.216429" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Aug</text>

  <text x="870.725260" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Sep</text>

  <text x="969.866974" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Oct</text>

  <text x="1065.742992" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Nov</text>

  <text x="1163.251823" y="28.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Dec</text>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 44.4 L1225.053125 435.6 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 435.6 L1219.719792 435.6 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 379.714283 L1219.719792 379.714283 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 323.828566 L1219.719792 323.828566 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 267.942844 L1219.719792 267.942844 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 212.057133 L1219.719792 212.057133 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 156.171422 L1219.719792 156.171422 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 100.285688 L1219.719792 100.285688 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 44.4 L1219.719792 44.4 "/>

  <text x="1236.786458" y="440.600000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">0.0</text>

  <text x="1236.786458" y="384.714283" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">4.9</text>

  <text x="1236.786458" y="328.828566" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">9.7</text>

  <text x="1236.786458" y="272.942844" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.6</text>

  <text x="1236.786458" y="217.057133" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">19.4</text>

  <text x="1236.786458" y="161.171422" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">24.3</text>

  <text x="1236.786458" y="105.285688" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">29.1</text>

  <text x="1236.786458" y="49.400000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">34.0</text>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 435.6 L1225.053125 435.6 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 435.6 L54.946875 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M152.455732 435.6 L152.455732 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M249.964589 435.6 L249.964589 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M347.473438 435.6 L347.473438 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M444.982303 435.6 L444.982303 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M542.491169 435.6 L542.491169 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M640.0 435.6 L640.0 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M737.508901 435.6 L737.508901 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M835.017732 435.6 L835.017732 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M932.526563 435.6 L932.526563 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1030.035463 435.6 L1030.035463 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1127.544294 435.6 L1127.544294 430.266667 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M1225.053125 435.6 L1225.053125 430.266667 "/>

  <text x="91.873180" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jan</text>

  <text x="188.569537" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Feb</text>

  <text x="286.086198" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Mar</text>

  <text x="384.813814" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Apr</text>

  <text x="479.877367" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">May</text>

  <text x="579.417448" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jun</text>

  <text x="679.371661" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Jul</text>

  <text x="773.216429" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Aug</text>

  <text x="870.725260" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Sep</text>

  <text x="969.866974" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Oct</text>

  <text x="1065.742992" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Nov</text>

  <text x="1163.251823" y="461.333333" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Dec</text>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 44.4 L54.946875 435.6 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 435.6 L60.280208 435.6 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 379.714283 L60.280208 379.714283 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 323.828566 L60.280208 323.828566 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 267.942844 L60.280208 267.942844 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 212.057133 L60.280208 212.057133 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 156.171422 L60.280208 156.171422 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 100.285688 L60.280208 100.285688 "/>

  <path stroke-width="1.333333" stroke="#a8a8a8" fill="none" d="M54.946875 44.4 L60.280208 44.4 "/>

  <text x="22.822917" y="440.600000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">0.0</text>

  <text x="22.822917" y="384.714283" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">4.9</text>

  <text x="22.822917" y="328.828566" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">9.7</text>

  <text x="14.666667" y="272.942844" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.6</text>

  <text x="14.666667" y="217.057133" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">19.4</text>

  <text x="14.666667" y="161.171422" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">24.3</text>

  <text x="14.666667" y="105.285688" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">29.1</text>

  <text x="14.666667" y="49.400000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">34.0</text>

  <path fill="#4572a7" d="M76.398823 390.727059 L76.398823 435.6 L131.003781 435.6 L131.003781 390.727059 "/>

  <path fill="#4572a7" d="M173.907677 387.275294 L173.907677 435.6 L228.512635 435.6 L228.512635 387.275294 "/>

  <path fill="#4572a7" d="M271.416531 370.016471 L271.416531 435.6 L326.02149 435.6 L326.02149 370.016471 "/>

  <path fill="#4572a7" d="M368.925385 337.8 L368.925385 435.6 L423.530344 435.6 L423.530344 337.8 "/>

  <path fill="#4572a7" d="M466.43424 298.68 L466.43424 435.6 L521.039198 435.6 L521.039198 298.68 "/>

  <path fill="#4572a7" d="M563.943094 260.710588 L563.943094 435.6 L618.548052 435.6 L618.548052 260.710588 "/>

  <path fill="#4572a7" d="M661.451948 240.0 L661.451948 435.6 L716.056906 435.6 L716.056906 240.0 "/>

  <path fill="#4572a7" d="M758.960802 244.602353 L758.960802 435.6 L813.56576 435.6 L813.56576 244.602353 "/>

  <path fill="#4572a7" d="M856.469656 272.216471 L856.469656 435.6 L911.074615 435.6 L911.074615 272.216471 "/>

  <path fill="#4572a7" d="M953.97851 317.089412 L953.97851 435.6 L1008.583469 435.6 L1008.583469 317.089412 "/>

  <path fill="#4572a7" d="M1051.487365 359.661176 L1051.487365 435.6 L1106.092323 435.6 L1106.092323 359.661176 "/>

  <path fill="#4572a7" d="M1148.996219 380.371765 L1148.996219 435.6 L1203.601177 435.6 L1203.601177 380.371765 "/>

  <path stroke-width="2.666667" stroke="#aa4643" fill="none" d="M1176.298698 325.143529 L1078.789844 275.668235 L981.28099 225.042353 L883.772135 167.512941 L786.263281 130.694118 L688.754427 145.651765 L591.245573 188.223529 L493.736719 226.192941 L396.227865 268.764706 L298.71901 326.294118 L201.210156 356.209412 L103.701302 355.058824 "/>

  <path fill="#aa4643" d="M1180.298698 325.143529 M1172.298698 325.143529 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M1082.789844 275.668235 M1074.789844 275.668235 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M985.28099 225.042353 M977.28099 225.042353 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M887.772135 167.512941 M879.772135 167.512941 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M790.263281 130.694118 M782.263281 130.694118 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M692.754427 145.651765 M684.754427 145.651765 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M595.245573 188.223529 M587.245573 188.223529 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M497.736719 226.192941 M489.736719 226.192941 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M400.227865 268.764706 M392.227865 268.764706 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M302.71901 326.294118 M294.71901 326.294118 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M205.210156 356.209412 M197.210156 356.209412 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

  <path fill="#aa4643" d="M107.701302 355.058824 M99.701302 355.058824 a4.0 4.0 0 1 0 8.0 0 a4.0 4.0 0 1 0 -8.0 0 "/>

</svg>
 
 No newline at end of file

examples/barcharts/barsandlines.svg.html

deleted100644 → 0
+0 −273

File deleted.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE