Commit b80b8129 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

document: add background-colour property

parent 77fb530c
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ namespace plotfx {

Document::Document() :
    width({Unit::PX, 1200}),
    height({Unit::PX, 600}) {}
    height({Unit::PX, 600}),
    background_colour(Colour::fromRGB(1,1,1)) {}

ReturnCode buildDocument(
    const PropertyList& plist,
@@ -46,6 +47,7 @@ ReturnCode buildDocument(
  static const ParserDefinitions pdefs = {
    {"width", std::bind(&parseMeasureProp, std::placeholders::_1, &doc->width)},
    {"height", std::bind(&parseMeasureProp, std::placeholders::_1, &doc->height)},
    {"background-colour", std::bind(&configure_colour, std::placeholders::_1, &doc->background_colour)},
  };

  if (auto rc = parseAll(plist, pdefs); !rc.isSuccess()) {
+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@
#pragma once
#include "utils/return_code.h"
#include "graphics/measure.h"
#include "graphics/colour.h"
#include "element.h"

namespace plotfx {
@@ -40,6 +41,7 @@ struct Document {
  MeasureTable measures;
  Measure width;
  Measure height;
  Colour background_colour;
  std::vector<ElementRef> roots;
};

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ int main(int argc, const char** argv) {
      to_px(doc.measures, doc.height).value,
      doc.measures);

  frame.clear(Colour{1, 1, 1, 1});
  frame.clear(doc.background_colour);

  if (auto rc = renderElements(doc, &frame); !rc.isSuccess()) {
    printError(rc);
    return EXIT_FAILURE;
+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ Lorem ipsum dolor sit amet.
      <td><code><strong>height</strong></code></td>
      <td>Here be dragons</td>
    </tr>
    <tr>
      <td><code><strong>background-colour</strong></code></td>
      <td>Here be dragons</td>
    </tr>
  </tbody>
</table>

@@ -41,5 +45,13 @@ Lorem ipsum dolor sit amet.

    height: <size>;

--

### background-colour

Lorem ipsum dolor sit amet.

    background-colour: <colour>;


## Examples
+12 −0
Original line number Diff line number Diff line
width: 1200px;
height: 600px;

background-colour: #000;

plot {
  series {
    xs: csv('tests/testdata/measurement.csv', 0);
    ys: csv('tests/testdata/measurement.csv', 2);
    colour: #06c;
  }
}
Loading