From 3b7500fd33693da6c353600674166ca5098895e4 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 14:38:54 +0200 Subject: Print: setup for a new profile table layout - Adjust the new rows and column count - Set new row and column spans Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 4 ++-- qt-ui/printlayout.cpp | 35 +++++++++++++---------------------- 2 files changed, 15 insertions(+), 24 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 12e17c8e9..726a56914 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1593,12 +1593,12 @@ void ProfilePrintModel::setDive(struct dive *divePtr) int ProfilePrintModel::rowCount(const QModelIndex &parent) const { - return 11; + return 12; } int ProfilePrintModel::columnCount(const QModelIndex &parent) const { - return 7; + return 5; } QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index f539c89b3..24d3492a5 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -36,14 +36,12 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op tablePrintColumnWidths.append(15); tablePrintColumnWidths.append(33); // profile print settings - const int dw = 15; // base percentage + const int dw = 20; // base percentage profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); - profilePrintColumnWidths.append(dw - 5); - profilePrintColumnWidths.append(dw + 5); - profilePrintColumnWidths.append(dw - 5); // fit to 100% + profilePrintColumnWidths.append(dw); // fit to 100% const int sr = 9; // smallest row height in pixels profilePrintRowHeights.append(sr + 2); profilePrintRowHeights.append(sr + 7); @@ -55,7 +53,8 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); - profilePrintRowHeights.append(sr + 12); + profilePrintRowHeights.append(sr); + profilePrintRowHeights.append(sr); } void PrintLayout::print() @@ -211,23 +210,15 @@ QTableView *PrintLayout::createProfileTable(ProfilePrintModel *model, const int * changes made here reflect on ProfilePrintModel::data(). */ const int cols = model->columnCount(); const int rows = model->rowCount(); - // top section - table->setSpan(0, 0, 1, cols - 2); - table->setSpan(1, 0, 1, cols - 2); - table->setSpan(10, 0, 1, cols); - table->setSpan(0, 5, 1, 2); - table->setSpan(1, 5, 1, 12); - // sac, cns, otu - table->setSpan(2, 3, 2, 1); - table->setSpan(4, 3, 2, 1); - table->setSpan(6, 3, 2, 1); - table->setSpan(8, 3, 2, 1); - table->setSpan(2, 4, 2, 1); - table->setSpan(4, 4, 2, 1); - table->setSpan(6, 4, 2, 1); - table->setSpan(8, 4, 2, 1); - // weights - table->setSpan(2, 5, 1, 2); + // info on top + table->setSpan(0, 0, 1, 4); + table->setSpan(1, 0, 1, 4); + // gas used + table->setSpan(2, 0, 1, 2); + table->setSpan(3, 0, 1, 2); + // notes + table->setSpan(6, 0, 1, 5); + table->setSpan(7, 0, 5, 5); /* resize row heights to the 'profilePrintRowHeights' indexes. * profilePrintTableMaxH will then hold the table height. */ -- cgit v1.2.3-70-g09d2 From f85b434ef1fd58e559a68ab2f4e3fbc20e98dd46 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 15:17:34 +0200 Subject: Print: update drawing of the profile table grid The new table layout requires that we draw the vertical and horizontal lines differently. Signed-off-by: Lubomir I. Ivanov --- qt-ui/modeldelegates.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 2b86476e1..7aa164723 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -329,15 +329,13 @@ void ProfilePrintDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // grid color painter->setPen(QPen(QColor(0xff999999))); - // top line - if (row == 2 || row == 3 || row == 10 || col == 3 || col == 4) + // horizontal lines + if (row == 2 || row == 4 || row == 6) painter->drawLine(rect.topLeft(), rect.topRight()); - if (row > 1 && row < 10) { - // left line - draw always for these rows + if (row == 7) + painter->drawLine(rect.bottomLeft(), rect.bottomRight()); + // vertical lines + if (row > 1) painter->drawLine(rect.topLeft(), rect.bottomLeft()); - // "fix" for missing (?) right line after col 5 - if (col > 5 || (col > 4 && row == 2)) - painter->drawLine(rect.topRight(), rect.bottomRight()); - } QStyledItemDelegate::paint(painter, option, index); } -- cgit v1.2.3-70-g09d2 From a60475d336abae3f1f672443dc5bb8a13395a830 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 15:41:18 +0200 Subject: Print: adjustments to font sizes and alignment The new profile table requires different alignment and different font sizes for specific cells. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 16 +++++++--------- qt-ui/printlayout.cpp | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 726a56914..ead8abc57 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1717,17 +1717,17 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const } // dive location if (row == 1 && col == 0) { - font.setPixelSize(baseSize); font.setBold(true); + font.setPixelSize(baseSize); return QVariant::fromValue(font); } // depth/duration - if ((row == 0 || row == 1) && col == 5) { + if ((row == 0 || row == 1) && col == 4) { font.setPixelSize(baseSize); return QVariant::fromValue(font); } // notes - if (row == 9 && col == 0) { + if (row > 5 && col == 0) { font.setPixelSize(baseSize + 1); return QVariant::fromValue(font); } @@ -1735,12 +1735,10 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const return QVariant::fromValue(font); } case Qt::TextAlignmentRole: { - unsigned int align = Qt::AlignCenter; - // dive #, location, notes - if ((row < 2 || row == 10) && col == 0) - align = Qt::AlignLeft | Qt::AlignVCenter; - // depth, duration - if (row < 2 && col == 5) + // everything is aligned to the left + unsigned int align = Qt::AlignLeft; + // align depth and duration right + if (row < 2 && col == 4) align = Qt::AlignRight | Qt::AlignVCenter; return QVariant::fromValue(align); } diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index 24d3492a5..a0533b71d 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -42,9 +42,9 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); // fit to 100% - const int sr = 9; // smallest row height in pixels + const int sr = 10; // smallest row height in pixels profilePrintRowHeights.append(sr + 2); - profilePrintRowHeights.append(sr + 7); + profilePrintRowHeights.append(sr + 5); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); -- cgit v1.2.3-70-g09d2 From 89ba9b113d0cc872b994439e581f206955014bed Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 15:46:13 +0200 Subject: Print: remove the helper function to truncate strings ProfilePrintPmode::truncateString() was not really needed, because long text *should* be trunctated by the table itself. Also we now are going to have multiple lines for notes, so the auto-trim should work. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index ead8abc57..b2f98bd52 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1563,28 +1563,6 @@ ProfilePrintModel::ProfilePrintModel(QObject *parent) { } -/* this is just a helper function to truncate C strings near 'maxlen' characters - * by finding word bounderies and adding '...' at the end of the truncated string. - * not really optimal for all languages! - */ -QString ProfilePrintModel::truncateString(char *str, const int maxlen) const -{ - if (!str) - return QString(""); - QString trunc = QString(str); - const int len = trunc.length(); - for (int i = 0; i < len; i++) { - char c = trunc.at(i).toAscii(); - if (c == ' ' || c == '\n' || c == '\t') { - if (i > maxlen) { - trunc = trunc.left(i) + QString("..."); - break; - } - } - } - return trunc; -} - void ProfilePrintModel::setDive(struct dive *divePtr) { dive = divePtr; @@ -1618,15 +1596,15 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const if (row == 0) { if (col == 0) return tr("Dive #%1 - %2").arg(dive->number).arg(di.displayDate()); - if (col == 5) { + if (col == 4) { QString unit = (get_units()->length == units::METERS) ? "m" : "ft"; return tr("Max depth: %1 %2").arg(di.displayDepth()).arg(unit); } } if (row == 1) { if (col == 0) - return truncateString(dive->location, 32); - if (col == 5) + return QString(dive->location); + if (col == 4) return QString(tr("Duration: %1 min")).arg(di.displayDuration()); } // cylinder headings @@ -1658,7 +1636,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const } // dive notes if (row == 10 && col == 0) - return truncateString(dive->notes, 640); + return QString(dive->notes); // sac, cns, otu - headings if (col == 3) { if (row == 2) -- cgit v1.2.3-70-g09d2 From d0dfec929fc7f2f43bd116c881b995779d7a9a17 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 15:50:47 +0200 Subject: Print: give more space for the depth and duration column There is not enough space for the last column in "6 print" even for the english text. This gives more space extending the row, but for some languages it will be an issue, thus strings have to be eventually shortened by the translators. Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index a0533b71d..b24248d64 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -39,9 +39,9 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op const int dw = 20; // base percentage profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); - profilePrintColumnWidths.append(dw); - profilePrintColumnWidths.append(dw); - profilePrintColumnWidths.append(dw); // fit to 100% + profilePrintColumnWidths.append(dw - 3); + profilePrintColumnWidths.append(dw - 3); + profilePrintColumnWidths.append(dw + 6); // fit to 100% const int sr = 10; // smallest row height in pixels profilePrintRowHeights.append(sr + 2); profilePrintRowHeights.append(sr + 5); -- cgit v1.2.3-70-g09d2 From 19b68d38ac0bcaa622e09dbf004e5ce037acd464 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 16:00:51 +0200 Subject: Print: update the profile print table Gas, SAC, CNS titles This only updates the titles to correct column offsets. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index b2f98bd52..53754a1ed 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1607,14 +1607,16 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const if (col == 4) return QString(tr("Duration: %1 min")).arg(di.displayDuration()); } - // cylinder headings + // headings if (row == 2) { if (col == 0) - return tr("Cylinder"); - if (col == 1) - return tr("Gasmix"); + return tr("Gas Used:"); if (col == 2) - return tr("Gas Used"); + return tr("SAC:"); + if (col == 3) + return tr("Max. CNS:"); + if (col == 4) + return tr("Weights:"); } // cylinder data if (row > 2 && row < 10 && row - 3 < MAX_CYLINDERS) { -- cgit v1.2.3-70-g09d2 From ab8e781660b412b98d95940103bf79b57536498c Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 16:09:54 +0200 Subject: Print: set correct row/column location for profile notes NOTE: also comment out the old cylinder/weight printing code... Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 53754a1ed..33ea95785 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1618,6 +1618,14 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const if (col == 4) return tr("Weights:"); } + // notes + if (col == 0) { + if (row == 6) + return tr("Notes:"); + if (row == 7) + return QString(dive->notes); + } + /* // cylinder data if (row > 2 && row < 10 && row - 3 < MAX_CYLINDERS) { cylinder_t *cyl = &dive->cylinder[row - 3]; @@ -1684,6 +1692,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const } } } + */ return QString(); } case Qt::FontRole: { -- cgit v1.2.3-70-g09d2 From 35f1f716a5a63aa344513a7b3db20dc3eab8ec9b Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 16:23:19 +0200 Subject: Print: add more table headings for Divemaster, Buddy, etc.. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 33ea95785..971c6727a 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1625,6 +1625,19 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const if (row == 7) return QString(dive->notes); } + // more headings + if (row == 4) { + if (col == 0) + return tr("Divemaster:"); + if (col == 1) + return tr("Buddy:"); + if (col == 2) + return tr("Suit:"); + if (col == 3) + return tr("Viz:"); + if (col == 4) + return tr("Rating:"); + } /* // cylinder data if (row > 2 && row < 10 && row - 3 < MAX_CYLINDERS) { -- cgit v1.2.3-70-g09d2 From 156815f041da70d6b748abb4ddcaeab40f2a8912 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 16:51:28 +0200 Subject: Print: update printing for gas, CNS, SAC and weights Following the new layout for the profile print, we separate the used gas like so: AL80 / EAN33 / ... Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 971c6727a..b8b9e2014 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1638,6 +1638,33 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const if (col == 4) return tr("Rating:"); } + // values for gas, sac, etc... + if (row == 3) { + if (col == 0) { + int added = 0; + const char *desc; + QString gases; + for (int i = 0; i < MAX_CYLINDERS; i++) { + desc = dive->cylinder[i].type.description; + // if has a description and if such gas is not already present + if (desc && gases.indexOf(QString(desc)) == -1) { + if (added > 0) + gases += QString(" / "); + gases += QString(desc); + added++; + } + } + return gases; + } + if (col == 2) + return QString::number(dive->maxcns); + if (col == 3) + return di.displaySac(); + if (col == 4) { + weight_t tw = { total_weight(dive) }; + return get_weight_string(tw, true); + } + } /* // cylinder data if (row > 2 && row < 10 && row - 3 < MAX_CYLINDERS) { -- cgit v1.2.3-70-g09d2 From d439d381ca59a63dc036409cfe1d157b916cb995 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 17:09:10 +0200 Subject: Print: update the values for DM, buddy, suit, etc We update the values for divemaster, buddy and etc... Rating and visibility are currently displayed as "x / 5" values. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 79 +++++++++----------------------------------------------- 1 file changed, 12 insertions(+), 67 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index b8b9e2014..81bdc22a3 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1665,74 +1665,19 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const return get_weight_string(tw, true); } } - /* - // cylinder data - if (row > 2 && row < 10 && row - 3 < MAX_CYLINDERS) { - cylinder_t *cyl = &dive->cylinder[row - 3]; - if (cyl->type.description) { // how do we check if a cylinder is added? - if (col == 0) { - if (cyl->type.description[0] != '\0') - return QString(cyl->type.description); - return unknown; - } - if (col == 1) { - get_gas_string(cyl->gasmix.o2.permille, cyl->gasmix.he.permille, buf, sizeof(buf)); - return QString(buf); - } - if (col == 2) { - return get_cylinder_used_gas_string(cyl, true); - } - } - } - // dive notes - if (row == 10 && col == 0) - return QString(dive->notes); - // sac, cns, otu - headings - if (col == 3) { - if (row == 2) - return tr("SAC"); - if (row == 4) - return tr("Max. CNS"); - if (row == 6) - return tr("OTU"); - } - // sac, cns, otu - data - if (col == 4) { - if (row == 2) - return di.displaySac(); - if (row == 4) - return QString::number(dive->maxcns); - if (row == 6) - return QString::number(dive->otu); - } - // weights heading - if (row == 2 && col == 5) - return tr("Weights"); - // total weight - if (row == 9) { - weight_t tw = { total_weight(dive) }; - if (tw.grams) { - if (col == 5) - return tr("Total weight"); - if (col == 6) - return get_weight_string(tw, true); - } - } - // weight data - if (row > 2 && row < 10 && row - 3 < MAX_WEIGHTSYSTEMS) { - weightsystem_t *ws = &dive->weightsystem[row - 3]; - if (ws->weight.grams) { - if (col == 5) { - if (ws->description && ws->description[0] != '\0') - return QString(ws->description); - return unknown; - } - if (col == 6) { - return get_weight_string(ws->weight, true); - } - } + // values for DM, buddy, suit, etc... + if (row == 5) { + if (col == 0) + return QString(dive->divemaster); + if (col == 1) + return QString(dive->buddy); + if (col == 2) + return QString(dive->suit); + if (col == 3) + return (dive->visibility) ? QString::number(dive->visibility).append(" / 5") : QString(); + if (col == 4) + return (dive->rating) ? QString::number(dive->rating).append(" / 5") : QString(); } - */ return QString(); } case Qt::FontRole: { -- cgit v1.2.3-70-g09d2 From 526985d6e57a1d58a97495c84b4cff814b81af3a Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 17:35:55 +0200 Subject: Print: fix missing vertical line at the last column There was a line missing in the right-most column wrapping the table for the profile print. Signed-off-by: Lubomir I. Ivanov --- qt-ui/modeldelegates.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 7aa164723..b4b24b266 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -335,7 +335,10 @@ void ProfilePrintDelegate::paint(QPainter *painter, const QStyleOptionViewItem & if (row == 7) painter->drawLine(rect.bottomLeft(), rect.bottomRight()); // vertical lines - if (row > 1) + if (row > 1) { painter->drawLine(rect.topLeft(), rect.bottomLeft()); + if (col == 4 || (col == 0 && row > 5)) + painter->drawLine(rect.topRight(), rect.bottomRight()); + } QStyledItemDelegate::paint(painter, option, index); } -- cgit v1.2.3-70-g09d2 From d4766a8cce9a7a873f23c29fa2ef7615961686e8 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 17:37:27 +0200 Subject: Print: yet another font adjustment for the profile table We now only use a slightly large font for the "Dive #" entry. All other font sizes remain at 9px. Another change is that we now attempt to use 11px for individual row height. This makes the table at least 12px bigger (n_rows * increment), but does not cut letters like 'g', which go slightly bellow the font baseline. Perhaps this can be improved later by adjusting the font and row sizes again. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 16 ---------------- qt-ui/printlayout.cpp | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 81bdc22a3..36ee916e3 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1689,22 +1689,6 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const font.setPixelSize(baseSize + 1); return QVariant::fromValue(font); } - // dive location - if (row == 1 && col == 0) { - font.setBold(true); - font.setPixelSize(baseSize); - return QVariant::fromValue(font); - } - // depth/duration - if ((row == 0 || row == 1) && col == 4) { - font.setPixelSize(baseSize); - return QVariant::fromValue(font); - } - // notes - if (row > 5 && col == 0) { - font.setPixelSize(baseSize + 1); - return QVariant::fromValue(font); - } font.setPixelSize(baseSize); return QVariant::fromValue(font); } diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index b24248d64..afc6dd036 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -42,9 +42,9 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw + 6); // fit to 100% - const int sr = 10; // smallest row height in pixels - profilePrintRowHeights.append(sr + 2); - profilePrintRowHeights.append(sr + 5); + const int sr = 12; // smallest row height in pixels + profilePrintRowHeights.append(sr); + profilePrintRowHeights.append(sr + 4); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); -- cgit v1.2.3-70-g09d2