Merge pull request #1451 from OutpostUniverse/AddListboxToResearchReport

Add listbox to research report

Author: ldicker83

OPHD/UI/Reports/ResearchReport.cpp

@@ -3,7 +3,6 @@
 #include <NAS2D/Utility.h>
 #include <NAS2D/EventHandler.h>
 #include <NAS2D/Renderer/Renderer.h>
-#include <NAS2D/Math/Rectangle.h>
 
 #include "../../Constants/UiConstants.h"
 #include "../../Cache.h"
@@ -38,19 +37,22 @@ namespace
 	constexpr NAS2D::Vector<int> CategorySelectorPadding{2, 2};
 	constexpr NAS2D::Vector<int> SectionPadding {10, 10};
 
-	struct CategoryPanel
-	{
-		NAS2D::Rectangle<int> rect{};
-		NAS2D::Rectangle<int> imageSlice{};
-		std::string name{};
-		bool selected{false};
-	};
 
-	CategoryPanel* SelectedCategory{ nullptr };
-
-	Rectangle<int> IconArea{};
+	std::vector<ListBoxItemText> availableTopics(const std::string& categoryName, const TechnologyCatalog& catalog, const ResearchTracker& tracker)
+	{
+		std::vector<ListBoxItemText> itemsToAdd;
+		const auto& completedTopics = tracker.completedResearch();
+		for (const auto& topic : catalog.technologiesInCategory(categoryName))
+		{
+			const auto it = std::find(completedTopics.begin(), completedTopics.end(), topic.id);
+			if (it == completedTopics.end())
+			{
+				itemsToAdd.emplace_back(ListBoxItemText{topic.name, topic.id});
+			}
+		}
 
-	std::vector<CategoryPanel> CategoryPanels;
+		return itemsToAdd;
+	}
 }
 
 
@@ -78,6 +80,9 @@ ResearchReport::ResearchReport() :
 		button->toggle(false);
 	}
 
+	add(lstResearchTopics, {});
+	lstResearchTopics.selectionChanged().connect({this, &ResearchReport::handleTopicChanged});
+
 	const Point<int> buttonStartPosition{rect().position.x + MarginSize * 3 + CategoryIconSize, rect().position.y + MarginSize * 2 + fontBigBold.height()};
 	const int buttonSpacing = btnAllTopics.size().x + MarginSize;
 
@@ -95,37 +100,84 @@ ResearchReport::~ResearchReport()
 
 void ResearchReport::fillLists()
 {
+	lstResearchTopics.clear();
+	resetCategorySelection();
+	onAllTopicsClicked();
 }
 
 
 void ResearchReport::clearSelected()
 {
+	lstResearchTopics.clearSelected();
+	resetCategorySelection();
+	onAllTopicsClicked();
 }
 
 
 void ResearchReport::refresh()
 {
-	if (CategoryPanels.size() < 1) { return; }
+	if (mCategoryPanels.size() < 1) { return; }
+
+	adjustCategoryIconSpacing();
+
+	resetCategorySelection();
+	onAllTopicsClicked();
+
+	setSectionRects();
+
+	lstResearchTopics.area(mResearchTopicArea);
+}
+
+
+void ResearchReport::setSectionRects()
+{
+	mCategoryIconArea =
+	{
+		mCategoryPanels.begin()->rect.startPoint(),
+		{
+			CategoryIconSize,
+			mCategoryPanels.rbegin()->rect.endPoint().y - mCategoryPanels.begin()->rect.startPoint().y
+		}
+	};
+
+	mResearchTopicArea =
+	{
+		{
+			rect().position.x + MarginSize * 3 + CategoryIconSize,
+			rect().position.y + fontBigBold.height() + btnAllTopics.size().y + MarginSize * 3
+		},
+
+		{
+			((rect().size.x / 3) * 2) - (MarginSize * 4) - CategoryIconSize,
+			rect().size.y - MarginSize * 4 - fontBigBold.height() - btnAllTopics.size().y
+		}
+	};
+}
+
 
-	const int minimumHeight = CategoryIconSize * (static_cast<int>(CategoryPanels.size()));
-	const int padding = ((rect().size.y - 20) - minimumHeight) / static_cast<int>(CategoryPanels.size() - 1);
+void ResearchReport::adjustCategoryIconSpacing()
+{
+	const int minimumHeight = CategoryIconSize * (static_cast<int>(mCategoryPanels.size()));
+	const int padding = ((rect().size.y - 20) - minimumHeight) / static_cast<int>(mCategoryPanels.size() - 1);
 
-	for (size_t i = 0; i < CategoryPanels.size(); ++i)
+	for (size_t i = 0; i < mCategoryPanels.size(); ++i)
 	{
 		const NAS2D::Point<int> point{rect().position.x + 10, rect().position.y + 10 + static_cast<int>(i) * CategoryIconSize + static_cast<int>(i) * padding};
-		CategoryPanels[i].rect = {point, {CategoryIconSize, CategoryIconSize}};
+		mCategoryPanels[i].rect = {point, {CategoryIconSize, CategoryIconSize}};
 	}
+}
 
