From bcd0b17caaab45c40d1ec7a714056b99ce442866 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 28 Nov 2018 22:43:32 +0100 Subject: [PATCH] Removed html output --- source/DataModel.cpp | 23 ----------------------- source/DataModel.h | 1 - source/MetaData/MetaDataModel.cpp | 24 ------------------------ source/MetaData/MetaDataModel.h | 1 - source/mainwindow.cpp | 3 --- 5 files changed, 52 deletions(-) diff --git a/source/DataModel.cpp b/source/DataModel.cpp index 05bf9d2..b49039a 100644 --- a/source/DataModel.cpp +++ b/source/DataModel.cpp @@ -72,29 +72,6 @@ void DataModel::printTo(QTextCursor &cursor) const m_v2Svk.printTo(cursor); } -std::string DataModel::toHtml() const -{ - std::stringstream out; - - out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - out << "

ESGRAF 4-8 Auswertungsbogen

" << std::endl; - out << "

" << std::endl; - out << m_metaData.toHtml(); - out << "

" << std::endl; - out << "" << std::endl; - out << "" << std::endl; - - return out.str(); -} - void DataModel::pluralModelChanged() { m_results.setPluralResult(m_plural.getPoints()); diff --git a/source/DataModel.h b/source/DataModel.h index 6691e18..a718ef7 100644 --- a/source/DataModel.h +++ b/source/DataModel.h @@ -36,7 +36,6 @@ public: DataModel(QObject *parent); void printTo(QTextCursor &cursor) const; - std::string toHtml() const; void write(std::ostream &outStream) const; void read(std::istream &inStream); diff --git a/source/MetaData/MetaDataModel.cpp b/source/MetaData/MetaDataModel.cpp index 8308807..c6ef6dd 100644 --- a/source/MetaData/MetaDataModel.cpp +++ b/source/MetaData/MetaDataModel.cpp @@ -178,27 +178,3 @@ void MetaDataModel::printTo(QTextCursor &cursor) const cursor.movePosition(QTextCursor::NextBlock); } -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 << "
Bemerkungen
Untersuchungsdatum" << m_dateOfTest.toString("dd.MM.yyyy").toHtmlEscaped().toStdString() << "" - << m_remarks.trimmed().toHtmlEscaped().replace("\n", "
").toStdString() << "
Alter am Testtag" << getAge().toString() << "
" << std::endl; - - return out.str(); -} diff --git a/source/MetaData/MetaDataModel.h b/source/MetaData/MetaDataModel.h index cecf8ca..a96f75a 100644 --- a/source/MetaData/MetaDataModel.h +++ b/source/MetaData/MetaDataModel.h @@ -35,7 +35,6 @@ public: void write(ESGRAF48::MetaDataModel &model) const; void printTo(QTextCursor &cursor) const; - std::string toHtml() const; Age getAge() const { diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index 1ac4270..3e608b2 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -132,9 +132,6 @@ void MainWindow::closeFile() void MainWindow::print() const { - //std::ofstream htmlfile("print.html"); - //htmlfile << m_dataModel->toHtml(); - QPrinter printer; QPrintDialog dialog(&printer);