From fcbe356f75a03924add0fc07f5d797de911d28a8 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 4 Nov 2018 13:57:35 +0100 Subject: [PATCH] Print metadata table --- source/DataModel.cpp | 5 ----- source/MetaData/MetaDataModel.cpp | 25 ++++++++++++++++--------- source/mainwindow.cpp | 4 ++-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/source/DataModel.cpp b/source/DataModel.cpp index f5fbeb4..f5fc181 100644 --- a/source/DataModel.cpp +++ b/source/DataModel.cpp @@ -64,11 +64,6 @@ std::string DataModel::toHtml() const out << "body {" << std::endl; out << "font-family:sans-serif;" << std::endl; out << "}" << std::endl; - out << "table, th, td {" << std::endl; - out << "border: 1px solid black;" << std::endl; - out << "border-collapse: collapse;" << std::endl; - out << "padding: 5px;" << std::endl; - out << "}" << std::endl; out << "" << std::endl; out << "" << std::endl; out << "" << std::endl; diff --git a/source/MetaData/MetaDataModel.cpp b/source/MetaData/MetaDataModel.cpp index 822834d..7219715 100644 --- a/source/MetaData/MetaDataModel.cpp +++ b/source/MetaData/MetaDataModel.cpp @@ -134,26 +134,33 @@ std::string MetaDataModel::toHtml() const { std::ostringstream out; - out << "" << std::endl; + out << "
" + << std::endl; out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; + out << "" << std::endl; + out << "" + << std::endl; + out << "" << std::endl; + out << "" + << std::endl; out << "" << std::endl; out << "" << std::endl; out << "" << std::endl; - out << "" << std::endl; + out << "" + << std::endl; out << "" << std::endl; out << "" << std::endl; out << "" << std::endl; out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; + out << "" + << std::endl; + out << "" + << std::endl; out << "" << std::endl; out << "" << std::endl; out << "" << std::endl; - out << "" << std::endl; + out << "" << std::endl; out << "" << std::endl; out << "
Name, Vorname" << m_participant.toStdString() << "Untersucher(in)" << m_instructor.toStdString() << "Name, Vorname" << m_participant.toHtmlEscaped().toStdString() << "Untersucher(in)" << m_instructor.toHtmlEscaped().toStdString() << "
Geburtsdatum" << m_dateOfBirth.toString("dd.MM.yyyy").toHtmlEscaped().toStdString() << "Bemerkungen
Untersuchungsdatum" << m_dateOfTest.toString("dd.MM.yyyy").toHtmlEscaped().toStdString() << "" + << m_remarks.trimmed().toHtmlEscaped().replace("\n", "
").toStdString() << "
Alter am Testtag" << getAge().toString() << "
" << std::endl; diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index 1f3242b..12bc99f 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -137,8 +137,8 @@ void MainWindow::closeFile() void MainWindow::print() const { - std::ofstream htmlfile("print.html"); - htmlfile << m_dataModel->toHtml(); + //std::ofstream htmlfile("print.html"); + //htmlfile << m_dataModel->toHtml(); QPrinter printer;