Merge pull request #1443 from oscar139/Refactor/PopulationPanelConstructor

Refactor/population panel constructor

Author: DanRStevens

OPHD/States/MapViewState.cpp

@@ -167,6 +167,7 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::stri
 	mStructures{"ui/structures.png", 46, constants::MarginTight},
 	mRobots{"ui/robots.png", 46, constants::MarginTight},
 	mConnections{"ui/structures.png", 46, constants::MarginTight},
+	mPopulationPanel{mPopulation, mPopulationPool},
 	mResourceInfoBar{mResourcesCount, mPopulation, mCurrentMorale, mPreviousMorale, mFood},
 	mRobotDeploymentSummary{mRobotPool}
 {
@@ -187,6 +188,7 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::A
 	mStructures{"ui/structures.png", 46, constants::MarginTight},
 	mRobots{"ui/robots.png", 46, constants::MarginTight},
 	mConnections{"ui/structures.png", 46, constants::MarginTight},
+	mPopulationPanel{mPopulation, mPopulationPool},
 	mResourceInfoBar{mResourcesCount, mPopulation, mCurrentMorale, mPreviousMorale, mFood},
 	mRobotDeploymentSummary{mRobotPool},
 	mMiniMap{std::make_unique<MiniMap>(*mMapView, mTileMap, mRobotList, planetAttributes.mapImagePath)},

OPHD/States/MapViewStateUi.cpp

@@ -75,8 +75,6 @@ void MapViewState::initUi()
 	mFileIoDialog.hide();
 
 	mPopulationPanel.position({675, constants::ResourceIconSize + 4 + constants::MarginTight});
-	mPopulationPanel.population(&mPopulation);
-	mPopulationPanel.populationPool(&mPopulationPool);
 
 	mResourceBreakdownPanel.position({0, 22});
 	mResourceBreakdownPanel.playerResources(&mResourcesCount);

OPHD/UI/PopulationPanel.cpp

@@ -49,7 +49,7 @@ static const std::array moraleStringColor
 };
 
 
-PopulationPanel::PopulationPanel() :
+PopulationPanel::PopulationPanel(const Population& pop, const PopulationPool& popPool) :
 	mFont{fontCache.load(constants::FONT_PRIMARY, constants::FontPrimaryNormal)},
 	mFontBold{fontCache.load(constants::FONT_PRIMARY_BOLD, constants::FontPrimaryNormal)},
 	mIcons{imageCache.load("ui/icons.png")},
@@ -64,7 +64,9 @@ PopulationPanel::PopulationPanel() :
 		imageCache.load("ui/skin/window_bottom_left.png"),
 		imageCache.load("ui/skin/window_bottom_middle.png"),
 		imageCache.load("ui/skin/window_bottom_right.png")
-	}
+	},
+	mPopulation(pop),
+	mPopulationPool(popPool)
 {
 	constexpr int linesOfText = 16;
 	constexpr int edgeBuffer = constants::Margin * 2;
@@ -89,16 +91,6 @@ PopulationPanel::PopulationPanel() :
 	size({windowWidth, windowHeight});
 }
 
-void PopulationPanel::population(Population* pop)
-{
-	mPopulation = pop;
-}
-
-void PopulationPanel::populationPool(PopulationPool* popPool)
-{
-	mPopulationPool = popPool;
-}
-
 void PopulationPanel::addMoraleReason(const std::string& str, int val)
 {
 	if (val == 0) { return; }
@@ -118,7 +110,7 @@ void PopulationPanel::update()
 
 	// POPULATION Statistics
 	renderer.drawText(mFontBold, constants::PopulationBreakdown, position);
-	const auto& population = mPopulation->getPopulations();
+	const auto& population = mPopulation.getPopulations();
 	const std::array populationData
 	{
 		std::tuple{NAS2D::Rectangle<int>{{0, 96}, {IconSize, IconSize}}, population.child, std::string("Children")},
@@ -149,8 +141,8 @@ void PopulationPanel::update()
 	position.y += constants::Margin;
 
 	const std::array populationAvailablitiyStatistics{
-		std::tuple{"Available Workers: ", mPopulationPool->availableWorkers()},
-		std::tuple{"Available Scientists: ", mPopulationPool->availableScientists()},
+		std::tuple{"Available Workers: ", mPopulationPool.availableWorkers()},
+		std::tuple{"Available Scientists: ", mPopulationPool.availableScientists()},
 	};
 
 	for (const auto& [statisticLabel, personCount] : populationAvailablitiyStatistics)

OPHD/UI/PopulationPanel.h

@@ -21,10 +21,7 @@ namespace NAS2D
 class PopulationPanel : public Control
 {
 public:
-	PopulationPanel();
-
-	void population(Population* pop);
-	void populationPool(PopulationPool* popPool);
+	PopulationPanel(const Population& pop, const PopulationPool& popPool);
 
 	void morale(int val) { mMorale = val; }
 	void old_morale(int val) { mPreviousMorale = val; }
@@ -50,8 +47,8 @@ class PopulationPanel : public Control
 
 	std::vector<std::pair<std::string,int>> mMoraleChangeReasons;
 
-	Population* mPopulation = nullptr;
-	PopulationPool* mPopulationPool = nullptr;
+	const Population& mPopulation;
+	const PopulationPool& mPopulationPool;
 
 	int mMorale{0};
 	int mPreviousMorale{0};