{% block main_rows %} {% for dive in dives %} + {% if forloop.counter|divisibleby:6 %} +

+ {% endif %}

@@ -173,6 +181,9 @@

+ {% if forloop.counter|divisibleby:6 %} +

+ {% endif %} {% endfor %} {% endblock %}

-- cgit v1.2.3-70-g09d2 From 90852e114c37897971d528c90be8350e494eb8cb Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Mon, 17 Aug 2015 19:44:11 +0200 Subject: Printing: fix typo in template name Template names was capitalized, so change the file name to "Custom.html" instead of "custom.html" Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- qt-ui/templateedit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt-ui/templateedit.cpp b/qt-ui/templateedit.cpp index e4e6453ac..3315b12ef 100644 --- a/qt-ui/templateedit.cpp +++ b/qt-ui/templateedit.cpp @@ -125,8 +125,8 @@ void TemplateEdit::saveSettings() if (msgBox.exec() == QMessageBox::Save) { memcpy(templateOptions, &newTemplateOptions, sizeof(struct template_options)); if (grantlee_template.compare(ui->plainTextEdit->toPlainText())) { - printOptions->p_template = "custom.html"; - TemplateLayout::writeTemplate("custom.html", ui->plainTextEdit->toPlainText()); + printOptions->p_template = "Custom.html"; + TemplateLayout::writeTemplate("Custom.html", ui->plainTextEdit->toPlainText()); } if (templateOptions->color_palette_index == CUSTOM) { custom_colors = templateOptions->color_palette; -- cgit v1.2.3-70-g09d2 From 4a988aa8689835c4970645bc28d36ec9f5429f15 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Tue, 18 Aug 2015 21:34:00 +0200 Subject: Printing: update user-manual images Add updated user-manual images, with the new dialog UI. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- Documentation/images/PrintDiveLog.jpg | Bin 35196 -> 33884 bytes Documentation/images/Printpreview.jpg | Bin 23664 -> 30041 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Documentation/images/PrintDiveLog.jpg b/Documentation/images/PrintDiveLog.jpg index 7a485c4ff..8ff972dd7 100644 Binary files a/Documentation/images/PrintDiveLog.jpg and b/Documentation/images/PrintDiveLog.jpg differ diff --git a/Documentation/images/Printpreview.jpg b/Documentation/images/Printpreview.jpg index ab5db7fa5..7297d80cc 100644 Binary files a/Documentation/images/Printpreview.jpg and b/Documentation/images/Printpreview.jpg differ -- cgit v1.2.3-70-g09d2 From afc697e7977590795b8d5c26a873d12d8f601104 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Wed, 19 Aug 2015 23:02:58 +0200 Subject: Printing: refactor printing code This section of the code is called only while rendering a flow layout template, so move it to the flow layout function. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/printer.cpp b/printer.cpp index d0a165dcb..624de3a42 100644 --- a/printer.cpp +++ b/printer.cpp @@ -59,6 +59,11 @@ void Printer::putProfileImage(QRect profilePlaceholder, QRect viewPort, QPainter void Printer::flowRender() { + // add extra padding at the bottom to pages with height not divisible by view port + int paddingBottom = pageSize.height() - (webView->page()->mainFrame()->contentsSize().height() % pageSize.height()); + QString styleString = QString::fromUtf8("padding-bottom: ") + QString::number(paddingBottom) + "px;"; + webView->page()->mainFrame()->findFirstElement("body").setAttribute("style", styleString); + // render the Qwebview QPainter painter; QRect viewPort(0, 0, 0, 0); @@ -187,6 +192,7 @@ void Printer::print() return; } + QPrinter *printerPtr; printerPtr = static_cast(paintDevice); @@ -218,10 +224,6 @@ void Printer::print() } int Pages; if (divesPerPage == 0) { - // add extra padding at the bottom to pages with height not divisible by view port - int paddingBottom = pageSize.height() - (webView->page()->mainFrame()->contentsSize().height() % pageSize.height()); - QString styleString = QString::fromUtf8("padding-bottom: ") + QString::number(paddingBottom) + "px;"; - webView->page()->mainFrame()->findFirstElement("body").setAttribute("style", styleString); flowRender(); } else { Pages = ceil(getTotalWork(printOptions) / (float)divesPerPage); -- cgit v1.2.3-70-g09d2 From 20c22596f0c8689ec5d63518df2d7ca162b8d8c2 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Thu, 20 Aug 2015 19:20:40 +0200 Subject: Printing: update the user-manual Add printing description to the user-manual, also add appendix F which describes how to write a custom template for Subsurface. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- Documentation/user-manual.txt | 172 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 156 insertions(+), 16 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 815bb9b2a..943d2268d 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2711,8 +2711,9 @@ process could be used for the Cloud-based storage of dive logs. [[S_PrintDivelog]] == Printing a dive log -_Subsurface_ provides a simple interface to print a whole dive log or only a -few selected dives, including dive profiles and other contextual information. +_Subsurface_ provides a simple interface to print a whole dive log or only a few selected dives. + Pre-installed templates or a custom written template can be used to choose where the data will + be fitted into the page. Before printing, two decisions are required: @@ -2727,15 +2728,10 @@ below). image::images/PrintDiveLog.jpg["FIGURE: Print dialogue",align="center"] -Under _Print type_ users need to select one of three options: +Under _Print type_ users need to select one of two options: -- Print the complete Dive List: to do this, _Table Print_ should be selected. -- Print the selected dives (dive profiles and all other information) at 6 - dives per printed page: to do this, users should select _6 dives per page_. -- Print the selected dives (dive profiles and all other information) at 2 - dives per printed page: to do this, users should select _2 dives per page_. -- Print the selected dives (dive profiles and all other information) at 1 - dive per printed page: to do this, users should select _1 dive per page_. +- _Dive list_ print: print dives from the list with profiles and other information. +- _Statistics_ print: print yearly statistics of the dives. Under _Print options_ users need to select: @@ -2744,12 +2740,20 @@ Under _Print options_ users need to select: selected dives_. - Printing in colour, achieved by checking the box with _Print in colour_. -The _Ordering_ affects the layout of the page (or part of it) for each dive. -The dive profile could be printed at the top of each dive, with the textual -information underneath, or it could be printed with the textual information at -the top with the dive profile underneath. Users should select the appropriate option in the -print dialogue. See the image below which has a layout with -text below the dive profile. +Under _Template_ users can select: + +- A template to be used as the page layout. + +- _Delete_ a template from the template list +- _Import_ a new template to the template list +- _Export_ a template from the template list +- _Edit_ a template (choose colors, fonts, font-type) + +When editing a template the following options are available: + +- _Style_: edit font type, size, choose color palette; this will not affect the template HTML code +- _Template_: edit the template HTML code; by saving, the "Custom" template in the template list will be replaced +- _Colors_: edit the current color palette; the new color palette will overwrite the "Custom" color palette Users can _Preview_ the printed page by selecting the _Preview_ button on the dialogue. After preview, changes to the options in the print dialogue can be @@ -2767,6 +2771,11 @@ the output for one particular page. image::images/Printpreview.jpg["FIGURE: Print preview page",align="center"] +=== Write a custom printing template (advanced) + +Writing a custom template is an effective way to produce highly customized printouts. Subsurface uses HTML templates with Grantlee as the printing backend. + +See <<_appendix_f_write_a_custom_printing_template ,APPENDIX F>> for information on how to write your own template. [[S_Configure]] == Configuring a dive computer @@ -4137,3 +4146,134 @@ If you have downloaded your dives to different dive logging software before they were overwritten, there is a high change that Subsurface can import these. However, if the logs are only on your dive computer, they cannot be salvaged after being over written by new dives. + +== APPENDIX F: Write a custom printing template + +_Subsurface_ provides a customizable printing support which is based on templates that are transformed by the _Grantlee_ +backend to correct _HTML_ syntax, The _HTML_ output is then rendered by _Subsurface_. + +To write a custom template the following elements must exist so that the template will be correctly handled and rendered. + +=== Main dive loop +_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ backend. It is possible to iterate over the list as follows: + +.template.html +.... + {% for dive in dives %} +

+ {% endfor %} +.... + +.output.html +.... +

1

2

3

+.... + +Additional information about _Grantlee_ can be found http://www.grantlee.org/apidox/for_themers.html[here] + +=== Grantlee exported variables +Only a subset of the dive data is exported: +|==================== +|*Name*|*Description* +|number| (*int*) dive number +|id| (*int*) unique dive ID, should be used to fetch the dive profile +|date| (*string*) data of the dive +|time| (*string*) time of the dive +|location| (*string*) location of the dive +|duration| (*string*) duration of the dive +|depth| (*string*) depth of the dive +|divemaster| (*string*) divemaster data +|buddy| (*string*) buddy data +|airTemp| (*string*) air temperature of dive +|waterTemp| (*string*) water temperature of dive +|notes| (*string*) dive notes +|rating| (*int*) dive rating ranges from 0 to 5 +|sac| (*string*) sac value +|tags| (*string*) all dive tags concatenate together +|gas| (*string*) used gas cylinder +|===================== + +_Subsurface_ also exports *template_options* data. This data must be used as _CSS_ values to provide a dynamically +editable template. The exported data is shown in the following table: +|==================== +|*Name*|*Description* +|font| (*string*) font family +|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px +|font_size| (*double*) size of fonts in vw, ranges between 1.0 and 2.0 +|line_spacing| (*double*) distance between text lines, ranges between 1.0 and 3.0 +|color1| (*string*) background color +|color2| (*string*) primary table cell color +|color3| (*string*) secondary table cell color +|color4| (*string*) primary text color +|color5| (*string*) secondary text color +|color6| (*string*) border colors +|===================== + +.template.html +.... + border-width: {{ template_options.borderwidth }}px; +.... + +.output.html +.... + border-width: 3px; +.... + +Another variable that _Subsurface_ exports is *print_options*. This variable contains a single member: +|===================== +|*Name*|*Description* +|grayscale | Use _CSS_ filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints) +|===================== + + +.template.html +.... + body { + {{ print_options.grayscale }}; + } +.... + +.output.html +.... + body { + -webkit-filter: grayscale(100%); + } +.... + +=== Defined CSS selectors + +As the dive profile is placed after rendering, _Subsurface_ uses a special _CSS_ selectors to do some searches +in the HTML output. The _CSS_ selectors in the following table should be added. + +|==================== +|*Selector*|*Type*|*Description* +|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile +|diveProfile | class | each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector +|dontbreak | class | prevents the div with this class to be divided into two pages, this can be used +in flow layout templates only (when data-numberofdives = 0) +|===================== + +IMPORTANT: Rendering dive profiles is not supported for flow layout templates (when data-numberofdives = 0). + +=== Special attributes + +There are two ways of rendering- either rendering a specific number of dives in each page or make _Subsurface_ try to +fit as much dives as possible into one page (_flow_ rendering). + +The *data-numberofdives* data attribute is added to the body tag to set the rendering mode + +- render 6 dives per page: + +.... + +.... + +- render as much dives as possible: + +.... + +.... + +IMPORTANT: All CSS units should be in relative lengths only, to support printing on any page size. -- cgit v1.2.3-70-g09d2 From 13febc1eee0766801f3d86e0aa413552def76135 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 10:56:59 +0200 Subject: Printing: fix uninialized border width In flow rendering the border width is not initialized which causes huge borders that blocks the page while previewing. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/printer.cpp b/printer.cpp index 624de3a42..b4d937094 100644 --- a/printer.cpp +++ b/printer.cpp @@ -293,6 +293,8 @@ void Printer::previewOnePage() pageSize.setHeight(paintDevice->height()); pageSize.setWidth(paintDevice->width()); webView->page()->setViewportSize(pageSize); + // initialize the border settings + templateOptions->border_width = std::max(1, pageSize.width() / 1000); webView->setHtml(t.generate()); // render only one page -- cgit v1.2.3-70-g09d2 From c516421bc2ba8bcd70e1ac3e7173f3e9524ecb24 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 11:02:10 +0200 Subject: Printing: check the print type in the preview section Preview output should be identical to the actual printing code, so call the flow rendering method for all flow templates. Also don't create new pages while rendering a one page preview, just exit after the first page is full. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printer.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/printer.cpp b/printer.cpp index b4d937094..66fed7cf3 100644 --- a/printer.cpp +++ b/printer.cpp @@ -95,7 +95,14 @@ void Printer::flowRender() // rendering progress is 4/5 of total work emit(progessUpdated((end * 80.0 / fullPageResolution) + done)); - static_cast(paintDevice)->newPage(); + + // add new pages only in print mode, while previewing we don't add new pages + if (printMode == Printer::PRINT) + static_cast(paintDevice)->newPage(); + else { + painter.end(); + return; + } start = dontbreakElement.geometry().y(); } } @@ -297,7 +304,16 @@ void Printer::previewOnePage() templateOptions->border_width = std::max(1, pageSize.width() / 1000); webView->setHtml(t.generate()); - // render only one page - render(1); + bool ok; + int divesPerPage = webView->page()->mainFrame()->findFirstElement("body").attribute("data-numberofdives").toInt(&ok); + if (!ok) { + divesPerPage = 1; // print each dive in a single page if the attribute is missing or malformed + //TODO: show warning + } + if (divesPerPage == 0) { + flowRender(); + } else { + render(1); + } } } -- cgit v1.2.3-70-g09d2 From 77c81b299bf376d67435e61cf172d49a3177f680 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 18:01:27 +0200 Subject: Printing: read statistics templates from the "statistics" path Now there are two types of templates, dive list and statistics. We need to support reading both types of templates. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- templatelayout.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templatelayout.cpp b/templatelayout.cpp index b0098fbd9..2da048266 100644 --- a/templatelayout.cpp +++ b/templatelayout.cpp @@ -4,7 +4,7 @@ #include "helpers.h" #include "display.h" -QList grantlee_templates; +QList grantlee_templates, grantlee_statistics_templates; int getTotalWork(print_options *printOptions) { @@ -24,6 +24,7 @@ int getTotalWork(print_options *printOptions) void find_all_templates() { grantlee_templates.clear(); + grantlee_statistics_templates.clear(); QDir dir(getSubsurfaceDataPath("printing_templates")); QFileInfoList list = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot); foreach (QFileInfo finfo, list) { @@ -32,6 +33,15 @@ void find_all_templates() grantlee_templates.append(finfo.fileName()); } } + // find statistics templates + dir.setPath(getSubsurfaceDataPath("printing_templates") + QDir::separator() + "statistics"); + list = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot); + foreach (QFileInfo finfo, list) { + QString filename = finfo.fileName(); + if (filename.at(filename.size() - 1) != '~') { + grantlee_statistics_templates.append(finfo.fileName()); + } + } } TemplateLayout::TemplateLayout(print_options *PrintOptions, template_options *templateOptions) : -- cgit v1.2.3-70-g09d2 From 6a692495c024876d74145df8b67734323ec348b6 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 18:07:30 +0200 Subject: Printing: add statistics templates to the dialog Show the existing templates based on the print type selected by the user. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- qt-ui/printoptions.cpp | 57 +++++++++++++++++++++++++++++++++++++------------- qt-ui/printoptions.h | 1 + 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp index 419098cf8..70cd89711 100644 --- a/qt-ui/printoptions.cpp +++ b/qt-ui/printoptions.cpp @@ -31,21 +31,7 @@ void PrintOptions::setup() break; } - // insert existing templates in the UI and select the current template - qSort(grantlee_templates); - int current_index = 0, index = 0; - for (QList::iterator i = grantlee_templates.begin(); i != grantlee_templates.end(); ++i) { - if ((*i).compare(printOptions->p_template) == 0) { - current_index = index; - break; - } - index++; - } - ui.printTemplate->clear(); - for (QList::iterator i = grantlee_templates.begin(); i != grantlee_templates.end(); ++i) { - ui.printTemplate->addItem((*i).split('.')[0], QVariant::fromValue(*i)); - } - ui.printTemplate->setCurrentIndex(current_index); + setupTemplates(); // general print option checkboxes if (printOptions->color_selected) @@ -63,6 +49,43 @@ void PrintOptions::setup() hasSetupSlots = true; } +void PrintOptions::setupTemplates() +{ + if (printOptions->type == print_options::DIVELIST) { + // insert dive list templates in the UI and select the current template + qSort(grantlee_templates); + int current_index = 0, index = 0; + for (QList::iterator i = grantlee_templates.begin(); i != grantlee_templates.end(); ++i) { + if ((*i).compare(printOptions->p_template) == 0) { + current_index = index; + break; + } + index++; + } + ui.printTemplate->clear(); + for (QList::iterator i = grantlee_templates.begin(); i != grantlee_templates.end(); ++i) { + ui.printTemplate->addItem((*i).split('.')[0], QVariant::fromValue(*i)); + } + ui.printTemplate->setCurrentIndex(current_index); + } else if (printOptions->type == print_options::STATISTICS) { + // insert statistics templates in the UI and select the current template + qSort(grantlee_statistics_templates); + int current_index = 0, index = 0; + for (QList::iterator i = grantlee_statistics_templates.begin(); i != grantlee_statistics_templates.end(); ++i) { + if ((*i).compare(printOptions->p_template) == 0) { + current_index = index; + break; + } + index++; + } + ui.printTemplate->clear(); + for (QList::iterator i = grantlee_statistics_templates.begin(); i != grantlee_statistics_templates.end(); ++i) { + ui.printTemplate->addItem((*i).split('.')[0], QVariant::fromValue(*i)); + } + ui.printTemplate->setCurrentIndex(current_index); + } +} + // print type radio buttons void PrintOptions::on_radioDiveListPrint_toggled(bool check) { @@ -79,6 +102,8 @@ void PrintOptions::on_radioDiveListPrint_toggled(bool check) ui.exportButton->setEnabled(true); ui.importButton->setEnabled(true); ui.printTemplate->setEnabled(true); + + setupTemplates(); } } @@ -97,6 +122,8 @@ void PrintOptions::on_radioStatisticsPrint_toggled(bool check) ui.exportButton->setEnabled(false); ui.importButton->setEnabled(false); ui.printTemplate->setEnabled(false); + + setupTemplates(); } } diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h index 6d7ffffee..9c50b10f3 100644 --- a/qt-ui/printoptions.h +++ b/qt-ui/printoptions.h @@ -70,6 +70,7 @@ private: struct print_options *printOptions; struct template_options *templateOptions; bool hasSetupSlots; + void setupTemplates(); private slots: -- cgit v1.2.3-70-g09d2 From 70e8862efc7189342ee9c016e85054538b4d7b99 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:00:46 +0200 Subject: Printing: export a statistics data structure to the Grantlee backend Add a YearInfo class which represents a year statistics. Export the class to the Grantlee backend, also export all it's members to the printing backend. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- templatelayout.cpp | 10 ++++++++++ templatelayout.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/templatelayout.cpp b/templatelayout.cpp index 2da048266..9245befbe 100644 --- a/templatelayout.cpp +++ b/templatelayout.cpp @@ -316,3 +316,13 @@ void Dive::put_sac() m_sac = QString::number(value, 'f', decimal).append(unit); } } + +YearInfo::YearInfo() +{ + +} + +YearInfo::~YearInfo() +{ + +} diff --git a/templatelayout.h b/templatelayout.h index 41a3cbfa9..47ca31f4c 100644 --- a/templatelayout.h +++ b/templatelayout.h @@ -4,6 +4,8 @@ #include #include "mainwindow.h" #include "printoptions.h" +#include "statistics.h" +#include "helpers.h" int getTotalWork(print_options *printOptions); void find_all_templates(); @@ -98,9 +100,22 @@ public: QString sac() const; }; +class YearInfo { +public: + stats_t *year; + YearInfo(stats_t& year) + :year(&year) + { + + } + YearInfo(); + ~YearInfo(); +}; + Q_DECLARE_METATYPE(Dive) Q_DECLARE_METATYPE(template_options) Q_DECLARE_METATYPE(print_options) +Q_DECLARE_METATYPE(YearInfo) GRANTLEE_BEGIN_LOOKUP(Dive) if (property == "number") @@ -182,4 +197,41 @@ if (property == "grayscale") { } GRANTLEE_END_LOOKUP +GRANTLEE_BEGIN_LOOKUP(YearInfo) + +if (property == "year") { + return object.year->period; +} else if (property == "dives") { + return object.year->selection_size; +} else if (property == "min_temp") { + const char *unit; + double temp = get_temp_units(object.year->min_temp, &unit); + return object.year->min_temp == 0 ? "0" : QString::number(temp, 'g', 2) + unit; +} else if (property == "max_temp") { + const char *unit; + double temp = get_temp_units(object.year->max_temp, &unit); + return object.year->max_temp == 0 ? "0" : QString::number(temp, 'g', 2) + unit; +} else if (property == "total_time") { + return get_time_string(object.year->total_time.seconds, 0); +} else if (property == "avg_time") { + return get_minutes(object.year->total_time.seconds / object.year->selection_size); +} else if (property == "shortest_time") { + return get_minutes(object.year->shortest_time.seconds); +} else if (property == "longest_time") { + return get_minutes(object.year->longest_time.seconds); +} else if (property == "avg_depth") { + return get_depth_string(object.year->avg_depth); +} else if (property == "min_depth") { + return get_depth_string(object.year->min_depth); +} else if (property == "max_depth") { + return get_depth_string(object.year->max_depth); +} else if (property == "avg_sac") { + return get_volume_string(object.year->avg_sac); +} else if (property == "min_sac") { + return get_volume_string(object.year->min_sac); +} else if (property == "max_sac") { + return get_volume_string(object.year->max_sac); +} +GRANTLEE_END_LOOKUP + #endif -- cgit v1.2.3-70-g09d2 From b0e84e7e2b2a6e7252cd24d6df9d0b93af127d77 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:03:42 +0200 Subject: Printing: generate a Grantlee statistics template As there are two types of templates, Grantlee need to support both. This commit adds the support to generating a statistics HTML code from a statistics template. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- templatelayout.cpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++ templatelayout.h | 4 ++-- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/templatelayout.cpp b/templatelayout.cpp index 9245befbe..c52968f09 100644 --- a/templatelayout.cpp +++ b/templatelayout.cpp @@ -108,6 +108,53 @@ QString TemplateLayout::generate() return htmlContent; } +QString TemplateLayout::generateStatistics() +{ + QString htmlContent; + m_engine = new Grantlee::Engine(this); + + QSharedPointer m_templateLoader = + QSharedPointer(new Grantlee::FileSystemTemplateLoader()); + m_templateLoader->setTemplateDirs(QStringList() << getSubsurfaceDataPath("printing_templates/statistics")); + m_engine->addTemplateLoader(m_templateLoader); + + Grantlee::registerMetaType(); + Grantlee::registerMetaType(); + Grantlee::registerMetaType(); + + QVariantHash mapping; + QVariantList years; + + int i = 0; + while (stats_yearly != NULL && stats_yearly[i].period) { + YearInfo year(stats_yearly[i]); + years.append(QVariant::fromValue(year)); + i++; + } + + mapping.insert("years", years); + mapping.insert("template_options", QVariant::fromValue(*templateOptions)); + mapping.insert("print_options", QVariant::fromValue(*PrintOptions)); + + Grantlee::Context c(mapping); + + Grantlee::Template t = m_engine->loadByName(PrintOptions->p_template); + if (!t || t->error()) { + qDebug() << "Can't load template"; + return htmlContent; + } + + htmlContent = t->render(&c); + + if (t->error()) { + qDebug() << "Can't render template"; + return htmlContent; + } + + emit progressUpdated(100); + return htmlContent; +} + QString TemplateLayout::readTemplate(QString template_name) { QFile qfile(getSubsurfaceDataPath("printing_templates") + QDir::separator() + template_name); diff --git a/templatelayout.h b/templatelayout.h index 47ca31f4c..d9fa29295 100644 --- a/templatelayout.h +++ b/templatelayout.h @@ -10,7 +10,7 @@ int getTotalWork(print_options *printOptions); void find_all_templates(); -extern QList grantlee_templates; +extern QList grantlee_templates, grantlee_statistics_templates; class TemplateLayout : public QObject { Q_OBJECT @@ -18,6 +18,7 @@ public: TemplateLayout(print_options *PrintOptions, template_options *templateOptions); ~TemplateLayout(); QString generate(); + QString generateStatistics(); static QString readTemplate(QString template_name); static void writeTemplate(QString template_name, QString grantlee_template); @@ -198,7 +199,6 @@ if (property == "grayscale") { GRANTLEE_END_LOOKUP GRANTLEE_BEGIN_LOOKUP(YearInfo) - if (property == "year") { return object.year->period; } else if (property == "dives") { -- cgit v1.2.3-70-g09d2 From 4553155cf319df3e06e8b29adcabe6125943335a Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:04:42 +0200 Subject: Printing: add a statistics template Add a statistics template to the templates directory. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printing_templates/statistics/Default.html | 97 ++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 printing_templates/statistics/Default.html diff --git a/printing_templates/statistics/Default.html b/printing_templates/statistics/Default.html new file mode 100644 index 000000000..4ec02766a --- /dev/null +++ b/printing_templates/statistics/Default.html @@ -0,0 +1,97 @@ + + + + + +

+ + + + + + + + + + + + + + + + + +{% block main_rows %} + {% for year in years %} + + + + + + + + + + + + + + + + + {% endfor %} +{% endblock %} +

Year

Dives

Total Time

Avg Time

Shortest Time

Longest Time

Avg Depth

Min Depth

Max Depth

Avg SAC

Min SAC

Max SAC

Min Temp

Max Temp

+ + -- cgit v1.2.3-70-g09d2 From 69f2921ffa856e93acb9bc920f3f761db2831880 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:12:33 +0200 Subject: Printing: use the same code for both statistics and divelist print - use the same generic code for both types of templates - check for the printing type before generating the template - remove unused printStatistics() method Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printer.cpp | 66 ++++++++------------------------------------------- printer.h | 1 - qt-ui/printdialog.cpp | 20 +++------------- 3 files changed, 13 insertions(+), 74 deletions(-) diff --git a/printer.cpp b/printer.cpp index 66fed7cf3..3068a6fef 100644 --- a/printer.cpp +++ b/printer.cpp @@ -213,7 +213,11 @@ void Printer::print() webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); // export border width with at least 1 pixel templateOptions->border_width = std::max(1, pageSize.width() / 1000); - webView->setHtml(t.generate()); + if (printOptions->type == print_options::DIVELIST) { + webView->setHtml(t.generate()); + } else if (printOptions->type == print_options::STATISTICS ) { + webView->setHtml(t.generateStatistics()); + } if (printOptions->color_selected && printerPtr->colorMode()) { printerPtr->setColorMode(QPrinter::Color); } else { @@ -238,60 +242,6 @@ void Printer::print() } } -void Printer::print_statistics() -{ - QPrinter *printerPtr; - printerPtr = static_cast(paintDevice); - stats_t total_stats; - - total_stats.selection_size = 0; - total_stats.total_time.seconds = 0; - - QString html; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - int i = 0; - while (stats_yearly != NULL && stats_yearly[i].period) { - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - total_stats.selection_size += stats_yearly[i].selection_size; - total_stats.total_time.seconds += stats_yearly[i].total_time.seconds; - i++; - } - html += "

Year

Dives

Total Time

Avg Time

Shortest Time

Longest Time

Avg Depth

Min Depth

Max Depth

Avg SAC

Min SAC

Max SAC

Min Temp

Max Temp

" + QString::number(stats_yearly[i].period) + "

" + QString::number(stats_yearly[i].selection_size) + "

" + QString::fromUtf8(get_time_string(stats_yearly[i].total_time.seconds, 0)) + "

" + QString::fromUtf8(get_minutes(stats_yearly[i].total_time.seconds / stats_yearly[i].selection_size)) + "

" + QString::fromUtf8(get_minutes(stats_yearly[i].shortest_time.seconds)) + "

" + QString::fromUtf8(get_minutes(stats_yearly[i].longest_time.seconds)) + "

" + get_depth_string(stats_yearly[i].avg_depth) + "

" + get_depth_string(stats_yearly[i].min_depth) + "

" + get_depth_string(stats_yearly[i].max_depth) + "

" + get_volume_string(stats_yearly[i].avg_sac) + "

" + get_volume_string(stats_yearly[i].min_sac) + "

" + get_volume_string(stats_yearly[i].max_sac) + "

" + QString::number(stats_yearly[i].min_temp == 0 ? 0 : get_temp_units(stats_yearly[i].min_temp, NULL)) + "

" + QString::number(stats_yearly[i].max_temp == 0 ? 0 : get_temp_units(stats_yearly[i].max_temp, NULL)) + "

"; - webView->setHtml(html); - webView->print(printerPtr); -} - void Printer::previewOnePage() { if (printMode == PREVIEW) { @@ -302,7 +252,11 @@ void Printer::previewOnePage() webView->page()->setViewportSize(pageSize); // initialize the border settings templateOptions->border_width = std::max(1, pageSize.width() / 1000); - webView->setHtml(t.generate()); + if (printOptions->type == print_options::DIVELIST) { + webView->setHtml(t.generate()); + } else if (printOptions->type == print_options::STATISTICS ) { + webView->setHtml(t.generateStatistics()); + } bool ok; int divesPerPage = webView->page()->mainFrame()->findFirstElement("body").attribute("data-numberofdives").toInt(&ok); diff --git a/printer.h b/printer.h index 5c7652a8d..979cacd6a 100644 --- a/printer.h +++ b/printer.h @@ -39,7 +39,6 @@ public: Printer(QPaintDevice *paintDevice, print_options *printOptions, template_options *templateOptions, PrintMode printMode); ~Printer(); void print(); - void print_statistics(); void previewOnePage(); signals: diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp index 002f9b9f4..cf08062d2 100644 --- a/qt-ui/printdialog.cpp +++ b/qt-ui/printdialog.cpp @@ -178,15 +178,8 @@ void PrintDialog::printClicked(void) { QPrintDialog printDialog(&qprinter, this); if (printDialog.exec() == QDialog::Accepted) { - switch (printOptions.type) { - case print_options::DIVELIST: - connect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); - printer->print(); - break; - case print_options::STATISTICS: - printer->print_statistics(); - break; - } + connect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); + printer->print(); close(); } } @@ -194,14 +187,7 @@ void PrintDialog::printClicked(void) void PrintDialog::onPaintRequested(QPrinter *printerPtr) { connect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); - switch (printOptions.type) { - case print_options::DIVELIST: - printer->print(); - break; - case print_options::STATISTICS: - printer->print_statistics(); - break; - } + printer->print(); progressBar->setValue(0); disconnect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); } -- cgit v1.2.3-70-g09d2 From b6d373520457d702f47d6026cea1c8c57c6528c5 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:13:20 +0200 Subject: Printing: enable UI elements that now can be used The new statistics code, enable the editing of colors, font, and other template options. This patch enables the UI elements for these features. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- qt-ui/printoptions.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp index 70cd89711..cb944f9d7 100644 --- a/qt-ui/printoptions.cpp +++ b/qt-ui/printoptions.cpp @@ -93,15 +93,12 @@ void PrintOptions::on_radioDiveListPrint_toggled(bool check) printOptions->type = print_options::DIVELIST; // print options - ui.printInColor->setEnabled(true); ui.printSelected->setEnabled(true); // print template ui.deleteButton->setEnabled(true); - ui.editButton->setEnabled(true); ui.exportButton->setEnabled(true); ui.importButton->setEnabled(true); - ui.printTemplate->setEnabled(true); setupTemplates(); } @@ -113,15 +110,12 @@ void PrintOptions::on_radioStatisticsPrint_toggled(bool check) printOptions->type = print_options::STATISTICS; // print options - ui.printInColor->setEnabled(false); ui.printSelected->setEnabled(false); // print template ui.deleteButton->setEnabled(false); - ui.editButton->setEnabled(false); ui.exportButton->setEnabled(false); ui.importButton->setEnabled(false); - ui.printTemplate->setEnabled(false); setupTemplates(); } -- cgit v1.2.3-70-g09d2 From f45fdc8660f912845f37809cae41e2f3b02bc800 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 21 Aug 2015 19:20:43 +0200 Subject: Printing: disable template editing for statistics templates Editing statistics templates is not supported now, as there is no custom template for statistics printing, so disable the template edit area. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- qt-ui/templateedit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qt-ui/templateedit.cpp b/qt-ui/templateedit.cpp index 3315b12ef..b50338090 100644 --- a/qt-ui/templateedit.cpp +++ b/qt-ui/templateedit.cpp @@ -35,6 +35,9 @@ TemplateEdit::TemplateEdit(QWidget *parent, struct print_options *printOptions, ui->plainTextEdit->setPlainText(grantlee_template); editingCustomColors = false; + if (printOptions->type == print_options::STATISTICS) { + ui->plainTextEdit->setEnabled(false); + } updatePreview(); } -- cgit v1.2.3-70-g09d2 From cc864794753eb586e89470d87196e13568cb9031 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sat, 22 Aug 2015 16:05:13 +0200 Subject: Printing: replace usage of std::ceil() std::ceil() in printer.cpp throws errors when compiled with mingw, so replace all std::ceil calls with qCeil(). Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/printer.cpp b/printer.cpp index 3068a6fef..f0197d446 100644 --- a/printer.cpp +++ b/printer.cpp @@ -207,8 +207,8 @@ void Printer::print() connect(&t, SIGNAL(progressUpdated(int)), this, SLOT(templateProgessUpdated(int))); dpi = printerPtr->resolution(); //rendering resolution = selected paper size in inchs * printer dpi - pageSize.setHeight(std::ceil(printerPtr->pageRect(QPrinter::Inch).height() * dpi)); - pageSize.setWidth(std::ceil(printerPtr->pageRect(QPrinter::Inch).width() * dpi)); + pageSize.setHeight(qCeil(printerPtr->pageRect(QPrinter::Inch).height() * dpi)); + pageSize.setWidth(qCeil(printerPtr->pageRect(QPrinter::Inch).width() * dpi)); webView->page()->setViewportSize(pageSize); webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); // export border width with at least 1 pixel @@ -237,7 +237,7 @@ void Printer::print() if (divesPerPage == 0) { flowRender(); } else { - Pages = ceil(getTotalWork(printOptions) / (float)divesPerPage); + Pages = qCeil(getTotalWork(printOptions) / (float)divesPerPage); render(Pages); } } -- cgit v1.2.3-70-g09d2

{{ dive.number }}

1

2

3