diff --git a/headers/bluerockbackend.h b/headers/bluerockbackend.h index 9377ae2..b9886e3 100644 --- a/headers/bluerockbackend.h +++ b/headers/bluerockbackend.h @@ -58,6 +58,7 @@ private: #endif const QStringList _validBaseDomains = {"digitalrock.de", "bluerock.dev"}; bool _pendingIntentsChecked; + signals: Q_INVOKABLE void openedViaUrl(QString url, QString scheme); diff --git a/resources/qml/main.qml b/resources/qml/main.qml index c6b3e84..e73273a 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -195,7 +195,7 @@ Window { //app.openAthlete() // dorian: 53139 , rustam: 6933 , helen: 53300 //openWidget({nation:'GER'}) //mainStack.push("Pages/AthleteSearchPage.qml") - openWidget({comp: 11651, cat: 26}) + //openWidget({comp: 11651, cat: 26}) //openWidget({person: 6623}) //console.log(JSON.stringify(serverConn.getParamsFromUrl(""))) //openWidgetFromUrl("https://l.bluerock.dev/?comp=11601&type=starters") @@ -563,8 +563,8 @@ Window { Product { id: speedFlowChartProduct - //identifier: "speed_flowchart" - identifier: "android.test.purchased" + identifier: "speed_flowchart" + //identifier: "android.test.purchased" //identifier: "android.test.canceled" //identifier: "android.test.refunded" diff --git a/sources/bluerockbackend.cpp b/sources/bluerockbackend.cpp index e37a9da..231a84f 100644 --- a/sources/bluerockbackend.cpp +++ b/sources/bluerockbackend.cpp @@ -123,6 +123,19 @@ void BlueRockBackend::shareResultsAsPoster(QString url, QString compName) { return; } + // dimensions + QRect qrCodeRect = QRect(276, 276, 1100, 1100); + + int compNameTextLineHeight = 44; + QFont compNameTextFont("OpenSans-Light"); + compNameTextFont.setPixelSize(compNameTextLineHeight); + QRect compNameTextRect = QRect( + 216, + 1670, + 1220, + 100 + ); + QPdfWriter writer(&file); writer.setPageSize(QPageSize(QSizeF(70.02, 99.02), QPageSize::Millimeter)); writer.setPageMargins(QMargins(0, 0, 0, 0)); @@ -133,17 +146,13 @@ void BlueRockBackend::shareResultsAsPoster(QString url, QString compName) { painter.drawPixmap(0,0, writer.width(), writer.height(), background); QPixmap barcode; - int size = 1100; - QZXingEncoderConfig encoderConfig(QZXing::EncoderFormat_QR_CODE, QSize(size, size), QZXing::EncodeErrorCorrectionLevel_H, false, false); + QZXingEncoderConfig encoderConfig(QZXing::EncoderFormat_QR_CODE, qrCodeRect.size(), QZXing::EncodeErrorCorrectionLevel_H, false, false); barcode.convertFromImage(QZXing::encodeData(url, encoderConfig)); - painter.drawPixmap(276, 276, size, size, barcode); + painter.drawPixmap(qrCodeRect, barcode); - QFont font("OpenSans-Light"); - font.setPixelSize(44); - painter.setFont(font); + painter.setFont(compNameTextFont); painter.setPen(Qt::black); - // QFontMetrics(painter.font()).size(Qt::TextSingleLine, "One ").width() - painter.drawText(QRect(216, 1670, 1220, 100), Qt::AlignLeft|Qt::AlignTop|Qt::TextWordWrap, rawCompName); + painter.drawText(compNameTextRect, Qt::AlignLeft|Qt::AlignBottom|Qt::TextWordWrap, rawCompName); painter.end(); file.close();