comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-27 06:08:37 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #372 from vsonnier/last_wstring_fixes

Browse Source 
Last string vs. wstring cleanups (hopefully)
This commit is contained in:
Charles J. Cliffe 2016-06-14 18:57:12 -04:00 committed by GitHub
commit 717f81f2d7
6 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DemodLabelDialog.cpp
View File

@ -42,15 +42,17 @@ void DemodLabelDialog::OnChar(wxKeyEvent& event) {
int c = event.GetKeyCode();
//we support 16 bit strings for user labels internally.
std::wstring strValue = dialogText->GetValue().ToStdWstring();
wxString strValue = dialogText->GetValue();
switch (c) {
case WXK_RETURN:
case WXK_NUMPAD_ENTER:
//No need to display the demodulator type twice if the user do not change the default value...
if (strValue != activeDemod->getDemodulatorType()) {
activeDemod->setDemodulatorUserLabel(strValue);
//when comparing getDemodulatorType() std::string, take care of "upgrading" it to wxString which will
//try to its best...
if (strValue != wxString(activeDemod->getDemodulatorType())) {
activeDemod->setDemodulatorUserLabel(strValue.ToStdWstring());
}
else {
activeDemod->setDemodulatorUserLabel(L"");

15
src/util/DataTree.cpp
View File

@ -30,7 +30,6 @@
#include <locale>
#include <stdlib.h>
#include <algorithm>
#include <cwchar>
/* DataElement class */
@ -119,6 +118,7 @@ void DataElement::set(const wstring &wstr_in) {
data_type = DATA_WSTRING;
//wchar_t is tricky, the terminating zero is actually a (wchar_t)0 !
//wchar_t is typically 16 bits on windows, and 32 bits on Unix, so use sizeof(wchar_t) everywhere.
size_t maxLenBytes = (wstr_in.length()+1) * sizeof(wchar_t);
//be paranoid, zero the buffer
@ -127,7 +127,6 @@ void DataElement::set(const wstring &wstr_in) {
//if something awful happens, the last sizeof(wchar_t) is at least zero...
wcstombs(tmp_str, wstr_in.c_str(), maxLenBytes - sizeof(wchar_t));
//fine the encoded size is in bytes, but nbBytesWritten do not count the zero, which is actually (wchar_t)0
data_init(maxLenBytes);
memcpy(data_val, tmp_str, data_size);
@ -313,7 +312,8 @@ void DataElement::get(wstring &wstr_in) {
if (data_val) {
//
//data_val is an array of bytes holding wchar_t characters, plus a terminating (wchar_t)0
//wchar_t is typically 16 bits on windows, and 32 bits on Unix, so use sizeof(wchar_t) everywhere.
int maxNbWchars = (data_size - sizeof(wchar_t)) / sizeof(wchar_t);
//be paranoid, zero the buffer
@ -597,6 +597,7 @@ std::string trim(std::string& s, const std::string& drop = " ") {
string DataTree::wsEncode(const wstring& wstr) {
stringstream encStream;
//wchar_t is typically 16 bits on windows, and 32 bits on Unix, so use sizeof(wchar_t) everywhere.
int bufSizeBytes = (wstr.length()+1) * sizeof(wchar_t);
char *data_str = (char *)calloc(bufSizeBytes, sizeof(char));
@ -627,12 +628,17 @@ wstring DataTree::wsDecode(const string& str) {
decStream << trim(decStr);
string sResult;
//this actually assume we will get as many char as wchar_t from the decodes string,
//who cares ?
int maxLen = decStr.length();
//wchar_t is typically 16 bits on windows, and 32 bits on Unix, so use sizeof(wchar_t) everywhere.
wchar_t *wc_str = (wchar_t *) calloc(maxLen + 1, sizeof(wchar_t));
while (!decStream.eof()) {
decStream >> std::hex >> x;
//extract actually 2 chars by 2 chars to form a char.
//extract actually 2 hex-chars by 2 hex-chars to form a char value.
mbstr << (unsigned char) x;
}
@ -640,7 +646,6 @@ wstring DataTree::wsDecode(const string& str) {
wstring result(wc_str);
//it is better not to free before use...
free(wc_str);
return result;

30
src/util/GLFont.cpp
View File

@ -128,18 +128,18 @@ std::wstring GLFont::nextParam(std::wistringstream &str) {
str >> param_str;
if (param_str.find('"') != std::wstring::npos) {
if (param_str.find(L'"') != std::wstring::npos) {
std::wstring rest;
while (!str.eof() && (std::count(param_str.begin(), param_str.end(), '"') % 2)) {
while (!str.eof() && (std::count(param_str.begin(), param_str.end(), L'"') % 2)) {
str >> rest;
param_str.append(" " + rest);
param_str.append(L" " + rest);
}
}
return param_str;
}
std::wstring GLFont::getParamKey(std::wstring param_str) {
std::wstring GLFont::getParamKey(const std::wstring& param_str) {
std::wstring keyName;
size_t eqpos = param_str.find(L"=");
@ -151,7 +151,7 @@ std::wstring GLFont::getParamKey(std::wstring param_str) {
return keyName;
}
std::wstring GLFont::getParamValue(std::wstring param_str) {
std::wstring GLFont::getParamValue(const std::wstring& param_str) {
std::wstring value;
size_t eqpos = param_str.find(L"=");
@ -160,7 +160,7 @@ std::wstring GLFont::getParamValue(std::wstring param_str) {
value = param_str.substr(eqpos + 1);
}
if (value[0] == '"' && value[value.length() - 1] == '"') {
if (value[0] == L'"' && value[value.length() - 1] == L'"') {
value = value.substr(1, value.length() - 2);
}
@ -215,7 +215,7 @@ void GLFont::loadFont(const std::wstring& fontFile) {
std::wstring paramKey = getParamKey(param);
std::wstring paramValue = getParamValue(param);
if (paramKey == "face") {
if (paramKey == L"face") {
fontName = paramValue;
}
@ -546,7 +546,7 @@ void GLFont::drawString(const std::wstring& str, float xpos, float ypos, int pxH
float advx = (float) fchar->getXAdvance() / (float) imageWidth;
if (charId == 32) {
advx = characters['_']->getAspect();
advx = characters[L'_']->getAspect();
}
glTranslatef(ofsx, 0.0, 0.0);
@ -569,17 +569,17 @@ void GLFont::drawString(const std::wstring& str, float xpos, float ypos, int pxH
// Draw string, immediate, 8 bit version
void GLFont::drawString(const std::string& str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy, bool cacheable) {
//Displayed string is wstring, so use wxString to do the heavy lifting of converting str...
#ifdef WIN32
//This a thread-safe wsTmp buffer to convert to wstring, reusing the same memory, unsupported: OSX?
static thread_local std::wstring wsTmp;
//try to reuse the memory with thread_local, unsupported on OSX ?
static thread_local wxString wsTmp;
#else
std::wstring wsTmp;
wxString wsTmp;
#endif
wsTmp.clear();
wsTmp.assign(str.begin(), str.end());
wsTmp.assign(str);
drawString(wsTmp, xpos, ypos, pxHeight, hAlign, vAlign, vpx, vpy, cacheable);
drawString(wsTmp.ToStdWstring(), xpos, ypos, pxHeight, hAlign, vAlign, vpx, vpy, cacheable);
}
// Draw cached GLFontCacheString
@ -681,7 +681,7 @@ GLFontStringCache *GLFont::cacheString(const std::wstring& str, int pxHeight, in
float advx = (float) fchar->getXAdvance() / (float) imageWidth;
if (charId == 32) {
advx = characters['_']->getAspect();
advx = characters[L'_']->getAspect();
}
// freeze transform to buffer

4
src/util/GLFont.h
View File

@ -93,8 +93,8 @@ public:
private:
std::wstring nextParam(std::wistringstream &str);
std::wstring getParamKey(std::wstring param_str);
std::wstring getParamValue(std::wstring param_str);
std::wstring getParamKey(const std::wstring& param_str);
std::wstring getParamValue(const std::wstring& param_str);
static GLFont fonts[GLFONT_MAX];

17
src/visual/PrimaryGLContext.cpp
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,

2
src/visual/PrimaryGLContext.h
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);
};