Merge pull request #1465 from OutpostUniverse/Fix/Product-Update-Factory-Report

Fix/product update factory report

Author: DanRStevens

OPHD/Common.cpp

@@ -38,6 +38,12 @@ std::string difficultyString(Difficulty difficulty)
 }
 
 
+bool productTypeInRange(ProductType productType)
+{
+	return ProductType::PRODUCT_NONE < productType && productType < ProductType::PRODUCT_COUNT;
+}
+
+
 const std::map<StructureState, Color> STRUCTURE_COLOR_TABLE
 {
 	{StructureState::UnderConstruction, Color{150, 150, 150, 100}},

OPHD/Common.h

@@ -105,8 +105,8 @@ enum class IdleReason
 
 /**
  * Connector Direction.
- * 
- * \note	CONNECTOR_INTERSECTION is explicitely set to '1' to prevent
+ *
+ * \note	CONNECTOR_INTERSECTION is intentionally set to '1' to prevent
  *			breaking changes with save files.
  */
 enum ConnectorDir
@@ -120,7 +120,7 @@ enum ConnectorDir
 
 /**
  * Unique identifier code for each structure.
- * 
+ *
  * \note	Each individual structure is identified using a SID_ code as opposed
  *			the structure Class code which is used to group like structures into
  *			lists for structure updates.
@@ -174,17 +174,17 @@ enum StructureID
 
 /**
  * Factory Product enumeration
- * 
+ *
  * \note	Products are arranged to match the order in which they appear
  *			in the icon atlas (data/ui/factory.png). In order to allow
  *			for easy future additions, the icons are grouped into two
  *			sets of 32 icons. The first 32 are for above ground products,
  *			the second set for underground products.
- * 
+ *
  *			To easily map to icons in the atlas, padding entries with a
  *			'reserved' naming convention have been added. These can be
  *			replaced as additional products are added.
- * 
+ *
  * \remark	ASSUMPTION: Factories will never have more than 32 individual
  *			products that they can produce.
  */
@@ -277,6 +277,9 @@ enum ProductType
 };
 
 
+bool productTypeInRange(ProductType productType);
+
+
 enum class Morale
 {
 	Terrible,

OPHD/UI/Reports/FactoryReport.cpp

@@ -118,8 +118,8 @@ FactoryReport::FactoryReport() :
 
 	add(lstProducts, {cboFilterByProduct.rect().position.x + cboFilterByProduct.rect().size.x + 20, mRect.position.y + 230});
 
-	txtProductDescription.height(128);
-	txtProductDescription.textColor(constants::PrimaryTextColor);
+	mTxtProductDescription.height(128);
+	mTxtProductDescription.textColor(constants::PrimaryTextColor);
 
 	fillLists();
 }
@@ -140,7 +140,7 @@ void FactoryReport::clearSelected()
 {
 	lstFactoryList.clearSelected();
 	selectedFactory = nullptr;
-	txtProductDescription.text("");
+	mTxtProductDescription.text("");
 }
 
 
@@ -270,8 +270,8 @@ void FactoryReport::onResize()
 	lstProducts.size({detailPanelRect.size.x / 3, detailPanelRect.size.y - 219});
 	lstProducts.selectionChanged().connect({this, &FactoryReport::onProductSelectionChange});
 
-	txtProductDescription.position(lstProducts.rect().crossXPoint() + NAS2D::Vector{158, 0});
-	txtProductDescription.width(mRect.size.x - txtProductDescription.positionX() - 30);
+	mTxtProductDescription.position(lstProducts.rect().crossXPoint() + NAS2D::Vector{158, 0});
+	mTxtProductDescription.width(mRect.size.x - mTxtProductDescription.positionX() - 30);
 }
 
 
@@ -289,7 +289,7 @@ void FactoryReport::onVisibilityChange(bool visible)
 
 	if (selectedProductType != ProductType::PRODUCT_NONE)
 	{
-		txtProductDescription.text(ProductCatalogue::get(selectedProductType).Description);
+		mTxtProductDescription.text(ProductCatalogue::get(selectedProductType).Description);
 	}
 }
 
@@ -414,6 +414,15 @@ void FactoryReport::onListSelectionChange()
 	lstProducts.selectIf([productType = selectedFactory->productType()](const auto& item){ return item.tag == productType; });
 	selectedProductType = selectedFactory->productType();
 
+	if (productTypeInRange(selectedProductType))
+	{
+		mTxtProductDescription.text(ProductCatalogue::get(selectedProductType).Description);
+	}
+	else
+	{
+		mTxtProductDescription.text("");
+	}
+
 	StructureState state = selectedFactory->state();
 	btnApply.visible(state == StructureState::Operational || state == StructureState::Idle);
 }
@@ -422,7 +431,7 @@ void FactoryReport::onListSelectionChange()
 void FactoryReport::onProductSelectionChange()
 {
 	selectedProductType = static_cast<ProductType>(lstProducts.isItemSelected() ? lstProducts.selected().tag : 0);
-	txtProductDescription.text(ProductCatalogue::get(selectedProductType).Description);
+	mTxtProductDescription.text(ProductCatalogue::get(selectedProductType).Description);
 }
 
 
@@ -485,7 +494,7 @@ void FactoryReport::drawProductPane(Renderer& renderer)
 	{
 		renderer.drawText(fontBigBold, ProductCatalogue::get(selectedProductType).Name, NAS2D::Point{position_x, detailPanelRect.position.y + 180}, constants::PrimaryTextColor);
 		renderer.drawImage(productImage(selectedProductType), NAS2D::Point{position_x, lstProducts.positionY()});
-		txtProductDescription.update();
+		mTxtProductDescription.update();
 	}
 
 	if (selectedFactory->productType() == ProductType::PRODUCT_NONE) { return; }

OPHD/UI/Reports/FactoryReport.h

@@ -97,7 +97,7 @@ class FactoryReport : public ReportInterface
 
 	ListBox<> lstProducts;
 
-	TextArea txtProductDescription;
+	TextArea mTxtProductDescription;
 
 	Factory* selectedFactory = nullptr;
 	ProductType selectedProductType = ProductType::PRODUCT_NONE;