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

add default font file paths to Document, add setupDocumentDefaults stub

parent fe8fa6dc

common/document.cc

+7 −0
Original line number Diff line number Diff line
@@ -43,6 +43,13 @@ Document::Document() : 
    text_colour(Colour::fromRGB(.3,.3,.3)),

    border_colour(Colour::fromRGB(.45,.45,.45)) {}



ReturnCode setupDocumentDefaults(Document* doc) {

  doc->font_serif = "/usr/share/fonts/google-roboto/Roboto-Medium.ttf";

  doc->font_sans = "/usr/share/fonts/google-roboto/Roboto-Medium.ttf";

  doc->font_mono = "/usr/share/fonts/google-roboto/Roboto-Medium.ttf";

  return OK;

}



ReturnCode buildDocument(

    const PropertyList& plist,

    Document* doc) {

common/document.h

+5 −0
Original line number Diff line number Diff line
@@ -44,9 +44,14 @@ struct Document { 
  Colour background_colour;

  Colour text_colour;

  Colour border_colour;

  std::string font_serif;

  std::string font_sans;

  std::string font_mono;

  std::vector<ElementRef> roots;

};



ReturnCode setupDocumentDefaults(Document* doc);



ReturnCode buildDocument(

    const PropertyList& plist,

    Document* tree);

common/graphics/text.cc

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Status drawText( 
    const TextStyle& style,

    Layer* layer) {

  FontInfo font_info {

    .font_file = "/usr/share/fonts/google-roboto/Roboto-Medium.ttf",

    .font_file = style.font_file,

    .font_size = style.font_size

  };

common/graphics/text.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct TextStyle { 
  TextDirection direction;

  TextHAlign halign;

  TextVAlign valign;

  std::string font_file;

  double font_size;

  Colour colour;

};

common/platform/plotfx_cli.cc

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ int main(int argc, const char** argv) { 


  auto spec = FileUtil::read(flag_in).toString(); // FIXME

  plotfx::Document doc;

  if (auto rc = setupDocumentDefaults(&doc); !rc.isSuccess()) {

    printError(rc);

    return EXIT_FAILURE;

  }



  if (auto rc = buildDocument(spec, &doc); !rc.isSuccess()) {

    printError(rc);

    return EXIT_FAILURE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE