Print: improve table printing by using QTableView

The current QTextDocument implementation is slow due to
HTML parsing. By using QTableView with QAbstractTableModel
we boost the performance of the table print drastically.
This patch completely replaces the old solution.

There is a hidden QTableView widget which is populated
with all data and rendered using a QPainter attached to
the printer device.

A couple of new classes are added in models.h/cpp
that handle the table print model and these are then used
in printlayout.h/cpp.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 12 insertions, 9 deletions

diff --git a/qt-ui/printlayout.h b/qt-ui/printlayout.h
index 7a1922e4a..ac363ab8d 100644
--- a/qt-ui/printlayout.h
+++ b/qt-ui/printlayout.h
@@ -1,10 +1,13 @@
 #ifndef PRINTLAYOUT_H
 #define PRINTLAYOUT_H
 
+#include <QObject>
 #include <QPrinter>
-#include <QStringList>
+#include <QList>
 
 class PrintDialog;
+class TablePrintModel;
+struct dive;
 
 class PrintLayout : public QObject {
 	Q_OBJECT
@@ -19,21 +22,21 @@ private:
 	struct options *printOptions;
 
 	QPainter *painter;
-	int screenDpiX, screenDpiY, printerDpi;
+	int screenDpiX, screenDpiY, printerDpi, scaledPageW, scaledPageH;
 	qreal scaleX, scaleY;
 	QRect pageRect;
 
-	QStringList tableColumnNames;
-	QStringList tableColumnWidths;
+	QList<QString> tablePrintColumnNames;
+	QList<unsigned int> tablePrintColumnWidths;
+	unsigned int tablePrintHeadingBackground;
 
 	void setup();
 	void printSixDives() const;
 	void printTwoDives() const;
-	void printTable() const;
-	QString insertTableHeadingRow() const;
-	QString insertTableHeadingCol(int) const;
-	QString insertTableDataRow(struct dive *) const;
-	QString insertTableDataCol(QString) const;
+	void printTable();
+	void addTablePrintDataRow(TablePrintModel *model, int row, struct dive *dive) const;
+	void addTablePrintHeadingRow(TablePrintModel *model, int row) const;
+
 	QPixmap convertPixmapToGrayscale(QPixmap) const;
 };