Implement PBMFont::getCenteredXPos.

When PBMXpos is set to -1, LCDPlugin::writeStringOnFrame() will write
string horizontaly centered on LCD screen.

Author: netfab

src/bin/daemon/LCDPlugins/LCDPlugin.cpp

@@ -194,16 +194,24 @@ void LCDPlugin::writeStringOnFrame(
 	FontsManager* const pFonts,
 	const FontID fontID,
 	const std::string & string,
-	uint16_t PBMXPos,
+	const int16_t PBMXPos,
 	const uint16_t PBMYPos)
 {
 	try {
 #if DEBUGGING_ON && DEBUG_LCD_PLUGINS
 		LOG(DEBUG2) << this->getPluginName() << " PBM # " << _frameIndex << " - writing string : " << string;
 #endif
+		uint16_t XPos = 0;
+		if( PBMXPos < 0 ) { /* centered */
+			XPos = pFonts->getCenteredXPos(fontID, string);
+		}
+		else {
+			XPos = static_cast<uint16_t>(PBMXPos);
+		}
+
 		for(const char & c : string) {
 			const std::string character(1, c);
-			pFonts->printCharacterOnFrame( fontID, (*_itCurrentFrame)._PBMData, character, PBMXPos, PBMYPos );
+			pFonts->printCharacterOnFrame( fontID, (*_itCurrentFrame)._PBMData, character, XPos, PBMYPos );
 		} /* for each character in the string */
 	}
 	catch (const GLogiKExcept & e) {
@@ -215,7 +223,7 @@ void LCDPlugin::writeStringOnLastFrame(
 	FontsManager* const pFonts,
 	const FontID fontID,
 	const std::string & string,
-	uint16_t PBMXPos,
+	const int16_t PBMXPos,
 	const uint16_t PBMYPos)
 {
 	try {

src/bin/daemon/LCDPlugins/LCDPlugin.hpp

@@ -121,15 +121,15 @@ class LCDPlugin
 			FontsManager* const pFonts,
 			const FontID fontID,
 			const std::string & string,
-			uint16_t PBMXPos,
+			const int16_t PBMXPos,
 			const uint16_t PBMYPos
 		);
 
 		void writeStringOnLastFrame(
 			FontsManager* const pFonts,
 			const FontID fontID,
 			const std::string & string,
-			uint16_t PBMXPos,
+			const int16_t PBMXPos,
 			const uint16_t PBMYPos
 		);
 

src/bin/daemon/LCDPlugins/PBMFont.cpp

@@ -59,6 +59,8 @@ const charactersMap_type PBMFont::defaultCharsMap =
 		{";", {15,2} }, {"/", {16,2} }, {"-", {17,2} }, {"%", {18,2} },
 	};
 
+const std::string PBMFont::hackstring("mGMW%");
+
 PBMFont::PBMFont(
 	const std::string & PBMName,
 	const uint16_t PBMWidth,
@@ -108,6 +110,21 @@ PBMFont::~PBMFont()
 #endif
 }
 
+const uint16_t PBMFont::getCenteredXPos(const std::string & string)
+{
+	uint16_t XPos = PBM_WIDTH;
+	for(const char & c : string) {
+		XPos -= (_charWidth - _fontLeftShift);
+		// XXX
+		if(_extraLeftShift > 0) {
+			if(hackstring.find(c) == std::string::npos) {
+				XPos += _extraLeftShift;
+			}
+		}
+	}
+	return static_cast<uint16_t>(XPos/2);
+}
+
 void PBMFont::printCharacterOnFrame(
 	PBMDataArray & frame,
 	const std::string & character,
@@ -181,7 +198,7 @@ void PBMFont::printCharacterOnFrame(
 	// applying another leftshift, except for those characters
 	// which are very wide compared to others
 	if(_extraLeftShift > 0) {
-		if(std::string("mGMW%").find(character) == std::string::npos) {
+		if(hackstring.find(character) == std::string::npos) {
 			PBMXPos -= _extraLeftShift;
 		}
 	}

src/bin/daemon/LCDPlugins/PBMFont.hpp

@@ -44,6 +44,8 @@ class PBMFont
 	public:
 		virtual ~PBMFont(void);
 
+		const uint16_t getCenteredXPos(const std::string & string);
+
 		void printCharacterOnFrame(
 			PBMDataArray & frame,
 			const std::string & character,
@@ -80,6 +82,7 @@ class PBMFont
 		std::map<const std::string, std::pair<uint16_t, uint16_t>> _charsMap;
 
 		static const charactersMap_type defaultCharsMap;
+		static const std::string hackstring;
 
 		const unsigned char getCharacterLine(
 			const uint16_t line,

src/bin/daemon/LCDPlugins/endscreen.cpp

@@ -56,7 +56,7 @@ void Endscreen::init(FontsManager* const pFonts, const std::string & product)
 	PBMDirectory /= _plugin.getName();
 
 	this->addPBMClearedFrame();	/* frame #0 */
-	this->writeStringOnLastFrame(pFonts, FontID::DEJAVUSANSBOLD1616, product, 32, 10);
+	this->writeStringOnLastFrame(pFonts, FontID::DEJAVUSANSBOLD1616, product, -1, 10);
 
 	//this->addPBMFrame(PBMDirectory, "endscreen.pbm", 1); /* frame #0 */
 

src/bin/daemon/LCDPlugins/fontsManager.cpp

@@ -42,6 +42,35 @@ FontsManager::~FontsManager()
 	_fonts.clear();
 }
 
+const uint16_t FontsManager::getCenteredXPos(
+	const FontID fontID,
+	const std::string & string
+) {
+	try {
+		return _fonts.at(fontID)->getCenteredXPos(string);
+	}
+	catch (const std::out_of_range& oor) {
+		this->initializeFont(fontID);
+		return _fonts.at(fontID)->getCenteredXPos(string);
+	}
+}
+
+void FontsManager::printCharacterOnFrame(
+	const FontID fontID,
+	PBMDataArray & frame,
+	const std::string & c,
+	uint16_t & PBMXPos,
+	const uint16_t PBMYPos)
+{
+	try {
+		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
+	}
+	catch (const std::out_of_range& oor) {
+		this->initializeFont(fontID);
+		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
+	}
+}
+
 void FontsManager::initializeFont(const FontID fontID)
 {
 #if DEBUGGING_ON
@@ -70,21 +99,5 @@ void FontsManager::initializeFont(const FontID fontID)
 	_fonts[fontID] = font;
 }
 
-void FontsManager::printCharacterOnFrame(
-	const FontID fontID,
-	PBMDataArray & frame,
-	const std::string & c,
-	uint16_t & PBMXPos,
-	const uint16_t PBMYPos)
-{
-	try {
-		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
-	}
-	catch (const std::out_of_range& oor) {
-		this->initializeFont(fontID);
-		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
-	}
-}
-
 } // namespace GLogiK
 

src/bin/daemon/LCDPlugins/fontsManager.hpp

@@ -39,6 +39,11 @@ class FontsManager
 		FontsManager(void);
 		~FontsManager(void);
 
+		const uint16_t getCenteredXPos(
+			const FontID fontID,
+			const std::string & string
+		);
+
 		void printCharacterOnFrame(
 			const FontID fontID,
 			PBMDataArray & frame,