From ade0ed7fa9ad06a1dc1312e7abad8baf20f7b756 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 6 Feb 2017 09:37:13 +0100 Subject: Improve QQuickAsyncImageProvider example Also link it from more places Change-Id: Ib5fbf89f4a039f885e918d57ee477e9788049d8d Reviewed-by: Robin Burchell --- .../imageresponseprovider/imageresponseprovider.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'examples') diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.cpp b/examples/quick/imageresponseprovider/imageresponseprovider.cpp index a888c823a6..d4633b779a 100644 --- a/examples/quick/imageresponseprovider/imageresponseprovider.cpp +++ b/examples/quick/imageresponseprovider/imageresponseprovider.cpp @@ -51,37 +51,37 @@ class AsyncImageResponse : public QQuickImageResponse, public QRunnable { public: AsyncImageResponse(const QString &id, const QSize &requestedSize) - : m_id(id), m_requestedSize(requestedSize), m_texture(0) + : m_id(id), m_requestedSize(requestedSize) { setAutoDelete(false); } QQuickTextureFactory *textureFactory() const { - return m_texture; + return QQuickTextureFactory::textureFactoryForImage(m_image); } void run() { - QImage image(50, 50, QImage::Format_RGB32); + m_image = QImage(50, 50, QImage::Format_RGB32); if (m_id == "slow") { qDebug() << "Slow, red, sleeping for 5 seconds"; QThread::sleep(5); - image.fill(Qt::red); + m_image.fill(Qt::red); } else { qDebug() << "Fast, blue, sleeping for 1 second"; QThread::sleep(1); - image.fill(Qt::blue); + m_image.fill(Qt::blue); } if (m_requestedSize.isValid()) - image = image.scaled(m_requestedSize); - m_texture = QQuickTextureFactory::textureFactoryForImage(image); + m_image = m_image.scaled(m_requestedSize); + emit finished(); } QString m_id; QSize m_requestedSize; - QQuickTextureFactory *m_texture; + QImage m_image; }; class AsyncImageProvider : public QQuickAsyncImageProvider -- cgit v1.2.3 From 3e537dd3dcf5608241282d8437fb1593d2e6fa17 Mon Sep 17 00:00:00 2001 From: Ionut Alexandrescu Date: Fri, 3 Feb 2017 17:47:11 +0100 Subject: Fix smile qml example The mouth line was not closed and the right eye line was too big Change-Id: Ifea4a8dbdd38df3c83cd80491210585fcbb76d3c Reviewed-by: Simon Hausmann --- examples/quick/canvas/smile/smile.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/quick/canvas/smile/smile.qml b/examples/quick/canvas/smile/smile.qml index eebfee2d77..25e9d031de 100644 --- a/examples/quick/canvas/smile/smile.qml +++ b/examples/quick/canvas/smile/smile.qml @@ -101,14 +101,14 @@ Item { ctx.moveTo(75 + 50 * Math.cos(0), 75 - 50 * Math.sin(Math.PI*2)); ctx.arc(75,75,50,0,Math.PI*2,true); // Outer circle - ctx.moveTo(75,70); - ctx.arc(75,70,35,0,Math.PI,false); // Mouth (clockwise) - ctx.moveTo(60,65); - ctx.arc(60,65,5,0,Math.PI*2,true); // Left eye + ctx.moveTo(60,60); + ctx.arc(60,60,5,0,Math.PI*2,true); // Left eye ctx.moveTo(90 + 5 * Math.cos(0), 65 - 5 * Math.sin(Math.PI*2)); - ctx.moveTo(90,65); - ctx.arc(90,65,5,0,Math.PI*2,true); // Right eye + ctx.moveTo(90,60); + ctx.arc(90,60,5,-Math.PI,Math.PI*3,false); // Right eye + ctx.moveTo(75,70); + ctx.arc(75,70,35,0,Math.PI,false); // Mouth (clockwise) ctx.closePath(); if (canvas.fill) ctx.fill(); -- cgit v1.2.3