-	CategoryPanels.front().selected = true;
-	SelectedCategory = &CategoryPanels.front();
 
-	onAllTopicsClicked();
+void ResearchReport::resetCategorySelection()
+{
+	for (auto& panel : mCategoryPanels)
+	{
+		panel.selected = false;
+	}
 
-	IconArea = {
-		{rect().position.x + MarginSize * 3 + CategoryIconSize,
-		rect().position.y + fontBigBold.height() + btnAllTopics.size().y + MarginSize * 3},
-		{((rect().size.x / 3) * 2) - (MarginSize * 4) - CategoryIconSize,
-		rect().size.y - MarginSize * 4 - fontBigBold.height() - btnAllTopics.size().y}};
+	mCategoryPanels.front().selected = true;
+	mSelectedCategory = &mCategoryPanels.front();
+	handleCategoryChanged();
 }
 
 
@@ -143,14 +195,14 @@ void ResearchReport::injectTechReferences(TechnologyCatalog& catalog, ResearchTr
 
 	for (const auto& category : mTechCatalog->categories())
 	{
-		CategoryPanels.emplace_back(CategoryPanel{
+		mCategoryPanels.emplace_back(CategoryPanel{
 			{{0, 0}, {CategoryIconSize, CategoryIconSize}},
 			{{(category.icon_index % columns) * CategoryIconSize, (category.icon_index / columns) * CategoryIconSize}, {CategoryIconSize, CategoryIconSize}},
 			category.name,
 			false});
 	}
 
-	std::sort(CategoryPanels.begin(), CategoryPanels.end(), [](const auto& a, const auto& b) { return a.name < b.name; });
+	std::sort(mCategoryPanels.begin(), mCategoryPanels.end(), [](const auto& a, const auto& b) { return a.name < b.name; });
 	refresh();
 }
 
@@ -177,26 +229,34 @@ void ResearchReport::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D:
 		return;
 	}
 
-	CategoryPanel* lastPanel = SelectedCategory;
+	if (mCategoryIconArea.contains(position))
+	{
+		handleMouseDownInCategories(position);
+	}
+}
+
+
+void ResearchReport::handleMouseDownInCategories(NAS2D::Point<int>& position)
+{
+	CategoryPanel* lastPanel = mSelectedCategory;
 	bool panelClickedOn = false;
-	for (auto& panel : CategoryPanels)
+	for (auto& panel : mCategoryPanels)
 	{
-		if(panel.rect.contains(position))
+		panel.selected = false;
+
+		if (panel.rect.contains(position))
 		{
 			panel.selected = true;
-			SelectedCategory = &panel;
+			mSelectedCategory = &panel;
 			panelClickedOn = true;
-		}
-		else
-		{
-			panel.selected = false;
+			handleCategoryChanged();
 		}
 	}
 
-	if(!panelClickedOn && lastPanel != nullptr)
+	if (!panelClickedOn && lastPanel != nullptr)
 	{
-		SelectedCategory = lastPanel;
-		SelectedCategory->selected = true;
+		mSelectedCategory = lastPanel;
+		mSelectedCategory->selected = true;
 	}
 }
 
