mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Printing: print tags instead of max CNS

Browse source 
And re-order / re-size the fields so more useful information is actually
shown.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-11 21:39:44 -07:00
parent 2552b027ae
commit 6699dab952
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
qt-ui/models.cpp
View file

@ -1902,9 +1902,9 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const
if (col == 0) if (col == 0)
return tr("Gas used:"); return tr("Gas used:");
if (col == 2) if (col == 2)
return tr("SAC:"); return tr("Tags:");
if (col == 3) if (col == 3)
return tr("Max. CNS:"); return tr("SAC:");
if (col == 4) if (col == 4)
return tr("Weights:"); return tr("Weights:");
} }
@ -1932,24 +1932,27 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const
if (row == 3) { if (row == 3) {
if (col == 0) { if (col == 0) {
int added = 0; int added = 0;
const char *desc; QString gas, gases;
QString gases;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {
desc = dive->cylinder[i].type.description; gas = dive->cylinder[i].type.description;
gas += QString(!gas.isEmpty() ? " " : "") + gasname(&dive->cylinder[i].gasmix);
// if has a description and if such gas is not already present // if has a description and if such gas is not already present
if (desc && gases.indexOf(QString(desc)) == -1) { if (!gas.isEmpty() && gases.indexOf(gas) == -1) {
if (added > 0) if (added > 0)
gases += QString(" / "); gases += QString(" / ");
gases += QString(desc); gases += gas;
added++; added++;
} }
} }
return gases; return gases;
} }
if (col == 2) if (col == 2) {
return di.displaySac(); char buffer[256];
taglist_get_tagstring(dive->tag_list, buffer, 256);
return QString(buffer);
}
if (col == 3) if (col == 3)
return QString::number(dive->maxcns); return di.displaySac();
if (col == 4) { if (col == 4) {
weight_t tw = { total_weight(dive) }; weight_t tw = { total_weight(dive) };
return get_weight_string(tw, true); return get_weight_string(tw, true);

6
qt-ui/printlayout.cpp
View file

@ -42,9 +42,9 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op
const int dw = 20; // base percentage const int dw = 20; // base percentage
profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw);
profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw);
profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw + 8);
profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw - 4);
profilePrintColumnWidths.append(dw + 6); // fit to 100% profilePrintColumnWidths.append(dw - 4); // fit to 100%
const int sr = 12; // smallest row height in pixels const int sr = 12; // smallest row height in pixels
profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr);
profilePrintRowHeights.append(sr + 4); profilePrintRowHeights.append(sr + 4);