Implement PBMFont::getCenteredYPos.

Author: netfab

src/bin/daemon/LCDPlugins/LCDPlugin.cpp

@@ -195,23 +195,25 @@ void LCDPlugin::writeStringOnFrame(
 	const FontID fontID,
 	const std::string & string,
 	const int16_t PBMXPos,
-	const uint16_t PBMYPos)
+	const int16_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);
-		}
+		uint16_t XPos, YPos = 0;
+
+		XPos = (PBMXPos < 0) ? /* centered */
+				pFonts->getCenteredXPos(fontID, string) :
+				static_cast<uint16_t>(PBMXPos);
+
+		YPos = (PBMYPos < 0) ? /* centered */
+				pFonts->getCenteredYPos(fontID) :
+				static_cast<uint16_t>(PBMYPos);
 
 		for(const char & c : string) {
 			const std::string character(1, c);
-			pFonts->printCharacterOnFrame( fontID, (*_itCurrentFrame)._PBMData, character, XPos, PBMYPos );
+			pFonts->printCharacterOnFrame( fontID, (*_itCurrentFrame)._PBMData, character, XPos, YPos );
 		} /* for each character in the string */
 	}
 	catch (const GLogiKExcept & e) {
@@ -224,7 +226,7 @@ void LCDPlugin::writeStringOnLastFrame(
 	const FontID fontID,
 	const std::string & string,
 	const int16_t PBMXPos,
-	const uint16_t PBMYPos)
+	const int16_t PBMYPos)
 {
 	try {
 		if( _PBMFrames.empty() )

src/bin/daemon/LCDPlugins/LCDPlugin.hpp

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

src/bin/daemon/LCDPlugins/PBMFont.cpp

@@ -125,6 +125,13 @@ const uint16_t PBMFont::getCenteredXPos(const std::string & string)
 	return static_cast<uint16_t>(XPos/2);
 }
 
+const uint16_t PBMFont::getCenteredYPos(void)
+{
+	uint16_t YPos = PBM_HEIGHT; // FIXME LCD_HEIGHT
+	YPos -= _charHeight;
+	return static_cast<uint16_t>(YPos/2);
+}
+
 void PBMFont::printCharacterOnFrame(
 	PBMDataArray & frame,
 	const std::string & character,

src/bin/daemon/LCDPlugins/PBMFont.hpp

@@ -45,6 +45,7 @@ class PBMFont
 		virtual ~PBMFont(void);
 
 		const uint16_t getCenteredXPos(const std::string & string);
+		const uint16_t getCenteredYPos(void);
 
 		void printCharacterOnFrame(
 			PBMDataArray & frame,

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, -1, 10);
+	this->writeStringOnLastFrame(pFonts, FontID::DEJAVUSANSBOLD1616, product, -1, -1);
 
 	//this->addPBMFrame(PBMDirectory, "endscreen.pbm", 1); /* frame #0 */
 

src/bin/daemon/LCDPlugins/fontsManager.cpp

@@ -44,8 +44,8 @@ FontsManager::~FontsManager()
 
 const uint16_t FontsManager::getCenteredXPos(
 	const FontID fontID,
-	const std::string & string
-) {
+	const std::string & string)
+{
 	try {
 		return _fonts.at(fontID)->getCenteredXPos(string);
 	}
@@ -55,6 +55,17 @@ const uint16_t FontsManager::getCenteredXPos(
 	}
 }
 
+const uint16_t FontsManager::getCenteredYPos(const FontID fontID)
+{
+	try {
+		return _fonts.at(fontID)->getCenteredYPos();
+	}
+	catch (const std::out_of_range& oor) {
+		this->initializeFont(fontID);
+		return _fonts.at(fontID)->getCenteredYPos();
+	}
+}
+
 void FontsManager::printCharacterOnFrame(
 	const FontID fontID,
 	PBMDataArray & frame,

src/bin/daemon/LCDPlugins/fontsManager.hpp

@@ -44,6 +44,8 @@ class FontsManager
 			const std::string & string
 		);
 
+		const uint16_t getCenteredYPos(const FontID fontID);
+
 		void printCharacterOnFrame(
 			const FontID fontID,
 			PBMDataArray & frame,