Add color search feature

include/ui/imageproviders.h

@@ -11,14 +11,14 @@ class Layout;
 QImage getCollisionMetatileImage(Block);
 QImage getCollisionMetatileImage(int, int);
 
-QImage getMetatileImage(uint16_t, Layout*, bool useTruePalettes = false);
-QImage getMetatileImage(Metatile*, Layout*, bool useTruePalettes = false);
-QImage getMetatileImage(uint16_t, Tileset*, Tileset*, const QList<int>&, const QList<float>& = {}, bool useTruePalettes = false);
-QImage getMetatileImage(Metatile*, Tileset*, Tileset*, const QList<int>&, const QList<float>& = {}, bool useTruePalettes = false);
+QImage getMetatileImage(uint16_t, const Layout*, bool useTruePalettes = false);
+QImage getMetatileImage(const Metatile*, const Layout*, bool useTruePalettes = false);
+QImage getMetatileImage(uint16_t, const Tileset*, const Tileset*, const QList<int>& = {0,1,2}, const QList<float>& = {}, bool useTruePalettes = false);
+QImage getMetatileImage(const Metatile*, const Tileset*, const Tileset*, const QList<int>& = {0,1,2}, const QList<float>& = {}, bool useTruePalettes = false);
 
-QImage getMetatileSheetImage(Layout *layout, int numMetatilesWIde, bool useTruePalettes = false);
-QImage getMetatileSheetImage(Tileset *primaryTileset,
-                             Tileset *secondaryTileset,
+QImage getMetatileSheetImage(const Layout *layout, int numMetatilesWIde, bool useTruePalettes = false);
+QImage getMetatileSheetImage(const Tileset *primaryTileset,
+                             const Tileset *secondaryTileset,
                              uint16_t metatileIdStart,
                              uint16_t metatileIdEnd,
                              int numMetatilesWIde,
@@ -26,8 +26,8 @@ QImage getMetatileSheetImage(Tileset *primaryTileset,
                              const QList<float> &layerOpacity = {},
                              const QSize &metatileSize = Metatile::pixelSize(),
                              bool useTruePalettes = false);
-QImage getMetatileSheetImage(Tileset *primaryTileset,
-                             Tileset *secondaryTileset,
+QImage getMetatileSheetImage(const Tileset *primaryTileset,
+                             const Tileset *secondaryTileset,
                              int numMetatilesWide,
                              const QList<int> &layerOrder,
                              const QList<float> &layerOpacity = {},
@@ -36,9 +36,9 @@ QImage getMetatileSheetImage(Tileset *primaryTileset,
 
 
 QImage getTileImage(uint16_t, const Tileset*, const Tileset*);
-QImage getPalettedTileImage(uint16_t, Tileset*, Tileset*, int, bool useTruePalettes = false);
-QImage getColoredTileImage(uint16_t tileId, Tileset *primaryTileset, Tileset *secondaryTileset, const QList<QRgb> &palette);
-QImage getGreyscaleTileImage(uint16_t tileId, Tileset *primaryTileset, Tileset *secondaryTileset);
+QImage getPalettedTileImage(uint16_t, const Tileset*, const Tileset*, int, bool useTruePalettes = false);
+QImage getColoredTileImage(uint16_t tileId, const Tileset *, const Tileset *, const QList<QRgb> &palette);
+QImage getGreyscaleTileImage(uint16_t tileId, const Tileset *, const Tileset *);
 
 void flattenTo4bppImage(QImage * image);
 

include/ui/numericsorttableitem.h

@@ -0,0 +1,20 @@
+#ifndef NUMERICSORTTABLEITEM_H
+#define NUMERICSORTTABLEITEM_H
+
+#include <QTableWidgetItem>
+#include <QCollator>
+
+class NumericSortTableItem : public QTableWidgetItem
+{
+public:
+    explicit NumericSortTableItem(const QString &text) : QTableWidgetItem(text) {};
+
+protected:
+    virtual bool operator<(const QTableWidgetItem &other) const override {
+        QCollator collator;
+        collator.setNumericMode(true);
+        return collator.compare(text(), other.text()) < 0;
+    }
+};
+
+#endif // NUMERICSORTTABLEITEM_H

include/ui/palettecolorsearch.h

@@ -0,0 +1,67 @@
+#ifndef PALETTECOLORSEARCH_H
+#define PALETTECOLORSEARCH_H
+
+#include <QDialog>
+#include <QIcon>
+#include <QMap>
+
+class Tileset;
+class Project;
+
+namespace Ui {
+class PaletteColorSearch;
+}
+
+class PaletteColorSearch : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit PaletteColorSearch(Project *project,
+                                const Tileset *primaryTileset,
+                                const Tileset *secondaryTileset,
+                                QWidget *parent = nullptr);
+    ~PaletteColorSearch();
+
+    void setPaletteId(int paletteId);
+    int currentPaletteId() const;
+
+    void setColorId(int colorId);
+    int currentColorId() const;
+
+    void setTilesets(const Tileset *primaryTileset, const Tileset *secondaryTileset);
+    const Tileset* currentTileset() const;
+
+signals:
+    void metatileSelected(uint16_t metatileId);
+    void paletteIdChanged(int paletteId);
+
+private:
+    struct RowData {
+        QString tilesetName;
+        QString pairedTilesetName;
+        QString metatileId;
+        QIcon metatileIcon;
+    };
+
+    enum ResultsColumn {
+        TilesetName,
+        Metatile,
+    };
+
+    Ui::PaletteColorSearch *ui;
+    Project *m_project;
+    const Tileset *m_primaryTileset;
+    const Tileset *m_secondaryTileset;
+
+    QMap<QString,QList<RowData>> m_resultsCache;
+
+    void addTableEntry(const RowData &rowData);
+    QList<RowData> search(int colorId) const;
+    QList<RowData> search(int colorId, const Tileset *tileset, const Tileset *pairedTileset) const;
+    void refresh();
+    void updateResults();
+    void cellDoubleClicked(int row, int col);
+};
+
+#endif // PALETTECOLORSEARCH_H

include/ui/paletteeditor.h

@@ -2,10 +2,12 @@
 #define PALETTEEDITOR_H
 
 #include <QMainWindow>
+#include <QPointer>
 
 #include "colorinputwidget.h"
 #include "project.h"
 #include "history.h"
+#include "palettecolorsearch.h"
 
 namespace Ui {
 class PaletteEditor;
@@ -32,27 +34,31 @@ public:
 
     bool showingUnusedColors() const;
 
+signals:
+    void metatileSelected(uint16_t metatileId);
+
 private:
     Ui::PaletteEditor *ui;
-    Project *project = nullptr;
-    QList<ColorInputWidget*> colorInputs;
-
+    Project *project;
     Tileset *primaryTileset;
     Tileset *secondaryTileset;
 
+    QList<ColorInputWidget*> colorInputs;
     QList<History<PaletteHistoryItem*>> palettesHistory;
     QMap<int,QSet<int>> unusedColorCache;
+    QPointer<PaletteColorSearch> colorSearchWindow;
 
     Tileset* getTileset(int paletteId) const;
     void refreshColorInputs();
+    void refreshPaletteId();
     void commitEditHistory();
     void commitEditHistory(int paletteId);
     void restoreWindowState();
-    void onWindowActivated();
     void invalidateCache();
     void closeEvent(QCloseEvent*);
     void setColorInputTitles(bool show);
-    QSet<int> getUnusedColorIds() const;
+    QSet<int> getUnusedColorIds();
+    void openColorSearch();
 
     void setRgb(int index, QRgb rgb);
     void setPalette(int paletteId, const QList<QRgb> &palette);
@@ -67,7 +73,6 @@ signals:
     void changedPaletteColor();
     void changedPalette(int);
 private slots:
-    void on_spinBox_PaletteId_valueChanged(int arg1);
     void on_actionUndo_triggered();
     void on_actionRedo_triggered();
     void on_actionImport_Palette_triggered();

include/ui/tileseteditor.h

@@ -2,6 +2,7 @@
 #define TILESETEDITOR_H
 
 #include <QMainWindow>
+#include <QPointer>
 #include "project.h"
 #include "history.h"
 #include "paletteeditor.h"
@@ -54,6 +55,9 @@ public:
 
     QObjectList shortcutableObjects() const;
 
+    void setPaletteId(int paletteId);
+    int paletteId() const;
+
 public slots:
     void applyUserShortcuts();
     void onSelectedMetatileChanged(uint16_t);
@@ -65,13 +69,9 @@ private slots:
     void onHoveredTileChanged(const Tile&);
     void onHoveredTileChanged(uint16_t);
     void onHoveredTileCleared();
-    void onSelectedTilesChanged();
     void onMetatileLayerTileChanged(int, int);
     void onMetatileLayerSelectionChanged(QPoint, int, int);
     void onPaletteEditorChangedPaletteColor();
-    void onPaletteEditorChangedPalette(int);
-
-    void on_spinBox_paletteSelector_valueChanged(int arg1);
 
     void on_actionChange_Metatiles_Count_triggered();
 
@@ -136,23 +136,20 @@ private:
     void commitTerrainType();
     void commitLayerType();
     void setRawAttributesVisible(bool visible);
-    void setXFlip(bool enabled);
-    void setYFlip(bool enabled);
+    void refreshTileFlips();
+    void refreshPaletteId();
 
     Ui::TilesetEditor *ui;
     History<MetatileHistoryItem*> metatileHistory;
     TilesetEditorMetatileSelector *metatileSelector = nullptr;
     TilesetEditorTileSelector *tileSelector = nullptr;
     MetatileLayersItem *metatileLayersItem = nullptr;
-    PaletteEditor *paletteEditor = nullptr;
+    QPointer<PaletteEditor> paletteEditor = nullptr;
     Project *project = nullptr;
     Layout *layout = nullptr;
     Metatile *metatile = nullptr;
     Metatile *copiedMetatile = nullptr;
     QString copiedMetatileLabel;
-    int paletteId;
-    bool tileXFlip;
-    bool tileYFlip;
     bool hasUnsavedChanges;
     Tileset *primaryTileset = nullptr;
     Tileset *secondaryTileset = nullptr;

include/ui/wildmonsearch.h

@@ -2,24 +2,11 @@
 #define WILDMONSEARCH_H
 
 #include <QDialog>
-#include <QTableWidgetItem>
-#include <QCollator>
+
+#include "numericsorttableitem.h"
 
 class Project;
 
-class NumericSortTableItem : public QTableWidgetItem
-{
-public:
-    explicit NumericSortTableItem(const QString &text) : QTableWidgetItem(text) {};
-
-protected:
-    virtual bool operator<(const QTableWidgetItem &other) const override {
-        QCollator collator;
-        collator.setNumericMode(true);
-        return collator.compare(text(), other.text()) < 0;
-    }
-};
-
 namespace Ui {
 class WildMonSearch;
 }