From 33047fc047230c978678d745592a84f0b7d65c3c Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Mon, 30 Mar 2020 23:00:44 -0500
Subject: [PATCH] [nostalgia/core/studio] Remove Tile Count field from tile
 sheet importer

---
 src/nostalgia/core/studio/imgconv.cpp             | 15 ++++++---------
 src/nostalgia/core/studio/imgconv.hpp             |  2 +-
 .../core/studio/import_tilesheet_wizard.cpp       |  4 +---
 .../core/studio/import_tilesheet_wizard.hpp       |  1 -
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/nostalgia/core/studio/imgconv.cpp b/src/nostalgia/core/studio/imgconv.cpp
index 795ac5fe..fe83f1bb 100644
--- a/src/nostalgia/core/studio/imgconv.cpp
+++ b/src/nostalgia/core/studio/imgconv.cpp
@@ -56,26 +56,23 @@ namespace {
 	return colors.size();
 }
 
-[[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argSrc, int argTiles, int argBpp) {
-	constexpr auto TilePixels = PixelsPerTile;
+[[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argSrc, int argBpp) {
 	QImage src(argSrc);
 
 	if (src.isNull()) {
 		return {};
 	}
 
-	const auto Pixels = argTiles ? argTiles * TilePixels : src.width() * src.height();
-	if (argTiles == 0) {
-		argTiles = Pixels / PixelsPerTile;
-	}
-	const auto Colors = countColors(src, argTiles);
+	const auto Pixels = src.width() * src.height();
+	const auto Tiles = Pixels / PixelsPerTile;
+	const auto Colors = countColors(src, Tiles);
 	if (argBpp != 4 && argBpp != 8) {
 		argBpp = Colors > 16 ? 8 : 4;
 	}
 
 	QMap<QRgb, int> colors;
 	auto ng = std::make_unique<core::NostalgiaGraphic>();
-	ng->pal.colors.resize(countColors(src, argTiles));
+	ng->pal.colors.resize(countColors(src, Tiles));
 	if (argBpp == 4) {
 		ng->tiles.resize(Pixels / 2);
 	} else {
@@ -90,7 +87,7 @@ namespace {
 	for (int x = 0; x < src.width(); x++) {
 		for (int y = 0; y < src.height(); y++) {
 			auto destI = pointToIdx(src.width(), x, y);
-			if (destI < argTiles * PixelsPerTile) {
+			if (destI < Tiles * PixelsPerTile) {
 				const auto c = src.pixel(x, y);
 				// assign color a color id for the palette
 				if (!colors.contains(c)) {
diff --git a/src/nostalgia/core/studio/imgconv.hpp b/src/nostalgia/core/studio/imgconv.hpp
index 53489062..439c69ba 100644
--- a/src/nostalgia/core/studio/imgconv.hpp
+++ b/src/nostalgia/core/studio/imgconv.hpp
@@ -29,6 +29,6 @@ template<typename T>
 	return buff;
 }
 
-[[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argInPath, int argTiles, int argBpp = -1);
+[[nodiscard]] std::unique_ptr<core::NostalgiaGraphic> imgToNg(QString argInPath, int argBpp = -1);
 
 }
diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
index 5dd9ac53..372d78a9 100644
--- a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
+++ b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
@@ -32,7 +32,6 @@ ImportTilesheetWizardMainPage::ImportTilesheetWizardMainPage(const studio::Conte
 	auto fileTypes = "(*.png);;(*.bmp);;(*.jpg);;(*.jpeg)";
 	addPathBrowse(tr("Tile Sheet &Path:"), QString(ImportPath) + "*", "",
 	              QFileDialog::ExistingFile, fileTypes);
-	addLineEdit(tr("Til&es:"), QString(TileCount), "");
 }
 
 ImportTilesheetWizardPalettePage::ImportTilesheetWizardPalettePage(const studio::Context *ctx) {
@@ -43,13 +42,12 @@ ImportTilesheetWizardPalettePage::ImportTilesheetWizardPalettePage(const studio:
 int ImportTilesheetWizardPalettePage::accept() {
 	const auto tilesheetName = field(TileSheetName).toString();
 	const auto importPath = field(ImportPath).toString();
-	const auto tileCount = field(TileCount).toInt();
 	const auto paletteName = field(PaletteName).toString();
 	const auto outPath = TileSheetDir + tilesheetName + FileExt_ng;
 	if (!QFile(importPath).exists()) {
 		return OxError(1);
 	}
-	auto ng = imgToNg(importPath, tileCount, 0);
+	auto ng = imgToNg(importPath, 0);
 	if (!ng) {
 		return OxError(1);
 	}
diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
index 02c4b7a4..5af9d327 100644
--- a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
+++ b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
@@ -18,7 +18,6 @@ constexpr auto TileSheetName = "tilesheetName";
 constexpr auto ImportPath = "importPath";
 constexpr auto Palette = "palette";
 constexpr auto PaletteName = "paletteName";
-constexpr auto TileCount = "tileCount";
 
 class ImportTilesheetWizardMainPage: public studio::WizardFormPage {
 	private: