Break up KisVisualColorSelectorShape::getImageMap()

Lynx3d · Lynx3d · commit 0cb1e86ebef5 · 2019-09-05T21:28:20.000+02:00
- move rendering of the selector shape background into own function
  called renderBackground()
- move conversion from KoColor data array to QImage to helper function
  called convertImageMap()

This way it can be better specialized for optimizations.
diff --git a/libs/widgets/KisVisualColorSelectorShape.cpp b/libs/widgets/KisVisualColorSelectorShape.cpp
@@ -174,45 +174,60 @@ bool KisVisualColorSelectorShape::imagesNeedUpdate() const {
 QImage KisVisualColorSelectorShape::getImageMap()
 {
     //qDebug() << this  << ">>>>>>>>> getImageMap()" << m_d->imagesNeedUpdate;
-    const KisVisualColorSelector *selector = qobject_cast<KisVisualColorSelector*>(parent());
 
-    if (m_d->imagesNeedUpdate == true) {
+    if (m_d->imagesNeedUpdate) {
         // Fill a buffer with the right kocolors
-        quint8 *data = new quint8[width() * height() * m_d->colorSpace->pixelSize()];
-        quint8 *dataPtr = data;
-        QVector4D coordinates = m_d->currentChannelValues;
-        for (int y = 0; y < height(); y++) {
-            for (int x=0; x < width(); x++) {
-                QPointF newcoordinate = convertWidgetCoordinateToShapeCoordinate(QPoint(x, y));
-                coordinates[m_d->channel1] = newcoordinate.x();
-                if (m_d->dimension == Dimensions::twodimensional){
-                    coordinates[m_d->channel2] = newcoordinate.y();
-                }
-                KoColor c = selector->convertShapeCoordsToKoColor(coordinates);
-                memcpy(dataPtr, c.data(), m_d->colorSpace->pixelSize());
-                dataPtr += m_d->colorSpace->pixelSize();
-            }
-        }
-        // Convert the buffer to a qimage
-        if (m_d->displayRenderer) {
-            m_d->gradient = m_d->displayRenderer->convertToQImage(m_d->colorSpace, data, width(), height());
-        }
-        else {
-            m_d->gradient = m_d->colorSpace->convertToQImage(data, width(), height(), 0, KoColorConversionTransformation::internalRenderingIntent(), KoColorConversionTransformation::internalConversionFlags());
-        }
-        delete[] data;
-
+        m_d->gradient = renderBackground(m_d->currentChannelValues, m_d->colorSpace->pixelSize());
         m_d->imagesNeedUpdate = false;
-        // safeguard:
-        if (m_d->gradient.isNull())
-        {
-            m_d->gradient = QImage(width(), height(), QImage::Format_ARGB32);
-            m_d->gradient.fill(Qt::black);
-        }
     }
     return m_d->gradient;
 }
 
+QImage KisVisualColorSelectorShape::convertImageMap(const quint8 *rawColor, quint32 size) const
+{
+    Q_ASSERT(size == width()*height()*m_d->colorSpace->pixelSize());
+    QImage image;
+    // Convert the buffer to a qimage
+    if (m_d->displayRenderer) {
+        image = m_d->displayRenderer->convertToQImage(m_d->colorSpace, rawColor, width(), height());
+    }
+    else {
+        image = m_d->colorSpace->convertToQImage(rawColor, width(), height(), 0, KoColorConversionTransformation::internalRenderingIntent(), KoColorConversionTransformation::internalConversionFlags());
+    }
+    // safeguard:
+    if (image.isNull())
+    {
+        image = QImage(width(), height(), QImage::Format_ARGB32);
+        image.fill(Qt::black);
+    }
+
+    return image;
+}
+
+QImage KisVisualColorSelectorShape::renderBackground(const QVector4D &channelValues, quint32 pixelSize) const
+{
+    const KisVisualColorSelector *selector = qobject_cast<KisVisualColorSelector*>(parent());
+    Q_ASSERT(selector);
+
+    quint32 imageSize = width() * height() * m_d->colorSpace->pixelSize();
+    QScopedArrayPointer<quint8> raw(new quint8[imageSize] {});
+    quint8 *dataPtr = raw.data();
+    QVector4D coordinates = channelValues;
+    for (int y = 0; y < height(); y++) {
+        for (int x=0; x < width(); x++) {
+            QPointF newcoordinate = convertWidgetCoordinateToShapeCoordinate(QPoint(x, y));
+            coordinates[m_d->channel1] = newcoordinate.x();
+            if (m_d->dimension == Dimensions::twodimensional){
+                coordinates[m_d->channel2] = newcoordinate.y();
+            }
+            KoColor c = selector->convertShapeCoordsToKoColor(coordinates);
+            memcpy(dataPtr, c.data(), pixelSize);
+            dataPtr += pixelSize;
+        }
+    }
+    return convertImageMap(raw.data(), imageSize);
+}
+
 void KisVisualColorSelectorShape::mousePressEvent(QMouseEvent *e)
 {
     if (e->button()==Qt::LeftButton) {
diff --git a/libs/widgets/KisVisualColorSelectorShape.h b/libs/widgets/KisVisualColorSelectorShape.h
@@ -172,6 +172,24 @@ public Q_SLOTS:
     void updateFromChangedDisplayRenderer();
 
 protected:
+    /**
+     * @brief convertImageMap
+     * convert image data containing raw KoColor data into a QImage
+     * @param data must point to memory of size width()*height()*pixelSize
+     * @param size the number of bytes to read from data, must match aforementioned cirteria
+     * @return the converted QImage guaranteed to match the widget size (black content on failure)
+     */
+    QImage convertImageMap(const quint8 *rawColor, quint32 size) const;
+    /**
+     * @brief renderBackground
+     * Render the widget background visible inside the widget's mask in current color space
+     * Rendering shall be done with the conversion functions of KisVisualColorSelector
+     * @param data points to zero-initialized memory of size width()*height()*pixelSize
+     * @param pixelSize the data size to transfer from KoColor::data() to data per pixel
+     * in the current color space
+     * @param channelValues the normalized channel values of the currently picked color
+     */
+    virtual QImage renderBackground(const QVector4D &channelValues, quint32 pixelSize) const;
 
     void mousePressEvent(QMouseEvent *e) override;
     void mouseMoveEvent(QMouseEvent *e) override;
