Calibrator: Added colour select button

Not yet with a list of existing frame colours and pallete yet.

Author: Wohlstand

PlayableCalibrator/CMakeLists.txt

@@ -181,6 +181,14 @@ if(QT_PTHREAD)
     target_link_libraries(PGE_Calibrator_QtLibs INTERFACE ${QT_PTHREAD})
 endif()
 
+string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+if(${CMAKE_BUILD_TYPE_LOWER} STREQUAL "debug")
+    target_compile_definitions(pge_calibrator
+        PRIVATE
+        -DDEBUG_BUILD
+    )
+endif()
+
 add_dependencies(pge_calibrator
     FreeImage_Local
     libpng_Local

PlayableCalibrator/_resources/edit/edit_colour.png

@@ -43,5 +43,6 @@
         <file>edit/zoom_out.png</file>
         <file>images/picture.png</file>
         <file>edit/quick_actions.png</file>
+        <file>edit/edit_colour.png</file>
     </qresource>
 </RCC>

PlayableCalibrator/_resources/images.qrc

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QStatusBar>
 #include <QFocusEvent>
+#include <QColorDialog>
 
 #include "image_calibrator.h"
 #include <ui_image_calibrator.h>
@@ -94,6 +95,8 @@ ImageCalibrator::ImageCalibrator(Calibration *conf, QWidget *parent) :
 
     QObject::connect(ui->toolDrag, &QToolButton::clicked,
                      this, &ImageCalibrator::toolChanged);
+    QObject::connect(ui->toolColour, &QToolButton::clicked,
+                     this, &ImageCalibrator::pickColour);
     QObject::connect(ui->toolSelect, &QToolButton::clicked,
                      this, &ImageCalibrator::toolChanged);
     QObject::connect(ui->toolSelectCopy, &QToolButton::clicked,
@@ -206,6 +209,8 @@ ImageCalibrator::ImageCalibrator(Calibration *conf, QWidget *parent) :
                      this, &ImageCalibrator::toolFlipFrameH);
     QObject::connect(ui->preview, &FrameTuneScene::actionFrameFlipedV,
                      this, &ImageCalibrator::toolFlipFrameV);
+    QObject::connect(ui->preview, &FrameTuneScene::drawColourChanged,
+                     this, &ImageCalibrator::refreshColours);
 }
 
 ImageCalibrator::~ImageCalibrator()
@@ -953,6 +958,7 @@ void ImageCalibrator::updateScene()
     auto &his = m_history[m_frmX][m_frmY];
     ui->toolUndo->setEnabled(his.canUndo());
     ui->toolRedo->setEnabled(his.canRedo());
+    refreshColours();
 }
 
 void ImageCalibrator::saveCalibrates()
@@ -1177,6 +1183,54 @@ void ImageCalibrator::toolChanged(bool)
     }
 }
 
+void ImageCalibrator::pickColour()
+{
+    QColorDialog d(this);
+    d.setOptions(QColorDialog::DontUseNativeDialog);
+
+    int idx = 0;
+    for(auto &c : m_recent_colours)
+        d.setCustomColor(idx, c);
+
+    d.setCurrentColor(ui->preview->getDrawColour());
+
+    if(d.exec() == QDialog::Accepted)
+    {
+        int num = d.customCount();
+        m_recent_colours.clear();
+
+        for(int i = 0; i < num; ++i)
+            m_recent_colours.insert(d.customColor(i));
+
+        ui->preview->setDrawColour(d.currentColor());
+    }
+}
+
+void ImageCalibrator::refreshColours()
+{
+    if(m_imgOffsets.empty())
+        return; // Otherwise will fail
+
+    m_frame_colours.clear();
+
+    QImage f = getCurrentFrame().toImage();
+
+    for(int y = 0; y < f.height(); ++y)
+    {
+        for(int x = 0; x < f.width(); ++x)
+        {
+            QColor pix = f.pixelColor(x, y);
+
+            if(!m_frame_colours.contains(pix))
+                m_frame_colours.insert(pix);
+        }
+    }
+
+    QImage c = QImage(16, 16, QImage::Format_ARGB32);
+    c.fill(ui->preview->getDrawColour());
+    ui->toolColour->setIcon(QIcon(QPixmap::fromImage(c)));
+}
+
 void ImageCalibrator::tempFrameUpdated(const QString &path)
 {
     if(!m_pendingFileToUpdate.isEmpty())

PlayableCalibrator/image_calibration/image_calibrator.cpp

@@ -5,6 +5,7 @@
 #include <QDialog>
 #include <QPixmap>
 #include <QImage>
+#include <QSet>
 #include <QList>
 #include <QMenu>
 #include <QFileSystemWatcher>
@@ -21,6 +22,11 @@ class CalibrationMain;
 class Matrix;
 class QStatusBar;
 
+inline uint qHash(const QColor &key, uint seed)
+{
+    return qHash(key.rgba(), seed);
+}
+
 class ImageCalibrator : public QDialog
 {
     Q_OBJECT
@@ -31,6 +37,9 @@ class ImageCalibrator : public QDialog
     CalibrationMain *m_mw = nullptr;
     QStatusBar *m_status = nullptr;
 
+    QSet<QColor> m_recent_colours;
+    QSet<QColor> m_frame_colours;
+
     struct FrameHistory
     {
         int state = -1;
@@ -159,6 +168,8 @@ private slots:
     void on_openFrameInEditor_clicked();
 
     void toolChanged(bool);
+    void pickColour();
+    void refreshColours();
 
 
 private:

PlayableCalibrator/image_calibration/image_calibrator.h

@@ -82,6 +82,23 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QToolButton" name="toolColour">
+        <property name="toolTip">
+         <string>Changes current draw colour (affects pencil, line, and rectangle tools).</string>
+        </property>
+        <property name="text">
+         <string>Draw colour</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../_resources/images.qrc">
+          <normaloff>:/edit/edit_colour.png</normaloff>:/edit/edit_colour.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QToolButton" name="toolSelect">
         <property name="toolTip">