piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2896: draw curves without using temporary disk files

Browse Source
This commit is contained in:
Damjan Adamic
2015-09-19 18:19:08 +02:00
parent 7134f38ad5
commit 365d2b6c58
6 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+5 -25
View File
@@ -17,9 +17,6 @@ ModelPrinter::ModelPrinter(Firmware * firmware, const GeneralSettings & generalS
ModelPrinter::~ModelPrinter()
{
foreach(QString filename, curvefiles) {
qunlink(filename);
}
}
void debugHtml(const QString & html)
@@ -620,29 +617,12 @@ void CurveImage::drawCurve(const CurveData & curve, QColor color)
}
}
void CurveImage::save(const QString & filename)
{
image.save(filename, "png", 100);
}
QString ModelPrinter::createCurveImage(int idx)
QString ModelPrinter::createCurveImage(int idx, QTextDocument * document)
{
CurveImage image;
image.drawCurve(model.curves[idx], colors[idx]);
QString filename = generateProcessUniqueTempFileName(QString("curve-%1-%2.png").arg((uint64_t)this).arg(idx));
image.save(filename);
curvefiles << filename;
return filename;
}
QString ModelPrinter::createCurvesImage()
{
CurveImage image;
for (int idx=0; idx<firmware->getCapability(NumCurves); idx++) {
image.drawCurve(model.curves[idx], colors[idx]);
}
QString filename = generateProcessUniqueTempFileName(QString("curves-%1.png").arg((uint64_t)this));
image.save(filename);
curvefiles << filename;
return filename;
QString filename = QString("curve-%1-%2.png").arg((uint64_t)this).arg(idx);
if (document) document->addResource(QTextDocument::ImageResource, QUrl(filename), image.get());
// qDebug() << "ModelPrinter::createCurveImage()" << idx << filename;
return ":" + filename;
}