git.iko.soy/unity8
on xenial help sign in
It's the source being valid only that should trigger the network request
e8a9d98Albert Astals
plugins/Dash/croppedimagesizer.cpp+39−22
compare with xenial
unifiedsplit
@@ -26,6 +26,7 @@
26CroppedImageSizer::CroppedImageSizer()
26CroppedImageSizer::CroppedImageSizer()
27{
27{
28 connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
28 connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
29+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::updateImageSize);
29}
30}
30
31
31CroppedImageSizer::~CroppedImageSizer()
32CroppedImageSizer::~CroppedImageSizer()
@@ -44,7 +45,7 @@ void CroppedImageSizer::setSource(const QUrl &source)
44{
45{
45 if (source != m_source) {
46 if (source != m_source) {
46 m_source = source;
47 m_source = source;
47− Q_EMIT inputParamsChanged();
48+ Q_EMIT sourceChanged();
48 }
49 }
49}
50}
50
51
@@ -79,43 +80,59 @@ QSize CroppedImageSizer::sourceSize() const
79 return m_sourceSize;
80 return m_sourceSize;
80}
81}
81
82
82−void CroppedImageSizer::calculateSourceSize()
83+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)
83{
84{
85+ if (sourceSize != m_sourceSize) {
86+ m_sourceSize = sourceSize;
87+ Q_EMIT sourceSizeChanged();
88+ }
89+}
90+
91+void CroppedImageSizer::updateImageSize()
92+{
93+ if (m_reply) {
94+ m_reply->disconnect();
95+ m_reply->abort();
96+ m_reply->deleteLater();
97+ m_reply = nullptr;
98+ }
99+
84− if (m_source.isValid() && m_width > 0 && m_height > 0 && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {
100+ if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {
85− if (m_reply) {
86− m_reply->disconnect();
87− m_reply->abort();
88− m_reply->deleteLater();
89− }
90 QNetworkRequest request(m_source);
101 QNetworkRequest request(m_source);
91 m_reply = qmlEngine(this)->networkAccessManager()->get(request);
102 m_reply = qmlEngine(this)->networkAccessManager()->get(request);
92 connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizer::requestFinished);
103 connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizer::requestFinished);
104+ } else {
105+ setSourceSize(QSize(-1, -1));
93 }
106 }
94}
107}
95
108
96void CroppedImageSizer::requestFinished()
109void CroppedImageSizer::requestFinished()
97{
110{
98 QImageReader m_reader(m_reply);
111 QImageReader m_reader(m_reply);
99− const QSize imageSize = m_reader.size();
112+ m_imageSize = m_reader.size();
100− if (imageSize.isValid()) {
113+
101− if (m_height > 0 && imageSize.height() > 0) {
114+ m_reply->deleteLater();
115+ m_reply = nullptr;
116+
117+ calculateSourceSize();
118+}
119+
120+void CroppedImageSizer::calculateSourceSize()
121+{
122+ if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_reply) {
123+ if (!m_imageSize.isEmpty()) {
102 const qreal ar = m_width / m_height;
124 const qreal ar = m_width / m_height;
103− const qreal ssar = imageSize.width() / (qreal)imageSize.height();
125+ const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();
104 if (ar > ssar) {
126 if (ar > ssar) {
105− m_sourceSize = QSize(m_width, 0);
127+ setSourceSize(QSize(m_width, 0));
106 } else {
128 } else {
107− m_sourceSize = QSize(0, m_height);
129+ setSourceSize(QSize(0, m_height));
108 }
130 }
109 } else {
131 } else {
110− qWarning() << "Invalid height parameter or image height" << m_height << imageSize.height();
132+ qWarning() << "Invalid size for " << m_source << m_imageSize << m_reply;
111− m_sourceSize = QSize(0, 0);
133+ setSourceSize(QSize(0, 0));
112 }
134 }
113 } else {
135 } else {
114− qWarning() << "Could not find size of" << m_source;
136+ setSourceSize(QSize(-1, -1));
115− m_sourceSize = QSize(0, 0);
116 }
137 }
117− sourceSizeChanged();
118−
119− m_reply->deleteLater();
120− m_reply = nullptr;
121}
138}
plugins/Dash/croppedimagesizer.h+5−1
@@ -28,7 +28,7 @@ class CroppedImageSizer : public QObject
28{
28{
29 Q_OBJECT
29 Q_OBJECT
30
30
31− Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY inputParamsChanged)
31+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
32 Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)
32 Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)
33 Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)
33 Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)
34 Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
34 Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
@@ -47,20 +47,24 @@ public:
47 void setHeight(qreal height);
47 void setHeight(qreal height);
48
48
49 QSize sourceSize() const;
49 QSize sourceSize() const;
50+ void setSourceSize(const QSize &sourceSize);
50
51
51Q_SIGNALS:
52Q_SIGNALS:
52 void inputParamsChanged();
53 void inputParamsChanged();
54+ void sourceChanged();
53 void sourceSizeChanged();
55 void sourceSizeChanged();
54
56
55private Q_SLOT:
57private Q_SLOT:
56 void calculateSourceSize();
58 void calculateSourceSize();
57 void requestFinished();
59 void requestFinished();
60+ void updateImageSize();
58
61
59private:
62private:
60 QUrl m_source;
63 QUrl m_source;
61 qreal m_width = 0;
64 qreal m_width = 0;
62 qreal m_height = 0;
65 qreal m_height = 0;
63 QSize m_sourceSize = QSize(-1, -1);
66 QSize m_sourceSize = QSize(-1, -1);
67+ QSize m_imageSize;
64 QNetworkReply *m_reply = nullptr;
68 QNetworkReply *m_reply = nullptr;
65};
69};
66
70