Tileset: Added isPalettedFormat() so you don't have to check manually

Author: LoxoSoftware

canvas.cpp

@@ -153,7 +153,7 @@ void Canvas::RedrawTile(int row, int column)
         QPixmap pix;
         QTransform trans= QTransform();
 
-        if (project.tileset.format == Tileset::GBA_4bpp)
+        if (project.tileset.isPalettedFormat())
         {
             //Clamp 256 color indexes to 16 colors of one of 16 palettes
             QImage pix_tf= project.tileset.tiles[ttile->tileset_offset];
@@ -216,7 +216,7 @@ void Canvas::OpenContextMenu(QPoint screen_pos, QPoint canvas_pos)
         context_menu_palette_sel->addAction(""+QString::number(i));
     }
     connect(context_menu_palette_sel, &QMenu::triggered, this, &Canvas::onMenuChangePal_triggered);
-    context_menu_palette_sel->setEnabled(project.tileset.format == Tileset::GBA_4bpp);
+    context_menu_palette_sel->setEnabled(project.tileset.isPalettedFormat());
     context_menu->addAction("Flip tile horizontally");
     context_menu->actions().last()->setCheckable(true);
     context_menu->actions().last()->setChecked(tiles[tilen].hflip);
@@ -417,7 +417,7 @@ QImage Canvas::GetImage()
                 for (int ix=0; ix<TILE_W; ix++)
                 {
                     unsigned char pixel= tile_scanline[ix];
-                    if (project.tileset.format == Tileset::GBA_4bpp)
+                    if (project.tileset.isPalettedFormat())
                         pixel= tiles[tm_ti].palette_index*PALETTE_W+pixel%PALETTE_W;
 
                     if (!tiles[tm_ti].hflip)

exportdialog.cpp

@@ -12,8 +12,8 @@ ExportDialog::ExportDialog(QWidget *parent)
 {
     ui->setupUi(this);
 
-    ui->rdbGBA4bpp->setChecked(project.tileset.format == Tileset::GBA_4bpp);
-    ui->rdbGBA8bpp->setChecked(project.tileset.format == Tileset::GBA_8bpp);
+    ui->rdbGBA4bpp->setChecked(project.tileset.isPalettedFormat());
+    ui->rdbGBA8bpp->setChecked(!project.tileset.isPalettedFormat());
 }
 
 ExportDialog::~ExportDialog()

mainwindow.cpp

@@ -78,17 +78,7 @@ void MainWindow::ChangeTileFormat(Tileset::tile_format_t format)
     ui->actionGBA_8bpp->setChecked(format==Tileset::GBA_8bpp);
     ui->actionGBA_4bpp->setChecked(format==Tileset::GBA_4bpp);
 
-    switch (format)
-    {
-    case Tileset::GBA_4bpp:
-        ui->actionTilePicker_selected_pal->setEnabled(true);
-        break;
-    case Tileset::GBA_8bpp:
-        ui->actionTilePicker_selected_pal->setEnabled(false);
-        break;
-    default:
-        break;
-    }
+    ui->actionTilePicker_selected_pal->setEnabled(project.tileset.isPalettedFormat());
 
     if (project.editor_canvas)
         project.editor_canvas->Redraw();
@@ -202,7 +192,7 @@ void MainWindow::on_actionOptimize_tileset_triggered()
         QMessageBox::critical(this, "Optimize tileset", "Please import a tileset first!");
         return;
     }
-    unsigned int optiflags= OptimizeDialog(this).GetFlags(project.tileset.format==Tileset::GBA_4bpp);
+    unsigned int optiflags= OptimizeDialog(this).GetFlags(project.tileset.isPalettedFormat());
     if (!(optiflags&0x80))
         return; //User rejected on the dialog
     project.tileset.tiles= project.tileset.Optimized(&project.editor_canvas->tiles, optiflags&0x7F);
@@ -278,7 +268,7 @@ void MainWindow::on_actionGBA_4bpp_triggered()
 
 void MainWindow::on_actionTilePicker_selected_pal_triggered()
 {
-    if (isTilePicker_ViewSelPal() && project.tileset.format == Tileset::GBA_4bpp)
+    if (isTilePicker_ViewSelPal() && project.tileset.isPalettedFormat())
         dckTilePicker->Update();
 }
 

paletteedit.cpp

@@ -44,7 +44,7 @@ void PaletteEdit::Update()
                 int lumarand= rand()%32;
                 bru_bg.setColor(QColor::fromRgb(lumarand*8, lumarand*8, lumarand*8));
             }
-            if (project.tileset.format == Tileset::GBA_4bpp)
+            if (project.tileset.isPalettedFormat())
             {
                 if (project.paltable_current_row == iy && project.paltable_current_column == ix)
                     bru_bg.setStyle(Qt::Dense3Pattern);
@@ -61,7 +61,7 @@ void PaletteEdit::Update()
                     bru_bg.setStyle(Qt::SolidPattern);
             }
             item->setBackground(bru_bg);
-            if (project.tileset.format == Tileset::GBA_4bpp)
+            if (project.tileset.isPalettedFormat())
                 item->setToolTip("Pal #"+QString::number(iy)+": "+QString::number(ix));
             else
                 item->setToolTip("Index: "+QString::number(ix+iy*PALETTE_W));

tile.cpp

@@ -223,3 +223,14 @@ void Tileset::UpdatePalettes()
         tiles[it].setColorTable(palette);
     }
 }
+
+bool Tileset::isPalettedFormat()
+{
+    switch (format)
+    {
+        case Tileset::GBA_4bpp:
+            return true;
+        default:
+            return false;
+    }
+}

tile.h

@@ -51,6 +51,8 @@ class Tileset
     void            UpdatePalettes();
     QVector<QImage> Optimized(QList<Tile>* tilemap, Tileset::optimize_flags_t optiflags);
     void            RebuildTilesetImage(int columns=16);
+
+    bool            isPalettedFormat();
 };
 
 #endif // TILE_HPP

tilepicker.cpp

@@ -41,7 +41,7 @@ void TilePicker::Update()
                 break;
 
             QPixmap pix;
-            if (main_window->isTilePicker_ViewSelPal() && project.tileset.format == Tileset::GBA_4bpp)
+            if (main_window->isTilePicker_ViewSelPal() && project.tileset.isPalettedFormat())
             {
                 QImage timg= project.tileset.tiles[tindex];
                 //Alter image pixels to clamp it to a 16 bit palette