@@ -250,7 +310,7 @@ void ResearchReport::drawCategories() const
 {
 	auto& renderer = Utility<Renderer>::get();
 
-	for (const auto& panel : CategoryPanels)
+	for (const auto& panel : mCategoryPanels)
 	{
 		const auto panelRect = Rectangle<int>::Create(
 			panel.rect.position - CategorySelectorPadding,
@@ -275,7 +335,7 @@ void ResearchReport::drawTopicHeader() const
 	auto& renderer = Utility<Renderer>::get();
 	renderer.drawText(
 		fontBigBold,
-		SelectedCategory->name,
+		mSelectedCategory->name,
 		rect().position + Vector<int>{SectionPadding.x * 3 + CategoryIconSize, SectionPadding.y},
 		ColorText);
 }
@@ -284,25 +344,18 @@ void ResearchReport::drawTopicHeader() const
 void ResearchReport::drawVerticalSectionSpacer(const int startX) const
 {
 	auto& renderer = Utility<Renderer>::get();
-	renderer.drawLine(
-		Point<int>{startX, rect().position.y + SectionPadding.y},
-		Point<int>{startX, rect().position.y + rect().size.y - SectionPadding.y},
-		ColorText);
-}
-
 
-void ResearchReport::drawTopicIconPanel() const
-{
-	auto& renderer = Utility<Renderer>::get();
-	renderer.drawBox(IconArea, ColorText);
+	const Point<int> start{startX, rect().position.y + SectionPadding.y};
+	const Point<int> end{startX, rect().position.y + rect().size.y - SectionPadding.y};
+	renderer.drawLine(start, end, ColorText);
 }
 
 
 void ResearchReport::drawResearchPointsPanel() const
 {
 	auto& renderer = Utility<Renderer>::get();
 
-	const auto startPoint = rect().position + Vector<int>{SectionPadding.x * 5 + CategoryIconSize + IconArea.size.x, SectionPadding.y};
+	const auto startPoint = rect().position + Vector<int>{SectionPadding.x * 5 + CategoryIconSize + mResearchTopicArea.size.x, SectionPadding.y};
 
 	renderer.drawText(fontBigBold, "Research Generated Per Turn", startPoint, ColorText);
 
@@ -323,14 +376,32 @@ void ResearchReport::drawResearchPointsPanel() const
 }
 
 
+void ResearchReport::handleCategoryChanged()
+{
+	lstResearchTopics.clear();
+
+	std::vector<ListBoxItemText> itemsToAdd = availableTopics(mSelectedCategory->name, *mTechCatalog, *mResearchTracker);
+
+	std::sort(itemsToAdd.begin(), itemsToAdd.end());
+	for (auto& item : itemsToAdd)
+	{
+		lstResearchTopics.add(item);
+	}
+}
+
+
+void ResearchReport::handleTopicChanged()
+{
+}
+
+
 void ResearchReport::draw() const
 {
 	drawCategories();
 
-	drawVerticalSectionSpacer(CategoryPanels.front().rect.endPoint().x + SectionPadding.x);
+	drawVerticalSectionSpacer(mCategoryPanels.front().rect.endPoint().x + SectionPadding.x);
 
 	drawTopicHeader();
-	drawTopicIconPanel();
 
 	drawVerticalSectionSpacer((rect().size.x / 3) * 2);
 

OPHD/UI/Reports/ResearchReport.h

@@ -8,8 +8,10 @@
 #include <libOPHD/Technology/ResearchTracker.h>
 
 #include <libControls/Button.h>
+#include <libControls/ListBox.h>
 
 #include <NAS2D/Math/Point.h>
+#include <NAS2D/Math/Rectangle.h>
 
 #include <vector>
 
@@ -27,29 +29,38 @@ class Structure;
 class ResearchReport : public ReportInterface
 {
 public:
-    ResearchReport();
+	ResearchReport();
 	~ResearchReport() override;
 
 	void fillLists() override;
 	void clearSelected() override;
 
 	void refresh() override;
+	void setSectionRects();
 	void selectStructure(Structure*) override;
-    
-    void injectTechReferences(TechnologyCatalog&, ResearchTracker&);
+
+	void injectTechReferences(TechnologyCatalog&, ResearchTracker&);
 
 	void update() override;
 
 private:
 	void onResize() override;
 	void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position) override;
 
+	void handleMouseDownInCategories(NAS2D::Point<int>& position);
+
+	void adjustCategoryIconSpacing();
+
+	void resetCategorySelection();
+
 	void draw() const override;
 	void drawCategories() const;
 	void drawTopicHeader() const;
 	void drawVerticalSectionSpacer(const int column) const;
-    void drawTopicIconPanel() const;
-    void drawResearchPointsPanel() const;
+	void drawResearchPointsPanel() const;
+
+	void handleCategoryChanged();
+	void handleTopicChanged();
 
 	void untoggleAllButtons();
 
@@ -59,7 +70,16 @@ class ResearchReport : public ReportInterface
 	void onStandardLabClicked();
 	void onHotLabClicked();
 
+private:
+	struct CategoryPanel
+	{
+		NAS2D::Rectangle<int> rect{};
+		NAS2D::Rectangle<int> imageSlice{};
+		std::string name{};
+		bool selected{false};
+	};
 
+private:
 	const NAS2D::Font& fontMedium;
 	const NAS2D::Font& fontMediumBold;
 	const NAS2D::Font& fontBigBold;
@@ -73,8 +93,16 @@ class ResearchReport : public ReportInterface
 	Button btnAvailableTopics;
 	Button btnCompletedTopics;
 	Button btnStandardLab;
-    Button btnHotLab;
-    
-    TechnologyCatalog* mTechCatalog{ nullptr };
-    ResearchTracker* mResearchTracker{ nullptr };
+	Button btnHotLab;
+
+	ListBox<ListBoxItemText> lstResearchTopics;
+
+	TechnologyCatalog* mTechCatalog{nullptr};
+	ResearchTracker* mResearchTracker{nullptr};
+
+	CategoryPanel* mSelectedCategory{nullptr};
+	std::vector<CategoryPanel> mCategoryPanels;
+
+	NAS2D::Rectangle<int> mCategoryIconArea{};
+	NAS2D::Rectangle<int> mResearchTopicArea{};
 };