Merge branch 'custom-print' of github.com:neolit123/subsurface

1 files changed, 71 insertions, 2 deletions

diff --git a/templatelayout.cpp b/templatelayout.cpp
index 1da88249b..b0098fbd9 100644
--- a/templatelayout.cpp
+++ b/templatelayout.cpp
@@ -188,10 +188,30 @@ QString Dive::notes() const
 	return m_notes;
 }
 
+QString Dive::tags() const
+{
+	return m_tags;
+}
+
+QString Dive::gas() const
+{
+	return m_gas;
+}
+
+QString Dive::sac() const
+{
+	return m_sac;
+}
+
+int Dive::rating() const
+{
+	return m_rating;
+}
+
 void Dive::put_divemaster()
 {
 	if (!dive->divemaster)
-		m_divemaster = "";
+		m_divemaster = "--";
 	else
 		m_divemaster = dive->divemaster;
 }
@@ -207,6 +227,9 @@ void Dive::put_date_time()
 void Dive::put_location()
 {
 	m_location = QString::fromUtf8(get_dive_location(dive));
+	if (m_location.isEmpty()) {
+		m_location = "--";
+	}
 }
 
 void Dive::put_depth()
@@ -222,7 +245,7 @@ void Dive::put_duration()
 void Dive::put_buddy()
 {
 	if (!dive->buddy)
-		m_buddy = "";
+		m_buddy = "--";
 	else
 		m_buddy = dive->buddy;
 }
@@ -231,9 +254,55 @@ void Dive::put_temp()
 {
 	m_airTemp = get_temperature_string(dive->airtemp, true);
 	m_waterTemp = get_temperature_string(dive->watertemp, true);
+	if (m_airTemp.isEmpty()) {
+		m_airTemp = "--";
+	}
+	if (m_waterTemp.isEmpty()) {
+		m_waterTemp = "--";
+	}
 }
 
 void Dive::put_notes()
 {
 	m_notes = QString::fromUtf8(dive->notes);
+	if (m_notes.isEmpty()) {
+		m_notes = "--";
+	}
+}
+
+void Dive::put_tags()
+{
+	char buffer[256];
+	taglist_get_tagstring(dive->tag_list, buffer, 256);
+	m_tags = QString(buffer);
+}
+
+void Dive::put_gas()
+{
+	int added = 0;
+	QString gas, gases;
+	for (int i = 0; i < MAX_CYLINDERS; i++) {
+		if (!is_cylinder_used(dive, i))
+			continue;
+		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 (!gas.isEmpty() && gases.indexOf(gas) == -1) {
+			if (added > 0)
+				gases += QString(" / ");
+			gases += gas;
+			added++;
+		}
+	}
+	m_gas = gases;
+}
+
+void Dive::put_sac()
+{
+	if (dive->sac) {
+		const char *unit;
+		int decimal;
+		double value = get_volume_units(dive->sac, &decimal, &unit);
+		m_sac = QString::number(value, 'f', decimal).append(unit);
+	}
 }