From 11f457403fb0f005411deca0ab572815760f6295 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 17 Jun 2015 06:27:33 -0700 Subject: Use saved units in the HTML exporter Also update the exporter to match the latest changes in the Subsurface code. Signed-off-by: Dirk Hohndel --- export-html.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/export-html.cpp b/export-html.cpp index 041c52807..fd92fbd87 100644 --- a/export-html.cpp +++ b/export-html.cpp @@ -16,7 +16,7 @@ QTranslator *qtTranslator, *ssrfTranslator; int main(int argc, char **argv) { - QApplication *application = init_qt(&argc, &argv); + QApplication *application = new QApplication(argc, argv); git_libgit2_init(); setup_system_prefs(); prefs = default_prefs; @@ -41,15 +41,24 @@ int main(int argc, char **argv) qDebug() << "need --source and --output"; exit(1); } - qDebug() << source << output; - fprintf(stderr, "parse_file returned %d\n", parse_file(qPrintable(source))); + int ret = parse_file(qPrintable(source)); + if (ret) + fprintf(stderr, "parse_file returned %d\n", ret); + + // this should have set up the informational preferences - let's grab + // the units from there + + prefs.unit_system = informational_prefs.unit_system; + prefs.units = informational_prefs.units; + + // now set up the export settings to create the HTML export struct htmlExportSetting hes; hes.themeFile = "sand.css"; hes.exportPhotos = true; hes.selectedOnly = false; hes.listOnly = false; hes.yearlyStatistics = true; - exportHtmlInitLogic(output, &hes); + exportHtmlInitLogic(output, hes); exit(0); } -- cgit v1.2.3-70-g09d2