comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-09 09:24:57 -04:00
Code Issues Projects Releases Wiki Activity

wstring/string usage pass, should be clean now

Browse Source
This commit is contained in:
vsonnier
2016-06-14 19:41:19 +02:00
parent 44256f684a
commit 3918c7b9f4
6 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/PrimaryGLContext.cpp
+11 -6
View File
@@ -353,10 +353,14 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
GLFont::Align demodAlign = GLFont::GLFONT_ALIGN_CENTER;
std::string demodStr = demod->getDemodulatorType();
//Displayed string is 16 bit, so fill from a 8bit character by charater...
std::wstring demodStrW(demodStr.begin(), demodStr.end());
//Displayed string is wstring, so use wxString to do the heavy lifting of converting getDemodulatorType()...
#ifdef WIN32
//try to reuse the memory with thread_local, unsupported on OSX ?
static thread_local wxString demodStr;
#else
wxString demodStr;
#endif
demodStr.assign(demod->getDemodulatorType());
demodAlign = GLFont::GLFONT_ALIGN_CENTER;
@@ -387,7 +391,7 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
hPos += 1.3 * labelHeight;
}
drawSingleDemodLabel(demodStrW, uxPos, hPos, xOfs, yOfs, GLFont::GLFONT_ALIGN_CENTER);
drawSingleDemodLabel(demodStr.ToStdWstring(), uxPos, hPos, xOfs, yOfs, GLFont::GLFONT_ALIGN_CENTER);
//revert...
if (!demod->getDemodulatorUserLabel().empty()) {
@@ -399,12 +403,13 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
}
void PrimaryGLContext::drawSingleDemodLabel(std::wstring demodStr, float uxPos, float hPos, float xOfs, float yOfs, GLFont::Align demodAlign) {
void PrimaryGLContext::drawSingleDemodLabel(const std::wstring& demodStr, float uxPos, float hPos, float xOfs, float yOfs, GLFont::Align demodAlign) {
glColor3f(0, 0, 0);
GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5) + xOfs,
-1.0 + hPos - yOfs, 16, demodAlign,
GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
glColor3f(1, 1, 1);
GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5),
-1.0 + hPos, 16, demodAlign,
src/visual/PrimaryGLContext.h
+1 -1
View File
@@ -32,5 +32,5 @@ public:
private:
float hoverAlpha;
void drawSingleDemodLabel(std::wstring demodStr, float uxPos, float hPos, float xOfs, float yOfs, GLFont::Align demodAlign);
void drawSingleDemodLabel(const std::wstring& demodStr, float uxPos, float hPos, float xOfs, float yOfs, GLFont::Align demodAlign);
};