Unify {PBM,LCD}DataArray types into PixelsData.

netfab · netfab · commit 1164fb361d0d · 2021-01-20T19:23:18.000+01:00
diff --git a/src/bin/daemon/LCDPlugins/LCDPlugin.cpp b/src/bin/daemon/LCDPlugins/LCDPlugin.cpp
@@ -132,7 +132,7 @@ void LCDPlugin::init(FontsManager* const pFonts, const std::string & product)
 	_initialized = true;
 }
 
-const PBMDataArray & LCDPlugin::getNextPBMFrame(
+const PixelsData & LCDPlugin::getNextPBMFrame(
 	FontsManager* const pFonts,
 	const std::string & LCDKey,
 	const bool lockedPlugin)
@@ -197,7 +197,7 @@ const uint16_t LCDPlugin::getNextPBMFrameID(void) const
 	return _PBMFrameIndex;
 }
 
-PBMDataArray & LCDPlugin::getCurrentPBMFrame(void)
+PixelsData & LCDPlugin::getCurrentPBMFrame(void)
 {
 #if DEBUGGING_ON && DEBUG_LCD_PLUGINS
 	LOG(DEBUG2)	<< this->getPluginName()
@@ -275,7 +275,7 @@ void LCDPlugin::drawProgressBarOnPBMFrame(
 	}
 
 	try {
-		PBMDataArray & frame = (*_itCurrentPBMFrame)._PBMData;
+		PixelsData & frame = (*_itCurrentPBMFrame)._PBMData;
 
 		auto drawHorizontalLine = [&frame] (const uint16_t index) -> void
 		{
@@ -372,7 +372,7 @@ void LCDPlugin::drawPadlockOnPBMFrame(
 	const uint16_t xByte = PBMXPos / 8;
 	const uint16_t index = (DEFAULT_PBM_WIDTH_IN_BYTES * PBMYPos) + xByte;
 
-	PBMDataArray & frame = (*_itCurrentPBMFrame)._PBMData;
+	PixelsData & frame = (*_itCurrentPBMFrame)._PBMData;
 
 	if( lockedPlugin ) {
 		_everLocked = true;
diff --git a/src/bin/daemon/LCDPlugins/LCDPlugin.hpp b/src/bin/daemon/LCDPlugins/LCDPlugin.hpp
@@ -55,7 +55,7 @@ class PBMFrame
 		PBMFrame(void) = delete;
 		~PBMFrame() = default;
 
-		PBMDataArray _PBMData;
+		PixelsData _PBMData;
 
 		const bool switchToNextFrame(const uint16_t currentFrameCounter);
 
@@ -88,7 +88,7 @@ class LCDPlugin
 		void resetPBMFrameIndex(void);
 		void prepareNextPBMFrame(void);
 
-		virtual const PBMDataArray & getNextPBMFrame(
+		virtual const PixelsData & getNextPBMFrame(
 			FontsManager* const pFonts,
 			const std::string & LCDKey,
 			const bool lockedPlugin
@@ -111,7 +111,7 @@ class LCDPlugin
 		);
 
 		const uint16_t getNextPBMFrameID(void) const;
-		PBMDataArray & getCurrentPBMFrame(void);
+		PixelsData & getCurrentPBMFrame(void);
 
 		void writeStringOnPBMFrame(
 			FontsManager* const pFonts,
diff --git a/src/bin/daemon/LCDPlugins/PBM.hpp b/src/bin/daemon/LCDPlugins/PBM.hpp
@@ -45,8 +45,7 @@
 namespace GLogiK
 {
 
-typedef std::vector<unsigned char> PBMDataArray;
-typedef std::vector<unsigned char> LCDDataArray;
+typedef std::vector<unsigned char> PixelsData;
 
 } // namespace GLogiK
 
diff --git a/src/bin/daemon/LCDPlugins/PBMFile.cpp b/src/bin/daemon/LCDPlugins/PBMFile.cpp
@@ -38,7 +38,7 @@ PBMFile::~PBMFile()
 
 void PBMFile::readPBM(
 	const std::string & PBMPath,
-	PBMDataArray & PBMData,
+	PixelsData & PBMData,
 	const uint16_t PBMWidth,
 	const uint16_t PBMHeight)
 {
@@ -129,7 +129,7 @@ void PBMFile::parsePBMHeader(
 
 void PBMFile::extractPBMData(
 	std::ifstream & pbm,
-	PBMDataArray & PBMData)
+	PixelsData & PBMData)
 {
 	pbm.read(reinterpret_cast<char*>(&PBMData.front()), PBMData.size());
 
@@ -138,7 +138,7 @@ void PBMFile::extractPBMData(
 				<< " - expected: " << PBMData.size() << std::endl;
 #endif
 
-	if( PBMData.size() != static_cast<PBMDataArray::size_type>( pbm.gcount() ) )
+	if( PBMData.size() != static_cast<PixelsData::size_type>( pbm.gcount() ) )
 		throw GLogiKExcept("unexpected numbers of bytes read");
 
 	// checking that we really reached the EoF
diff --git a/src/bin/daemon/LCDPlugins/PBMFile.hpp b/src/bin/daemon/LCDPlugins/PBMFile.hpp
@@ -42,7 +42,7 @@ class PBMFile
 
 		static void readPBM(
 			const std::string & PBMPath,
-			PBMDataArray & PBMData,
+			PixelsData & PBMData,
 			const uint16_t PBMWidth,
 			const uint16_t PBMHeight);
 
@@ -55,7 +55,7 @@ class PBMFile
 
 		static void extractPBMData(
 			std::ifstream & pbm,
-			PBMDataArray & PBMData);
+			PixelsData & PBMData);
 
 		static void closePBM(std::ifstream & pbm);
 
diff --git a/src/bin/daemon/LCDPlugins/PBMFont.cpp b/src/bin/daemon/LCDPlugins/PBMFont.cpp
@@ -133,7 +133,7 @@ const uint16_t PBMFont::getCenteredYPos(void)
 }
 
 void PBMFont::printCharacterOnFrame(
-	PBMDataArray & frame,
+	PixelsData & frame,
 	const std::string & character,
 	uint16_t & PBMXPos,
 	const uint16_t PBMYPos)
diff --git a/src/bin/daemon/LCDPlugins/PBMFont.hpp b/src/bin/daemon/LCDPlugins/PBMFont.hpp
@@ -48,7 +48,7 @@ class PBMFont
 		const uint16_t getCenteredYPos(void);
 
 		void printCharacterOnFrame(
-			PBMDataArray & frame,
+			PixelsData & frame,
 			const std::string & character,
 			uint16_t & PBMXPos,
 			const uint16_t PBMYPos
@@ -67,7 +67,7 @@ class PBMFont
 		);
 
 	private:
-		PBMDataArray _PBMData;
+		PixelsData _PBMData;
 		const std::string _fontName;
 		const uint16_t _PBMWidth;
 		const uint16_t _PBMHeight;
diff --git a/src/bin/daemon/LCDPlugins/fontsManager.cpp b/src/bin/daemon/LCDPlugins/fontsManager.cpp
@@ -68,7 +68,7 @@ const uint16_t FontsManager::getCenteredYPos(const FontID fontID)
 
 void FontsManager::printCharacterOnFrame(
 	const FontID fontID,
-	PBMDataArray & frame,
+	PixelsData & frame,
 	const std::string & c,
 	uint16_t & PBMXPos,
 	const uint16_t PBMYPos)
diff --git a/src/bin/daemon/LCDPlugins/fontsManager.hpp b/src/bin/daemon/LCDPlugins/fontsManager.hpp
@@ -48,7 +48,7 @@ class FontsManager
 
 		void printCharacterOnFrame(
 			const FontID fontID,
-			PBMDataArray & frame,
+			PixelsData & frame,
 			const std::string & c,
 			uint16_t & PBMXPos,
 			const uint16_t PBMYPos
diff --git a/src/bin/daemon/LCDPlugins/systemMonitor.cpp b/src/bin/daemon/LCDPlugins/systemMonitor.cpp
@@ -80,7 +80,7 @@ void SystemMonitor::init(FontsManager* const pFonts, const std::string & product
 	LCDPlugin::init(pFonts, product);
 }
 
-const PBMDataArray & SystemMonitor::getNextPBMFrame(
+const PixelsData & SystemMonitor::getNextPBMFrame(
 	FontsManager* const pFonts,
 	const std::string & LCDKey,
 	const bool lockedPlugin
diff --git a/src/bin/daemon/LCDPlugins/systemMonitor.hpp b/src/bin/daemon/LCDPlugins/systemMonitor.hpp
@@ -40,7 +40,7 @@ class SystemMonitor
 
 		void init(FontsManager* const pFonts, const std::string & product);
 
-		const PBMDataArray & getNextPBMFrame(
+		const PixelsData & getNextPBMFrame(
 			FontsManager* const pFonts,
 			const std::string & LCDKey,
 			const bool lockedPlugin
diff --git a/src/bin/daemon/LCDScreenPluginsManager.cpp b/src/bin/daemon/LCDScreenPluginsManager.cpp
@@ -166,7 +166,7 @@ const bool LCDScreenPluginsManager::findOneLCDScreenPlugin(const uint64_t LCDPlu
 	return ret;
 }
 
-LCDDataArray & LCDScreenPluginsManager::getNextLCDScreenBuffer(
+PixelsData & LCDScreenPluginsManager::getNextLCDScreenBuffer(
 	const std::string & LCDKey,
 	const uint64_t LCDPluginsMask1
 ) {
@@ -310,7 +310,7 @@ void LCDScreenPluginsManager::stopLCDPlugins(void) {
  *	A2		pixels of the 43-pixel high display.)
  *
  */
-void LCDScreenPluginsManager::dumpPBMDataIntoLCDBuffer(LCDDataArray & LCDBuffer, const PBMDataArray & PBMData)
+void LCDScreenPluginsManager::dumpPBMDataIntoLCDBuffer(PixelsData & LCDBuffer, const PixelsData & PBMData)
 {
 	for(unsigned int row = 0; row < DEFAULT_PBM_HEIGHT_IN_BYTES; ++row) {
 		unsigned int LCDCol = 0;
diff --git a/src/bin/daemon/LCDScreenPluginsManager.hpp b/src/bin/daemon/LCDScreenPluginsManager.hpp
@@ -48,7 +48,7 @@ class LCDScreenPluginsManager
 
 		const bool findOneLCDScreenPlugin(const uint64_t LCDPluginsMask1) const;
 
-		LCDDataArray & getNextLCDScreenBuffer(
+		PixelsData & getNextLCDScreenBuffer(
 			const std::string & LCDKey,
 			const uint64_t LCDPluginsMask1
 		);
@@ -66,7 +66,7 @@ class LCDScreenPluginsManager
 
 		LCDPluginsPropertiesArray_type _pluginsPropertiesArray;
 
-		LCDDataArray _LCDBuffer;
+		PixelsData _LCDBuffer;
 		FontsManager _fontsManager;
 		FontsManager* const _pFonts;
 
@@ -75,7 +75,7 @@ class LCDScreenPluginsManager
 		bool _currentPluginLocked;
 
 		void stopLCDPlugins(void);
-		void dumpPBMDataIntoLCDBuffer(LCDDataArray & LCDBuffer, const PBMDataArray & PBMData);
+		void dumpPBMDataIntoLCDBuffer(PixelsData & LCDBuffer, const PixelsData & PBMData);
 };
 
 } // namespace GLogiK
diff --git a/src/bin/daemon/keyboardDriver.cpp b/src/bin/daemon/keyboardDriver.cpp
@@ -555,7 +555,7 @@ void KeyboardDriver::LCDScreenLoop(const std::string & devID) {
 				LCDPluginsMask1 = device._LCDPluginsMask1;
 			}
 
-			LCDDataArray & LCDBuffer = device.getLCDPluginsManager()->getNextLCDScreenBuffer(LCDKey, LCDPluginsMask1);
+			PixelsData & LCDBuffer = device.getLCDPluginsManager()->getNextLCDScreenBuffer(LCDKey, LCDPluginsMask1);
 			int ret = this->performLCDScreenInterruptTransfer(
 				device,
 				LCDBuffer.data(),
@@ -588,7 +588,7 @@ void KeyboardDriver::LCDScreenLoop(const std::string & devID) {
 		const uint64_t endscreen = toEnumType(LCDScreenPlugin::GK_LCD_ENDSCREEN);
 		/* make sure endscreen plugin is loaded before using it */
 		if( device.getLCDPluginsManager()->findOneLCDScreenPlugin( endscreen ) ) {
-			LCDDataArray & LCDBuffer = device.getLCDPluginsManager()->getNextLCDScreenBuffer("", endscreen);
+			PixelsData & LCDBuffer = device.getLCDPluginsManager()->getNextLCDScreenBuffer("", endscreen);
 			int ret = this->performLCDScreenInterruptTransfer(device, LCDBuffer.data(), LCDBuffer.size(), 1000);
 			if(ret != 0) {
 				GKSysLog(LOG_ERR, ERROR, "endscreen LCD refresh failure");

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void LCDPlugin::init(FontsManager* const pFonts, const std::string & product)`
`132`	`132`	`_initialized = true;`
`133`	`133`	`}`
`134`	`134`
`135`		`-const PBMDataArray & LCDPlugin::getNextPBMFrame(`
	`135`	`+const PixelsData & LCDPlugin::getNextPBMFrame(`
`136`	`136`	`FontsManager* const pFonts,`
`137`	`137`	`const std::string & LCDKey,`
`138`	`138`	`const bool lockedPlugin)`
`@@ -197,7 +197,7 @@ const uint16_t LCDPlugin::getNextPBMFrameID(void) const`
`197`	`197`	`return _PBMFrameIndex;`
`198`	`198`	`}`
`199`	`199`
`200`		`-PBMDataArray & LCDPlugin::getCurrentPBMFrame(void)`
	`200`	`+PixelsData & LCDPlugin::getCurrentPBMFrame(void)`
`201`	`201`	`{`
`202`	`202`	`#if DEBUGGING_ON && DEBUG_LCD_PLUGINS`
`203`	`203`	`LOG(DEBUG2) << this->getPluginName()`
`@@ -275,7 +275,7 @@ void LCDPlugin::drawProgressBarOnPBMFrame(`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`try {`
`278`		`- PBMDataArray & frame = (*_itCurrentPBMFrame)._PBMData;`
	`278`	`+ PixelsData & frame = (*_itCurrentPBMFrame)._PBMData;`
`279`	`279`
`280`	`280`	`auto drawHorizontalLine = [&frame] (const uint16_t index) -> void`
`281`	`281`	`{`
`@@ -372,7 +372,7 @@ void LCDPlugin::drawPadlockOnPBMFrame(`
`372`	`372`	`const uint16_t xByte = PBMXPos / 8;`
`373`	`373`	`const uint16_t index = (DEFAULT_PBM_WIDTH_IN_BYTES * PBMYPos) + xByte;`
`374`	`374`
`375`		`- PBMDataArray & frame = (*_itCurrentPBMFrame)._PBMData;`
	`375`	`+ PixelsData & frame = (*_itCurrentPBMFrame)._PBMData;`
`376`	`376`
`377`	`377`	`if( lockedPlugin ) {`
`378`	`378`	`_everLocked = true;`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@`
`45`	`45`	`namespace GLogiK`
`46`	`46`	`{`
`47`	`47`
`48`		`-typedef std::vector<unsigned char> PBMDataArray;`
`49`		`-typedef std::vector<unsigned char> LCDDataArray;`
	`48`	`+typedef std::vector<unsigned char> PixelsData;`
`50`	`49`
`51`	`50`	`} // namespace GLogiK`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ const uint16_t PBMFont::getCenteredYPos(void)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`void PBMFont::printCharacterOnFrame(`
`136`		`- PBMDataArray & frame,`
	`136`	`+ PixelsData & frame,`
`137`	`137`	`const std::string & character,`
`138`	`138`	`uint16_t & PBMXPos,`
`139`	`139`	`const uint16_t PBMYPos)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void SystemMonitor::init(FontsManager* const pFonts, const std::string & product`
`80`	`80`	`LCDPlugin::init(pFonts, product);`
`81`	`81`	`}`
`82`	`82`
`83`		`-const PBMDataArray & SystemMonitor::getNextPBMFrame(`
	`83`	`+const PixelsData & SystemMonitor::getNextPBMFrame(`
`84`	`84`	`FontsManager* const pFonts,`
`85`	`85`	`const std::string & LCDKey,`
`86`	`86`	`const bool lockedPlugin`