--- a/src/ChartCarbonate.cpp Tue Jul 26 11:15:37 2022 +0200 +++ b/src/ChartCarbonate.cpp Tue Jul 26 14:26:50 2022 +0200 @@ -15,6 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "ChartCarbonate.h" +#include "callout.h" #include "MainWindow.h" @@ -31,16 +32,20 @@ dialog->setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint); dialog->resize(1024, 600); + QPushButton *saveButton = new QPushButton(tr("Save")); + saveButton->setAutoDefault(false); + QIcon icon1; + icon1.addFile(QString::fromUtf8(":icons/silk/disk.png"), QSize(), QIcon::Normal, QIcon::Off); + saveButton->setIcon(icon1); + QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog); buttonBox->setObjectName(QString::fromUtf8("buttonBox")); - buttonBox->setGeometry(QRect(40, 565, 944, 36)); - buttonBox->setLayoutDirection(Qt::LeftToRight); - buttonBox->setOrientation(Qt::Horizontal); + buttonBox->setOrientation(Qt::Vertical); buttonBox->setStandardButtons(QDialogButtonBox::Ok); - buttonBox->setCenterButtons(true); + buttonBox->addButton(saveButton,QDialogButtonBox::ActionRole); - QSplineSeries *temperature = new QSplineSeries(); - QSplineSeries *pressure = new QSplineSeries(); + temperature = new QSplineSeries(); + pressure = new QSplineSeries(); query.prepare("SELECT * FROM log_co2pressure WHERE code=:code ORDER BY datetime"); query.bindValue(":code", code); @@ -58,7 +63,7 @@ pen.setWidth(3); pressure->setPen(pen); - QChart *chart = new QChart(); + chart = new QChart(); chart->setTitle(QString("%1 \"%2\"").arg(code).arg(name)); chart->addSeries(temperature); chart->addSeries(pressure); @@ -90,14 +95,20 @@ chart->addAxis(axisYP, Qt::AlignLeft); pressure->attachAxis(axisYP); - QChartView *chartView = new QChartView(chart); + chart->setAcceptHoverEvents(true); + + connect(temperature, &QSplineSeries::hovered, this, &ChartCarbonate::tooltip); + connect(pressure, &QSplineSeries::hovered, this, &ChartCarbonate::tooltip); + + chartView = new QChartView(chart); chartView->setRenderHint(QPainter::Antialiasing); - dialog->setLayout(new QVBoxLayout); + dialog->setLayout(new QHBoxLayout); dialog->layout()->addWidget(chartView); dialog->layout()->addWidget(buttonBox); QObject::connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept())); QObject::connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject())); + QObject::connect(saveButton, SIGNAL(clicked()), this, SLOT(savePNG())); dialog->setModal(true); dialog->exec(); @@ -106,3 +117,43 @@ ChartCarbonate::~ChartCarbonate() {} + +void ChartCarbonate::savePNG() +{ + QString path = QFileDialog::getSaveFileName(this, tr("Save Image"), QDir::homePath() + "/carbonation.png", tr("Image (*.png)")); + if (path.isEmpty()) { + QMessageBox::warning(this, tr("Save File"), tr("No image file selected.")); + return; + } + + QImage img((chartView->size()), QImage::Format_ARGB32); + QPainter painter; + painter.begin(&img); + chartView->render(&painter); + painter.setRenderHint(QPainter::Antialiasing); + painter.end(); + img.save(path); +} + + +void ChartCarbonate::tooltip(QPointF point, bool state) +{ + QAbstractSeries *series = qobject_cast<QAbstractSeries *>(sender()); + + if (t_tooltip == 0) + t_tooltip = new Callout(chart, series); + + if (state) { + QDateTime timeis = QDateTime::fromMSecsSinceEpoch(point.x()); + QString suffix = (series == temperature) ? "°C":" bar"; + t_tooltip->setSeries(series); + t_tooltip->setText(QString("%1\n%2%3").arg(timeis.toString("dd-MM-yyyy hh:mm")).arg(point.y(), 2, 'f', 1).arg(suffix)); + t_tooltip->setAnchor(point); + t_tooltip->setZValue(11); + t_tooltip->updateGeometry(); + t_tooltip->show(); + } else { + t_tooltip->hide(); + } +} +