From cfdbcf9bc3cf4b564e3be91ca765312a27791ee5 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Mon, 14 Mar 2016 19:27:34 -0400 Subject: [PATCH 01/15] Patch major font rendering performance hit while zoomed --- src/panel/SpectrumPanel.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/panel/SpectrumPanel.cpp b/src/panel/SpectrumPanel.cpp index 699887f..5fcf2f6 100644 --- a/src/panel/SpectrumPanel.cpp +++ b/src/panel/SpectrumPanel.cpp @@ -222,8 +222,15 @@ void SpectrumPanel::drawPanelContents() { fontEnumSize = GLFont::GLFONT_SIZE16; hPos = 1.0 - (18.0 / viewHeight); } - + for (double m = -1.0 + mhzStart, mMax = 1.0 + ((mhzStart>0)?mhzStart:-mhzStart); m <= mMax; m += mhzStep) { + if (m < -1.0) { + currentMhz += mhzVisualStep; + continue; + } + if (m > 1.0) { + break; + } label << std::fixed << currentMhz; double fractpart, intpart; From 297e35ebf721559cd9eb708dfb926c64076cf098 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 15 Mar 2016 01:12:31 -0400 Subject: [PATCH 02/15] GLFont temporary string compiling/caching with garbage collect --- src/panel/SpectrumPanel.cpp | 2 +- src/util/GLFont.cpp | 212 +++++++++++++++++++++++++++++++- src/util/GLFont.h | 22 +++- src/visual/PrimaryGLContext.cpp | 10 +- src/visual/ScopeContext.cpp | 8 +- 5 files changed, 238 insertions(+), 16 deletions(-) diff --git a/src/panel/SpectrumPanel.cpp b/src/panel/SpectrumPanel.cpp index 5fcf2f6..048c858 100644 --- a/src/panel/SpectrumPanel.cpp +++ b/src/panel/SpectrumPanel.cpp @@ -254,7 +254,7 @@ void SpectrumPanel::drawPanelContents() { glColor4f(ThemeMgr::mgr.currentTheme->text.r, ThemeMgr::mgr.currentTheme->text.g, ThemeMgr::mgr.currentTheme->text.b,1.0); - GLFont::getFont(fontEnumSize).drawString(label.str(), m, hPos, fontSize, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(fontEnumSize).drawString(label.str(), m, hPos, fontSize, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); label.str(std::string()); diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp index 33cea52..0c7ebda 100644 --- a/src/util/GLFont.cpp +++ b/src/util/GLFont.cpp @@ -3,6 +3,8 @@ #include #include #include +#include "cubic_math.h" + #ifdef _MSC_VER #include @@ -27,6 +29,9 @@ static std::string getExePath(void) #define RES_FOLDER "" #endif +GLFontStringCache::GLFontStringCache() { + gc = 0; +} GLFont GLFont::fonts[GLFONT_MAX]; @@ -122,7 +127,7 @@ int GLFontChar::getIndex() { } GLFont::GLFont() : - lineHeight(0), base(0), imageWidth(0), imageHeight(0), loaded(false), texId(0) { + lineHeight(0), base(0), imageWidth(0), imageHeight(0), loaded(false), texId(0), gcCounter(0) { } @@ -423,11 +428,11 @@ float GLFont::getStringWidth(std::string str, float size, float viewAspect) { return width; } -void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy) { - - +// Draw string, immediate +void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy, bool cacheable) { + pxHeight *= 2; - + if (!vpx || !vpy) { GLint vp[4]; glGetIntegerv( GL_VIEWPORT, vp); @@ -435,6 +440,49 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A vpy = vp[3]; } + if (cacheable) { + gcCounter++; + + std::lock_guard lock(cache_busy); + + if (gcCounter > 200) { + doCacheGC(); + gcCounter = 0; + } + + GLFontStringCache *fc = nullptr; + + std::map > > >::iterator i1; + std::map > >::iterator i2; + std::map >::iterator i3; + std::map::iterator i4; + + i1 = stringCache.find(vpx); + if (i1 != stringCache.end()) { + i2 = i1->second.find(vpy); + if (i2 != i1->second.end()) { + i3 = i2->second.find(pxHeight); + if (i3 != i2->second.end()) { + i4 = i3->second.find(str); + if (i4 != i3->second.end()) { + fc = i4->second; + fc->gc = 0; + } + } + } + } + + if (fc == nullptr) { +// std::cout << "cache miss" << std::endl; + fc = cacheString(str, pxHeight, vpx, vpy); + stringCache[vpx][vpy][pxHeight][str] = fc; + } + + drawCacheString(fc, xpos, ypos, hAlign, vAlign); + + return; + } + float size = (float) pxHeight / (float) vpy; float viewAspect = (float) vpx / (float) vpy; float msgWidth = getStringWidth(str, size, viewAspect); @@ -499,6 +547,9 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A glTranslatef(fchar->getAspect() + advx, 0.0, 0.0); } + glVertexPointer(2, GL_FLOAT, 0, nullptr); + glTexCoordPointer(2, GL_FLOAT, 0, nullptr); + glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); glPopMatrix(); @@ -508,6 +559,157 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A glDisable(GL_TEXTURE_2D); } +// Draw cached GLFontCacheString +void GLFont::drawCacheString(GLFontStringCache *fc, float xpos, float ypos, Align hAlign, Align vAlign) { + + float size = (float) fc->pxHeight / (float) fc->vpy; + + glPushMatrix(); + glTranslatef(xpos, ypos, 0.0f); + + switch (vAlign) { + case GLFONT_ALIGN_TOP: + glTranslatef(0.0, -size, 0.0); + break; + case GLFONT_ALIGN_CENTER: + glTranslatef(0.0, -size/2.0, 0.0); + break; + default: + break; + } + + switch (hAlign) { + case GLFONT_ALIGN_RIGHT: + glTranslatef(-fc->msgWidth, 0.0, 0.0); + break; + case GLFONT_ALIGN_CENTER: + glTranslatef(-fc->msgWidth / 2.0, 0.0, 0.0); + break; + default: + break; + } + + glEnable(GL_TEXTURE_2D); + glBindTexture(GL_TEXTURE_2D, texId); + + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glVertexPointer(2, GL_FLOAT, 0, &fc->gl_vertices[0]); + glTexCoordPointer(2, GL_FLOAT, 0, &fc->gl_uv[0]); + + glDrawArrays(GL_QUADS, 0, 4 * fc->drawlen); + + glVertexPointer(2, GL_FLOAT, 0, nullptr); + glTexCoordPointer(2, GL_FLOAT, 0, nullptr); + + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + + glPopMatrix(); + + glDisable(GL_BLEND); + glDisable(GL_TEXTURE_2D); +} + +// Compile optimized GLFontCacheString +GLFontStringCache *GLFont::cacheString(std::string str, int pxHeight, int vpx, int vpy) { + GLFontStringCache *fc = new GLFontStringCache; + + fc->pxHeight = pxHeight; + fc->vpx = vpx; + fc->vpy = vpy; + + float size = (float) pxHeight / (float) vpy; + float viewAspect = (float) vpx / (float) vpy; + + fc->msgWidth = getStringWidth(str, size, viewAspect); + + int nChar = 0; + for (int i = 0, iMax = str.length(); i < iMax; i++) { + int charId = str.at(i); + + if (characters.find(charId) == characters.end()) { + continue; + } + nChar++; + } + + fc->drawlen = nChar; + fc->gl_vertices.resize(nChar*8); + fc->gl_uv.resize(nChar*8); + + + CubicVR::mat4 trans = CubicVR::mat4::scale(size / viewAspect, size, 1.0f); + + int c = 0; + for (int i = 0, iMax = str.length(); i < iMax; i++) { + int charId = str.at(i); + + if (characters.find(charId) == characters.end()) { + continue; + } + + GLFontChar *fchar = characters[charId]; + + float ofsx = (float) fchar->getXOffset() / (float) imageWidth; + float advx = (float) fchar->getXAdvance() / (float) imageWidth; + + if (charId == 32) { + advx = characters['_']->getAspect(); + } + + // freeze transform to buffer + trans *= CubicVR::mat4::translate(ofsx, 0.0, 0.0); + int charIdx = fchar->getIndex(); + for (int j = 0; j < 8; j+=2) { + CubicVR::vec3 pt(gl_vertices[charIdx + j],gl_vertices[charIdx + j + 1], 0.0); + pt = CubicVR::mat4::multiply(trans, pt, true); + fc->gl_vertices[c * 8 + j] = pt[0]; + fc->gl_vertices[c * 8 + j + 1] = pt[1]; + fc->gl_uv[c * 8 + j] = gl_uv[charIdx + j]; + fc->gl_uv[c * 8 + j + 1] = gl_uv[charIdx + j + 1]; + } + trans *= CubicVR::mat4::translate(fchar->getAspect() + advx, 0.0, 0.0); + c++; + } + + return fc; +} + +void GLFont::doCacheGC() { + std::map > > >::iterator i1; + std::map > >::iterator i2; + std::map >::iterator i3; + std::map::iterator i4; + + std::vector::iterator> removals; + std::vector::iterator>::iterator removals_i; + + for (i1 = stringCache.begin(); i1 != stringCache.end(); i1++) { + for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) { + for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) { + for (i4 = i3->second.begin(); i4 != i3->second.end(); i4++) { + i4->second->gc--; + if (i4->second->gc < -10) { + removals.push_back(i4); + } + } + } + } + } + + if (removals.size()) { + for (removals_i = removals.begin(); removals_i != removals.end(); removals_i++) { +// std::cout << "gc'd " << (*removals_i)->first << std::endl; + GLFontStringCache *fc = (*removals_i)->second; + stringCache[fc->vpx][fc->vpy][fc->pxHeight].erase(*removals_i); + delete (*removals_i)->second; + } + } +} GLFont &GLFont::getFont(GLFontSize esize) { diff --git a/src/util/GLFont.h b/src/util/GLFont.h index 048095a..86fc1c4 100644 --- a/src/util/GLFont.h +++ b/src/util/GLFont.h @@ -8,6 +8,18 @@ #include "wx/filename.h" #include "wx/stdpaths.h" +class GLFontStringCache { +public: + GLFontStringCache(); + int drawlen; + int vpx, vpy; + int pxHeight; + float msgWidth; + int gc; + std::vector gl_vertices; + std::vector gl_uv; +}; + class GLFontChar { public: GLFontChar(); @@ -66,12 +78,18 @@ public: bool isLoaded(); float getStringWidth(std::string str, float size, float viewAspect); - void drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign = GLFONT_ALIGN_LEFT, Align vAlign = GLFONT_ALIGN_TOP, int vpx=0, int vpy=0); + void drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign = GLFONT_ALIGN_LEFT, Align vAlign = GLFONT_ALIGN_TOP, int vpx=0, int vpy=0, bool cacheable = false); static GLFont fonts[GLFONT_MAX]; static GLFont &getFont(GLFontSize esize); + GLFontStringCache *cacheString(std::string str, int pxHeight, int vpx, int vpy); + void drawCacheString(GLFontStringCache *fc, float xpos, float ypos, Align hAlign, Align vAlign); + + void doCacheGC(); private: + std::map > > > stringCache; + std::string nextParam(std::istringstream &str); std::string getParamKey(std::string param_str); std::string getParamValue(std::string param_str); @@ -90,4 +108,6 @@ private: std::string imageFile; std::string fontFileSource; GLuint texId; + int gcCounter; + std::mutex cache_busy; }; diff --git a/src/visual/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp index cf294f0..9a62538 100644 --- a/src/visual/PrimaryGLContext.cpp +++ b/src/visual/PrimaryGLContext.cpp @@ -166,11 +166,11 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l } if (demod->getDemodulatorType() == "USB") { - GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); } else if (demod->getDemodulatorType() == "LSB") { - GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); } else { - GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); } glDisable(GL_BLEND); @@ -381,9 +381,9 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long 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); + 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, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5), -1.0 + hPos, 16, demodAlign, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); glDisable(GL_BLEND); diff --git a/src/visual/ScopeContext.cpp b/src/visual/ScopeContext.cpp index a24e4b8..75741c4 100644 --- a/src/visual/ScopeContext.cpp +++ b/src/visual/ScopeContext.cpp @@ -35,9 +35,9 @@ void ScopeContext::DrawTunerTitles(bool ppmMode) { glColor3f(0.65, 0.65, 0.65); - GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER); - GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Bandwidth", 0.0, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER); - GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); + GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Bandwidth", 0.0, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); + GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); } void ScopeContext::DrawDeviceName(std::string deviceName) { @@ -47,7 +47,7 @@ void ScopeContext::DrawDeviceName(std::string deviceName) { float hPos = (float) (viewHeight - 20) / viewHeight; glColor3f(0.65, 0.65, 0.65); - GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(deviceName.c_str(), 1.0, hPos, 12, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER); + GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(deviceName.c_str(), 1.0, hPos, 12, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true); } void ScopeContext::DrawEnd() { From 7b3942fbcfc632c4b0f14edf6d11923d3a3e158d Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 15 Mar 2016 01:25:07 -0400 Subject: [PATCH 03/15] De-construct empty cache tree branches on GC --- src/util/GLFont.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp index 0c7ebda..2923dad 100644 --- a/src/util/GLFont.cpp +++ b/src/util/GLFont.cpp @@ -707,6 +707,16 @@ void GLFont::doCacheGC() { GLFontStringCache *fc = (*removals_i)->second; stringCache[fc->vpx][fc->vpy][fc->pxHeight].erase(*removals_i); delete (*removals_i)->second; + + if (!stringCache[fc->vpx][fc->vpy][fc->pxHeight].size()) { + stringCache[fc->vpx][fc->vpy].erase(stringCache[fc->vpx][fc->vpy].find(fc->pxHeight)); + if (!stringCache[fc->vpx][fc->vpy].size()) { + stringCache[fc->vpx].erase(stringCache[fc->vpx].find(fc->vpy)); + if (!stringCache[fc->vpx].size()) { + stringCache.erase(stringCache.find(fc->vpx)); + } + } + } } } } From 3460e4fcaff06c6d158e272c9728dd1f460300b5 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 15 Mar 2016 21:19:29 -0400 Subject: [PATCH 04/15] Fix linux build --- src/util/GLFont.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/GLFont.h b/src/util/GLFont.h index 86fc1c4..4024a00 100644 --- a/src/util/GLFont.h +++ b/src/util/GLFont.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "lodepng.h" #include "wx/glcanvas.h" #include "wx/filename.h" From 89338acbf1389062ace3f26155685eb4758075c1 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 16 Mar 2016 22:51:32 -0400 Subject: [PATCH 05/15] AppImageKit build script updates --- cmake/buildAppImage.sh.in | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/cmake/buildAppImage.sh.in b/cmake/buildAppImage.sh.in index 192eb4a..121ff96 100755 --- a/cmake/buildAppImage.sh.in +++ b/cmake/buildAppImage.sh.in @@ -12,22 +12,30 @@ mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/ cp -R /usr/local/lib/SoapySDR ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/ mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib -pushd . -cd ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/ -find . -type f -exec sed -i -e 's|/usr|././|g' {} \; -popd -IGNORE_PKG="libc6.* libusb.* libgcc.* libstd.* libudev.* libgtk.* libgdk.* libx.* libpango.* libglib.* libgl.* libcairo.* libfont.* libatk.* libwayland.* libthai.* libpixman.* zlib.* libpcre.* libice.* libuuid.* libpulse.* libjson.* libdbus.* libatspi.* libharf.* libselinux.* libmir.* libboost-system.* libprotobuf.* libdatrie.* libsystem.* libwrap.* libsndfile.* libasync.* libgraphite.* liblzma.* libgcrypt.* libflac.* libvorbis.* libgpg.* libogg.* libsm6 libpng.* libexpat.* libdrm.* libffi.* libfreetype.* libboost-filesystem.*" +IGNORE_PKG="libc6.* libusb.* libgcc.* libstd.* libudev.* libgtk.* libgdk.* libx.* libpango.* libglib.* libgl.* libcairo.* libfont.* libatk.* libwayland.* libthai.* libpixman.* zlib.* libpcre.* libice.* libuuid.* libpulse.* libjson.* libdbus.* libatspi.* libharf.* libselinux.* libmir.* libboost-system.* libprotobuf.* libdatrie.* libsystem.* libwrap.* libsndfile.* libasync.* libgraphite.* liblzma.* libgcrypt.* libflac.* libvorbis.* libgpg.* libogg.* libsm6 libpng.* libexpat.* libdrm.* libffi.* libfreetype.* libboost-filesystem.* libmirsdr.*" + +IGNORE_LIB="^.*libmirsdr.*" + for f in `find ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/SoapySDR/modules/ -type f` ${CMAKE_CURRENT_BINARY_DIR}/${EX_PLATFORM_NAME}/CubicSDR do for l in `ldd $f | grep so | sed -e '/^[^\t]/ d' | sed -e 's/\t//' | sed -e 's/.*=..//' | sed -e 's/ (0.*)//'` - do + do echo "Checking what package owns $l: " OWNER_PKG=`apt-file --package-only find $l` SKIP_PKG=0 - if [ "$OWNER_PKG" = "" ]; then - echo "$l has no package, copying to AppDir.." + + for i in $IGNORE_LIB + do + if [[ $l =~ $i ]]; then + echo "Ignoring lib $l matching explicit library ignore regex $i" + SKIP_PKG=1 + fi + done + + if [ "$OWNER_PKG" = "" ] && [ $SKIP_PKG = 0 ]; then + echo "*** $l has no package, copying to AppDir.." cp $l ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib/ SKIP_PKG=1 fi @@ -39,14 +47,20 @@ do SKIP_PKG=1 fi done + if [ $SKIP_PKG = 0 ]; then #SO_FILE=`echo $l | sed 's/\.so\.[^\.]*$//'`.so - echo "$OWNER_PKG not in ignore list, copying $l to AppDir.." + echo "*** $OWNER_PKG not in ignore list, copying $l to AppDir.." cp $l ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib/ fi done done +pushd . +cd ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/ +find . -type f -exec sed -i -e 's|/usr|././|g' {} \; +popd + pushd . cd ${CMAKE_CURRENT_BINARY_DIR} ${APPIMAGEKIT_APPASSIST} CubicSDR.AppDir CubicSDR From a2cf52771c02ba9c6029b9e290314f9d7ae93075 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 17 Mar 2016 18:31:02 -0400 Subject: [PATCH 06/15] Change OSX minimum version to 10.9 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 011e5e4..29bcc12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,7 +238,7 @@ ENDIF(USE_AUDIO_OSS) ENDIF(UNIX AND NOT APPLE) IF (APPLE) - SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.10") + SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.9") SET(FFTW_LIB fftw3f) SET(LIQUID_LIB liquid) @@ -582,7 +582,7 @@ ENDIF(MSVC) IF (APPLE) ADD_DEFINITIONS( -DHAVE_TYPE_TRAITS=1 - -mmacosx-version-min=10.10 + -mmacosx-version-min=10.9 ) ENDIF(APPLE) From 020145c705f56f9e33f92057a4fbf4388c595787 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 20 Mar 2016 18:56:13 -0400 Subject: [PATCH 07/15] Make FFTW3 optional; liquid-dsp is performing better on it's own.. --- CMakeLists.txt | 73 +++++++++++--- src/process/ScopeVisualProcessor.cpp | 91 +++++++++++++++--- src/process/ScopeVisualProcessor.h | 12 ++- src/process/SpectrumVisualProcessor.cpp | 123 +++++++++++++++++++++++- src/process/SpectrumVisualProcessor.h | 15 ++- src/ui/UITestCanvas.h | 1 - src/visual/GainCanvas.h | 1 - src/visual/MeterCanvas.h | 1 - src/visual/ModeSelectorCanvas.h | 1 - src/visual/ScopeCanvas.h | 1 - src/visual/TuningCanvas.h | 1 - 11 files changed, 277 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1e2cf7..7ac972d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,12 @@ ADD_DEFINITIONS( ENDIF() ENDIF() +SET (ENABLE_FFTW3 OFF CACHE BOOL "Use fftw3 instead of liquid-dsp internal fft.") +IF(ENABLE_FFTW3) + ADD_DEFINITIONS( + -DUSE_FFTW3=1 + ) +ENDIF() set(USE_HAMLIB OFF CACHE BOOL "Support hamlib for radio control functions.") @@ -114,9 +120,11 @@ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/${EX_PLATFORM_ IF (MSVC) include_directories ("${PROJECT_SOURCE_DIR}/external/wglext") - SET(FFTW_INCLUDES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/" CACHE STRING "FFTW Include Directory") - SET(FFTW_LIBRARIES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.lib" CACHE STRING "FFTW Library") - SET(FFTW_DLL "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.dll" CACHE STRING "FFTW DLL") + IF(ENABLE_FFTW3) + SET(FFTW_INCLUDES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/" CACHE STRING "FFTW Include Directory") + SET(FFTW_LIBRARIES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.lib" CACHE STRING "FFTW Library") + SET(FFTW_DLL "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.dll" CACHE STRING "FFTW DLL") + ENDIF() SET(LIQUID_INCLUDES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/include/" CACHE STRING "Liquid-DSP include directory") SET(LIQUID_LIBRARIES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.lib" CACHE STRING "Liquid-DSP Library") SET(LIQUID_DLL "${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.dll" CACHE STRING "Liquid-DSP DLL") @@ -128,12 +136,16 @@ ELSE (MSVC) ENDIF(MSVC) find_package(OpenGL REQUIRED) -#IF (NOT WIN32) -find_package(FFTW REQUIRED) + +IF(ENABLE_FFTW3) + find_package(FFTW REQUIRED) + include_directories(${FFTW_INCLUDES}) + SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${FFTW_LIBRARIES}) +ENDIF() + find_package(Liquid REQUIRED) -include_directories(${LIQUID_INCLUDES} ${FFTW_INCLUDES}) -SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES} ${FFTW_LIBRARIES}) -#ENDIF() +include_directories(${LIQUID_INCLUDES}) +SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES}) find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED) set(wxWidgets_CONFIGURATION mswu) @@ -198,7 +210,10 @@ IF (UNIX AND NOT APPLE) SET(USE_AUDIO_ALSA OFF CACHE BOOL "Use ALSA Audio") SET(USE_AUDIO_OSS OFF CACHE BOOL "Use OSS Audio") - SET(FFTW_LIB fftw3f) + IF(ENABLE_FFTW3) + SET(FFTW_LIB fftw3f) + ENDIF() + SET(LIQUID_LIB liquid) SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} dl) @@ -240,7 +255,10 @@ ENDIF(UNIX AND NOT APPLE) IF (APPLE) SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.9") - SET(FFTW_LIB fftw3f) + IF(ENABLE_FFTW3) + SET(FFTW_LIB fftw3f) + ENDIF() + SET(LIQUID_LIB liquid) link_directories(/usr/local/lib) link_directories(/opt/local/lib) @@ -560,11 +578,16 @@ IF (NOT BUNDLE_APP) configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.png") configure_files(${PROJECT_SOURCE_DIR}/icon ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} CubicSDR.ico) IF(MSVC) - configure_files(${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") + IF(ENABLE_FFTW3) + configure_files(${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") + ENDIF() configure_files(${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") ENDIF() add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES}) - target_link_libraries(CubicSDR ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES}) + IF(ENABLE_FFTW3) + target_link_libraries(CubicSDR ${FFTW_LIB}) + ENDIF() + target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES}) ENDIF (NOT BUNDLE_APP) IF (MSVC) @@ -624,7 +647,11 @@ IF (APPLE AND BUNDLE_APP) MACOSX_PACKAGE_LOCATION Resources ) - target_link_libraries(CubicSDR ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES}) + IF(ENABLE_FFTW3) + target_link_libraries(CubicSDR ${FFTW_LIB}) + ENDIF() + + target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES}) SET_TARGET_PROPERTIES(CubicSDR PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_STRING "CubicSDR Open-Source Software-Defined Radio Application" @@ -779,9 +806,15 @@ IF (WIN32 AND NOT BUILD_INSTALLER) INSTALL(TARGETS CubicSDR DESTINATION bin) INSTALL(FILES - ${FFTW_DLL} ${LIQUID_DLL} DESTINATION bin) + + IF(ENABLE_FFTW3) + INSTALL(FILES + ${FFTW_DLL} + DESTINATION bin) + ENDIF() + INSTALL(FILES ${CUBICSDR_RESOURCES} ${PROJECT_SOURCE_DIR}/src/CubicSDR.png @@ -817,10 +850,15 @@ IF (WIN32 AND BUILD_INSTALLER) install(FILES ${CUBICSDR_RESOURCES} ${PROJECT_SOURCE_DIR}/icon/CubicSDR.ico - ${FFTW_DLL} ${LIQUID_DLL} DESTINATION .) + IF(ENABLE_FFTW3) + install(FILES + ${FFTW_DLL} + DESTINATION .) + ENDIF() + IF (BUNDLE_SOAPY_MODS) ADD_DEFINITIONS( -DBUNDLE_SOAPY_MODS=1 @@ -854,7 +892,10 @@ ENDIF (WIN32 AND BUILD_INSTALLER) IF (UNIX AND NOT APPLE AND BUILD_DEB) set(CPACK_GENERATOR DEB) set(CPACK_PACKAGE_NAME "CubicSDR") - SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libfftw3-single3, libwxgtk3.0-0, libpulse0") + SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libwxgtk3.0-0, libpulse0") + IF(ENABLE_FFTW3) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libfftw3-single3") + ENDIF() SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Charles J. Cliffe ") SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "CubicSDR Software Defined Radio application v${CUBICSDR_VERSION}") SET(CPACK_DEBIAN_PACKAGE_SECTION "comm") diff --git a/src/process/ScopeVisualProcessor.cpp b/src/process/ScopeVisualProcessor.cpp index c9f250b..38c3c0a 100644 --- a/src/process/ScopeVisualProcessor.cpp +++ b/src/process/ScopeVisualProcessor.cpp @@ -2,31 +2,54 @@ #include #include -ScopeVisualProcessor::ScopeVisualProcessor(): outputBuffers("ScopeVisualProcessorBuffers"), fftInData(NULL), fftwOutput(NULL), fftw_plan(NULL), maxScopeSamples(1024) { +ScopeVisualProcessor::ScopeVisualProcessor(): outputBuffers("ScopeVisualProcessorBuffers") { scopeEnabled.store(true); spectrumEnabled.store(true); fft_average_rate = 0.65; fft_ceil_ma = fft_ceil_maa = 0; fft_floor_ma = fft_floor_maa = 0; + maxScopeSamples = 1024; +#if USE_FFTW3 + fftInData = nullptr; + fftwOutput = nullptr; + fftw_plan = nullptr; +#else + fftInData = nullptr; + fftOutput = nullptr; + fftPlan = nullptr; +#endif } ScopeVisualProcessor::~ScopeVisualProcessor() { - /*if (fftInData) { +#if USE_FFTW3 + if (fftw_plan) { + fftwf_destroy_plan(fftw_plan); + } + if (fftInData) { free(fftInData); } if (fftwOutput) { free(fftwOutput); - }*/ - if (fftw_plan) { - fftwf_destroy_plan(fftw_plan); } +#else + if (fftPlan) { + fft_destroy_plan(fftPlan); + } + if (fftInData) { + free(fftInData); + } + if (fftOutput) { + free(fftOutput); + } +#endif } void ScopeVisualProcessor::setup(int fftSize_in) { fftSize = fftSize_in; desiredInputSize = fftSize; - + +#if USE_FFTW3 if (fftInData) { free(fftInData); } @@ -39,9 +62,20 @@ void ScopeVisualProcessor::setup(int fftSize_in) { fftwf_destroy_plan(fftw_plan); } fftw_plan = fftwf_plan_dft_r2c_1d(fftSize, fftInData, fftwOutput, FFTW_ESTIMATE); - //(fftSize, fftInData, fftwOutput, 0); - //(fftSize, fftwInput, fftwOutput, FFTW_R2HC, FFTW_ESTIMATE); - +#else + if (fftInData) { + free(fftInData); + } + fftInData = (liquid_float_complex*) malloc(sizeof(liquid_float_complex) * fftSize); + if (fftOutput) { + free(fftOutput); + } + fftOutput = (liquid_float_complex*) malloc(sizeof(liquid_float_complex) * fftSize); + if (fftPlan) { + fft_destroy_plan(fftPlan); + } + fftPlan = fft_create_plan(fftSize, fftInData, fftOutput, LIQUID_FFT_FORWARD, 0); +#endif } void ScopeVisualProcessor::setScopeEnabled(bool scopeEnable) { @@ -130,6 +164,7 @@ void ScopeVisualProcessor::process() { if (spectrumEnabled) { iMax = audioInputData->data.size(); +#if USE_FFTW3 if (audioInputData->channels==1) { for (i = 0; i < fftSize; i++) { if (i < iMax) { @@ -148,6 +183,29 @@ void ScopeVisualProcessor::process() { } } } +#else + if (audioInputData->channels==1) { + for (i = 0; i < fftSize; i++) { + if (i < iMax) { + fftInData[i].real = audioInputData->data[i]; + fftInData[i].imag = 0; + } else { + fftInData[i].real = 0; + } + } + } else if (audioInputData->channels==2) { + iMax = iMax/2; + for (i = 0; i < fftSize; i++) { + if (i < iMax) { + fftInData[i].real = audioInputData->data[i] + audioInputData->data[iMax+i]; + fftInData[i].imag = 0; + } else { + fftInData[i].real = 0; + fftInData[i].imag = 0; + } + } + } +#endif renderData = outputBuffers.getBuffer(); @@ -156,9 +214,7 @@ void ScopeVisualProcessor::process() { renderData->sampleRate = audioInputData->sampleRate; audioInputData->decRefCount(); - - fftwf_execute(fftw_plan); - + float fft_ceil = 0, fft_floor = 1; if (fft_result.size() < (fftSize/2)) { @@ -166,12 +222,23 @@ void ScopeVisualProcessor::process() { fft_result_ma.resize((fftSize/2)); fft_result_maa.resize((fftSize/2)); } + +#if USE_FFTW3 + fftwf_execute(fftw_plan); for (i = 0; i < (fftSize/2); i++) { float a = fftwOutput[i][0]; float b = fftwOutput[i][1]; fft_result[i] = sqrt( a * a + b * b); } +#else + fft_execute(fftPlan); + for (i = 0; i < (fftSize/2); i++) { + float a = fftOutput[i].real; + float b = fftOutput[i].imag; + fft_result[i] = sqrt( a * a + b * b); + } +#endif for (i = 0; i < (fftSize/2); i++) { fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * fft_average_rate; diff --git a/src/process/ScopeVisualProcessor.h b/src/process/ScopeVisualProcessor.h index 001d301..229804d 100644 --- a/src/process/ScopeVisualProcessor.h +++ b/src/process/ScopeVisualProcessor.h @@ -2,9 +2,12 @@ #include "VisualProcessor.h" #include "AudioThread.h" -#include "fftw3.h" #include "ScopePanel.h" +#if USE_FFTW3 +#include "fftw3.h" +#endif + class ScopeRenderData: public ReferenceCounter { public: std::vector waveform_points; @@ -33,9 +36,16 @@ protected: std::atomic_bool scopeEnabled; std::atomic_bool spectrumEnabled; +#if USE_FFTW3 float *fftInData; fftwf_complex *fftwOutput; fftwf_plan fftw_plan; +#else + liquid_float_complex *fftInData; + liquid_float_complex *fftOutput; + fftplan fftPlan; +#endif + unsigned int fftSize; int desiredInputSize; unsigned int maxScopeSamples; diff --git a/src/process/SpectrumVisualProcessor.cpp b/src/process/SpectrumVisualProcessor.cpp index 5493a31..1a43af4 100644 --- a/src/process/SpectrumVisualProcessor.cpp +++ b/src/process/SpectrumVisualProcessor.cpp @@ -2,7 +2,26 @@ #include "CubicSDR.h" -SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisualProcessorBuffers"), lastInputBandwidth(0), lastBandwidth(0), fftwInput(NULL), fftwOutput(NULL), fftInData(NULL), fftLastData(NULL), lastDataSize(0), fftw_plan(NULL), resampler(NULL), resamplerRatio(0) { +SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisualProcessorBuffers") { + lastInputBandwidth = 0; + lastBandwidth = 0; + lastDataSize = 0; + resampler = nullptr; + resamplerRatio = 0; + +#if USE_FFTW3 + fftwInput = nullptr; + fftwOutput = nullptr; + fftInData = nullptr; + fftLastData = nullptr; + fftw_plan = nullptr; +#else + fftInput = nullptr; + fftOutput = nullptr; + fftInData = nullptr; + fftLastData = nullptr; + fftPlan = nullptr; +#endif is_view.store(false); fftSize.store(0); @@ -23,6 +42,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisu lastView = false; peakHold.store(false); peakReset.store(false); + } SpectrumVisualProcessor::~SpectrumVisualProcessor() { @@ -101,7 +121,8 @@ void SpectrumVisualProcessor::setup(unsigned int fftSize_in) { fftSize = fftSize_in; fftSizeInternal = fftSize_in * SPECTRUM_VZM; lastDataSize = 0; - + +#if USE_FFTW3 int memSize = sizeof(fftwf_complex) * fftSizeInternal; if (fftwInput) { @@ -136,6 +157,39 @@ void SpectrumVisualProcessor::setup(unsigned int fftSize_in) { fftwf_destroy_plan(fftw_plan); } fftw_plan = fftwf_plan_dft_1d(fftSizeInternal, fftwInput, fftwOutput, FFTW_FORWARD, FFTW_ESTIMATE); +#else + int memSize = sizeof(liquid_float_complex) * fftSizeInternal; + + if (fftInput) { + free(fftInput); + } + fftInput = (liquid_float_complex*)malloc(memSize); + memset(fftInput,0,memSize); + + if (fftInData) { + free(fftInData); + } + fftInData = (liquid_float_complex*)malloc(memSize); + memset(fftInput,0,memSize); + + if (fftLastData) { + free(fftLastData); + } + fftLastData = (liquid_float_complex*)malloc(memSize); + memset(fftInput,0,memSize); + + if (fftOutput) { + free(fftOutput); + } + fftOutput = (liquid_float_complex*)malloc(memSize); + memset(fftInput,0,memSize); + + if (fftPlan) { + fft_destroy_plan(fftPlan); + } + fftPlan = fft_create_plan(fftSizeInternal, fftInput, fftOutput, LIQUID_FFT_FORWARD, 0); +#endif + busy_run.unlock(); } @@ -311,6 +365,7 @@ void SpectrumVisualProcessor::process() { msresamp_crcf_execute(resampler, &shiftBuffer[0], desired_input_size, &resampleBuffer[0], &num_written); +#if USE_FFTW3 if (num_written < fftSizeInternal) { for (unsigned int i = 0; i < num_written; i++) { fftInData[i][0] = resampleBuffer[i].real; @@ -326,10 +381,19 @@ void SpectrumVisualProcessor::process() { fftInData[i][1] = resampleBuffer[i].imag; } } +#else + if (num_written < fftSizeInternal) { + memcpy(fftInData, resampleBuffer.data(), num_written * sizeof(liquid_float_complex)); + memset(&(fftInData[num_written]), 0, (fftSizeInternal-num_written) * sizeof(liquid_float_complex)); + } else { + memcpy(fftInData, resampleBuffer.data(), fftSizeInternal * sizeof(liquid_float_complex)); + } +#endif } else { this->desiredInputSize.store(fftSizeInternal); num_written = data->size(); +#if USE_FFTW3 if (data->size() < fftSizeInternal) { for (size_t i = 0, iMax = data->size(); i < iMax; i++) { fftInData[i][0] = (*data)[i].real; @@ -345,10 +409,19 @@ void SpectrumVisualProcessor::process() { fftInData[i][1] = (*data)[i].imag; } } +#else + if (data->size() < fftSizeInternal) { + memcpy(fftInData, data->data(), data->size() * sizeof(liquid_float_complex)); + memset(&fftInData[data->size()], 0, (fftSizeInternal - data->size()) * sizeof(liquid_float_complex)); + } else { + memcpy(fftInData, data->data(), fftSizeInternal * sizeof(liquid_float_complex)); + } +#endif } bool execute = false; - + +#if USE_FFTW3 if (num_written >= fftSizeInternal) { execute = true; memcpy(fftwInput, fftInData, fftSizeInternal * sizeof(fftwf_complex)); @@ -370,6 +443,29 @@ void SpectrumVisualProcessor::process() { execute = true; } } +#else + if (num_written >= fftSizeInternal) { + execute = true; + memcpy(fftInput, fftInData, fftSizeInternal * sizeof(liquid_float_complex)); + memcpy(fftLastData, fftInput, fftSizeInternal * sizeof(liquid_float_complex)); + + } else { + if (lastDataSize + num_written < fftSizeInternal) { // priming + unsigned int num_copy = fftSizeInternal - lastDataSize; + if (num_written > num_copy) { + num_copy = num_written; + } + memcpy(fftLastData, fftInData, num_copy * sizeof(liquid_float_complex)); + lastDataSize += num_copy; + } else { + unsigned int num_last = (fftSizeInternal - num_written); + memcpy(fftInput, fftLastData + (lastDataSize - num_last), num_last * sizeof(liquid_float_complex)); + memcpy(fftInput + num_last, fftInData, num_written * sizeof(liquid_float_complex)); + memcpy(fftLastData, fftInput, fftSizeInternal * sizeof(liquid_float_complex)); + execute = true; + } + } +#endif if (execute) { SpectrumVisualData *output = outputBuffers.getBuffer(); @@ -385,9 +481,10 @@ void SpectrumVisualProcessor::process() { output->spectrum_hold_points.resize(0); } - fftwf_execute(fftw_plan); - float fft_ceil = 0, fft_floor = 1; + +#if USE_FFTW3 + fftwf_execute(fftw_plan); for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) { float a = fftwOutput[i][0]; @@ -401,6 +498,22 @@ void SpectrumVisualProcessor::process() { fft_result[i] = (z); fft_result[fftSizeInternal / 2 + i] = (c); } +#else + fft_execute(fftPlan); + + for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) { + float a = fftOutput[i].real; + float b = fftOutput[i].imag; + float c = sqrt(a * a + b * b); + + float x = fftOutput[fftSizeInternal / 2 + i].real; + float y = fftOutput[fftSizeInternal / 2 + i].imag; + float z = sqrt(x * x + y * y); + + fft_result[i] = (z); + fft_result[fftSizeInternal / 2 + i] = (c); + } +#endif if (newResampler && lastView) { if (bwDiff < 0) { diff --git a/src/process/SpectrumVisualProcessor.h b/src/process/SpectrumVisualProcessor.h index f8697cc..57f3036 100644 --- a/src/process/SpectrumVisualProcessor.h +++ b/src/process/SpectrumVisualProcessor.h @@ -2,9 +2,12 @@ #include "VisualProcessor.h" #include "DemodDefs.h" -#include "fftw3.h" #include +#if USE_FFTW3 +#include "fftw3.h" +#endif + #define SPECTRUM_VZM 2 #define PEAK_RESET_COUNT 30 @@ -63,10 +66,16 @@ private: long lastInputBandwidth; long lastBandwidth; bool lastView; - + +#if USE_FFTW3 fftwf_complex *fftwInput, *fftwOutput, *fftInData, *fftLastData; - unsigned int lastDataSize; fftwf_plan fftw_plan; +#else + liquid_float_complex *fftInput, *fftOutput, *fftInData, *fftLastData; + fftplan fftPlan; +#endif + + unsigned int lastDataSize; double fft_ceil_ma, fft_ceil_maa; double fft_floor_ma, fft_floor_maa; diff --git a/src/ui/UITestCanvas.h b/src/ui/UITestCanvas.h index 29e042c..52f1655 100644 --- a/src/ui/UITestCanvas.h +++ b/src/ui/UITestCanvas.h @@ -10,7 +10,6 @@ #include "UITestContext.h" #include "MouseTracker.h" -#include "fftw3.h" #include "Timer.h" class UITestCanvas: public InteractiveCanvas { diff --git a/src/visual/GainCanvas.h b/src/visual/GainCanvas.h index d1eb50d..edb285e 100644 --- a/src/visual/GainCanvas.h +++ b/src/visual/GainCanvas.h @@ -11,7 +11,6 @@ #include "GLPanel.h" #include "PrimaryGLContext.h" -#include "fftw3.h" #include "Timer.h" class GainInfo { diff --git a/src/visual/MeterCanvas.h b/src/visual/MeterCanvas.h index 95a7b42..46b9c00 100644 --- a/src/visual/MeterCanvas.h +++ b/src/visual/MeterCanvas.h @@ -10,7 +10,6 @@ #include "MeterContext.h" #include "MouseTracker.h" -#include "fftw3.h" #include "Timer.h" class MeterCanvas: public InteractiveCanvas { diff --git a/src/visual/ModeSelectorCanvas.h b/src/visual/ModeSelectorCanvas.h index bdbcc41..af020d7 100644 --- a/src/visual/ModeSelectorCanvas.h +++ b/src/visual/ModeSelectorCanvas.h @@ -10,7 +10,6 @@ #include "ModeSelectorContext.h" #include "MouseTracker.h" -#include "fftw3.h" #include "Timer.h" class ModeSelectorMode { diff --git a/src/visual/ScopeCanvas.h b/src/visual/ScopeCanvas.h index 3a04f9a..222166a 100644 --- a/src/visual/ScopeCanvas.h +++ b/src/visual/ScopeCanvas.h @@ -10,7 +10,6 @@ #include "ScopeVisualProcessor.h" #include "ScopePanel.h" #include "SpectrumPanel.h" -#include "fftw3.h" #include "InteractiveCanvas.h" class ScopeCanvas: public InteractiveCanvas { diff --git a/src/visual/TuningCanvas.h b/src/visual/TuningCanvas.h index 403181f..47460f2 100644 --- a/src/visual/TuningCanvas.h +++ b/src/visual/TuningCanvas.h @@ -10,7 +10,6 @@ #include "TuningContext.h" #include "MouseTracker.h" -#include "fftw3.h" #include "Timer.h" class TuningCanvas: public InteractiveCanvas { From a66d1ea5b12acd2443313c43cd12eef2dce293ad Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Mon, 21 Mar 2016 18:39:33 -0400 Subject: [PATCH 08/15] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b9aa9b6..edd1234 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Utilizes: -------- - liquid-dsp (http://liquidsdr.org/ -- https://github.com/jgaeddert/liquid-dsp) - SoapySDR (http://www.pothosware.com/ -- https://github.com/pothosware/SoapySDR) - - FFTW (http://www.fftw.org/ -- https://github.com/FFTW/fftw3) - RtAudio (http://www.music.mcgill.ca/~gary/rtaudio/ -- http://github.com/thestk/rtaudio/) - LodePNG (http://lodev.org/lodepng/) - BMFont (http://www.angelcode.com/ -- http://www.angelcode.com/products/bmfont/) @@ -19,6 +18,11 @@ Utilizes: - wxWidgets (https://www.wxwidgets.org/) - CMake (http://www.cmake.org/) +Optional Libs: +-------- + - FFTW (http://www.fftw.org/ -- https://github.com/FFTW/fftw3) + - hamlib (https://sourceforge.net/p/hamlib/wiki/Hamlib/ -- https://sourceforge.net/p/hamlib/code/ci/master/tree/) + Features and Status: -------------------- - Please see the issues on GitHub or visit https://github.com/cjcliffe/CubicSDR/wiki/CubicSDR-Roadmap-and-Ideas for more information. From 855a6f7f15cbcfe788a8a1beabd42db20e0f9ae4 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Mon, 21 Mar 2016 19:34:26 -0400 Subject: [PATCH 09/15] Fix invalid property assertion in wxWidgets 3.1.0 --- src/forms/SDRDevices/SDRDevices.fbp | 2 +- src/forms/SDRDevices/SDRDevicesForm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forms/SDRDevices/SDRDevices.fbp b/src/forms/SDRDevices/SDRDevices.fbp index daf4773..4fc959b 100644 --- a/src/forms/SDRDevices/SDRDevices.fbp +++ b/src/forms/SDRDevices/SDRDevices.fbp @@ -307,7 +307,7 @@ none 5 - wxEXPAND|wxALIGN_RIGHT + wxEXPAND 1 1 diff --git a/src/forms/SDRDevices/SDRDevicesForm.cpp b/src/forms/SDRDevices/SDRDevicesForm.cpp index b38a944..cea3da8 100644 --- a/src/forms/SDRDevices/SDRDevicesForm.cpp +++ b/src/forms/SDRDevices/SDRDevicesForm.cpp @@ -28,7 +28,7 @@ devFrame::devFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons devTree = new wxTreeCtrl( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE ); devTree->Enable( false ); - bSizer6->Add( devTree, 1, wxEXPAND|wxALIGN_RIGHT, 5 ); + bSizer6->Add( devTree, 1, wxEXPAND, 5 ); m_panel4 = new wxPanel( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer5; From f4b7baebfaf43364998efe0c57d11660031ca317 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 22 Mar 2016 20:49:15 -0400 Subject: [PATCH 10/15] Update to wx 3.1.0 gl attributes, simplify GLFont cache and GC --- src/AppFrame.cpp | 4 +- src/ui/UITestCanvas.cpp | 4 +- src/ui/UITestCanvas.h | 2 +- src/util/GLFont.cpp | 73 ++++++++----------------------- src/util/GLFont.h | 5 ++- src/visual/GainCanvas.cpp | 4 +- src/visual/GainCanvas.h | 2 +- src/visual/InteractiveCanvas.cpp | 4 +- src/visual/InteractiveCanvas.h | 2 +- src/visual/MeterCanvas.cpp | 4 +- src/visual/MeterCanvas.h | 2 +- src/visual/ModeSelectorCanvas.cpp | 4 +- src/visual/ModeSelectorCanvas.h | 2 +- src/visual/ScopeCanvas.cpp | 2 +- src/visual/ScopeCanvas.h | 2 +- src/visual/SpectrumCanvas.cpp | 4 +- src/visual/SpectrumCanvas.h | 2 +- src/visual/TuningCanvas.cpp | 4 +- src/visual/TuningCanvas.h | 2 +- src/visual/WaterfallCanvas.cpp | 4 +- src/visual/WaterfallCanvas.h | 2 +- 21 files changed, 51 insertions(+), 83 deletions(-) diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index 3aedb21..829d34b 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -55,7 +55,9 @@ AppFrame::AppFrame() : wxBoxSizer *demodScopeTray = new wxBoxSizer(wxVERTICAL); wxBoxSizer *demodTunerTray = new wxBoxSizer(wxHORIZONTAL); - int attribList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 }; +// int attribList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 }; + wxGLAttributes attribList; + attribList.PlatformDefaults().RGBA().DoubleBuffer().EndList(); mainSplitter = new wxSplitterWindow( this, wxID_MAIN_SPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH | wxSP_LIVE_UPDATE ); mainSplitter->SetSashGravity(10.0/37.0); diff --git a/src/ui/UITestCanvas.cpp b/src/ui/UITestCanvas.cpp index 97eff74..e2b06cc 100644 --- a/src/ui/UITestCanvas.cpp +++ b/src/ui/UITestCanvas.cpp @@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLeftWindow) EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() -UITestCanvas::UITestCanvas(wxWindow *parent, int *attribList) : -InteractiveCanvas(parent, attribList) { +UITestCanvas::UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : +InteractiveCanvas(parent, dispAttrs) { glContext = new UITestContext(this, &wxGetApp().GetContext(this)); } diff --git a/src/ui/UITestCanvas.h b/src/ui/UITestCanvas.h index 52f1655..a24e2fa 100644 --- a/src/ui/UITestCanvas.h +++ b/src/ui/UITestCanvas.h @@ -14,7 +14,7 @@ class UITestCanvas: public InteractiveCanvas { public: - UITestCanvas(wxWindow *parent, int *attribList = NULL); + UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~UITestCanvas(); private: diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp index 2923dad..c3b9555 100644 --- a/src/util/GLFont.cpp +++ b/src/util/GLFont.cpp @@ -452,30 +452,24 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A GLFontStringCache *fc = nullptr; - std::map > > >::iterator i1; - std::map > >::iterator i2; - std::map >::iterator i3; - std::map::iterator i4; + std::map::iterator cache_iter; - i1 = stringCache.find(vpx); - if (i1 != stringCache.end()) { - i2 = i1->second.find(vpy); - if (i2 != i1->second.end()) { - i3 = i2->second.find(pxHeight); - if (i3 != i2->second.end()) { - i4 = i3->second.find(str); - if (i4 != i3->second.end()) { - fc = i4->second; - fc->gc = 0; - } - } - } + std::stringstream sscacheIdx; + + sscacheIdx << vpx << "." << vpy << "." << pxHeight << "." << str; + + std::string cacheIdx(sscacheIdx.str()); + + cache_iter = stringCache.find(cacheIdx); + if (cache_iter != stringCache.end()) { + fc = cache_iter->second; + fc->gc = 0; } if (fc == nullptr) { // std::cout << "cache miss" << std::endl; fc = cacheString(str, pxHeight, vpx, vpy); - stringCache[vpx][vpy][pxHeight][str] = fc; + stringCache[cacheIdx] = fc; } drawCacheString(fc, xpos, ypos, hAlign, vAlign); @@ -680,43 +674,14 @@ GLFontStringCache *GLFont::cacheString(std::string str, int pxHeight, int vpx, i } void GLFont::doCacheGC() { - std::map > > >::iterator i1; - std::map > >::iterator i2; - std::map >::iterator i3; - std::map::iterator i4; + std::map::iterator cache_iter; - std::vector::iterator> removals; - std::vector::iterator>::iterator removals_i; - - for (i1 = stringCache.begin(); i1 != stringCache.end(); i1++) { - for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) { - for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) { - for (i4 = i3->second.begin(); i4 != i3->second.end(); i4++) { - i4->second->gc--; - if (i4->second->gc < -10) { - removals.push_back(i4); - } - } - } - } - } - - if (removals.size()) { - for (removals_i = removals.begin(); removals_i != removals.end(); removals_i++) { -// std::cout << "gc'd " << (*removals_i)->first << std::endl; - GLFontStringCache *fc = (*removals_i)->second; - stringCache[fc->vpx][fc->vpy][fc->pxHeight].erase(*removals_i); - delete (*removals_i)->second; - - if (!stringCache[fc->vpx][fc->vpy][fc->pxHeight].size()) { - stringCache[fc->vpx][fc->vpy].erase(stringCache[fc->vpx][fc->vpy].find(fc->pxHeight)); - if (!stringCache[fc->vpx][fc->vpy].size()) { - stringCache[fc->vpx].erase(stringCache[fc->vpx].find(fc->vpy)); - if (!stringCache[fc->vpx].size()) { - stringCache.erase(stringCache.find(fc->vpx)); - } - } - } + for (cache_iter = stringCache.begin(); cache_iter != stringCache.end(); cache_iter++) { + cache_iter->second->gc--; + if (cache_iter->second->gc < -10) { +// std::cout << "gc'd " << cache_iter->first << std::endl; + stringCache.erase(cache_iter); + return; } } } diff --git a/src/util/GLFont.h b/src/util/GLFont.h index 4024a00..041fc49 100644 --- a/src/util/GLFont.h +++ b/src/util/GLFont.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "lodepng.h" #include "wx/glcanvas.h" #include "wx/filename.h" @@ -16,7 +17,7 @@ public: int vpx, vpy; int pxHeight; float msgWidth; - int gc; + std::atomic_int gc; std::vector gl_vertices; std::vector gl_uv; }; @@ -89,7 +90,7 @@ public: void doCacheGC(); private: - std::map > > > stringCache; + std::map stringCache; std::string nextParam(std::istringstream &str); std::string getParamKey(std::string param_str); diff --git a/src/visual/GainCanvas.cpp b/src/visual/GainCanvas.cpp index 33badba..2072b9f 100644 --- a/src/visual/GainCanvas.cpp +++ b/src/visual/GainCanvas.cpp @@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(GainCanvas::OnMouseLeftWindow) EVT_ENTER_WINDOW(GainCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() -GainCanvas::GainCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList) { +GainCanvas::GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + InteractiveCanvas(parent, dispAttrs) { glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); bgPanel.setCoordinateSystem(GLPanel::GLPANEL_Y_UP); diff --git a/src/visual/GainCanvas.h b/src/visual/GainCanvas.h index edb285e..b7729cf 100644 --- a/src/visual/GainCanvas.h +++ b/src/visual/GainCanvas.h @@ -27,7 +27,7 @@ public: class GainCanvas: public InteractiveCanvas { public: - GainCanvas(wxWindow *parent, int *attribList = NULL); + GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~GainCanvas(); void setHelpTip(std::string tip); diff --git a/src/visual/InteractiveCanvas.cpp b/src/visual/InteractiveCanvas.cpp index 0761e03..a3e2bd0 100644 --- a/src/visual/InteractiveCanvas.cpp +++ b/src/visual/InteractiveCanvas.cpp @@ -17,8 +17,8 @@ #include -InteractiveCanvas::InteractiveCanvas(wxWindow *parent, int *attribList) : - wxGLCanvas(parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize, +InteractiveCanvas::InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + wxGLCanvas(parent, dispAttrs ,wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE), parent(parent), shiftDown(false), altDown(false), ctrlDown(false), centerFreq(0), bandwidth(0), lastBandwidth(0), isView( false) { mouseTracker.setTarget(this); diff --git a/src/visual/InteractiveCanvas.h b/src/visual/InteractiveCanvas.h index 3fdb2be..da33ebb 100644 --- a/src/visual/InteractiveCanvas.h +++ b/src/visual/InteractiveCanvas.h @@ -8,7 +8,7 @@ class InteractiveCanvas: public wxGLCanvas { public: - InteractiveCanvas(wxWindow *parent, int *attribList = NULL); + InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~InteractiveCanvas(); long long getFrequencyAt(float x); diff --git a/src/visual/MeterCanvas.cpp b/src/visual/MeterCanvas.cpp index ce30e59..a93487e 100644 --- a/src/visual/MeterCanvas.cpp +++ b/src/visual/MeterCanvas.cpp @@ -27,8 +27,8 @@ EVT_LEAVE_WINDOW(MeterCanvas::OnMouseLeftWindow) EVT_ENTER_WINDOW(MeterCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() -MeterCanvas::MeterCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList), level(0), level_min(0), level_max(1), inputValue(0), userInputValue(0), showUserInput(true) { +MeterCanvas::MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + InteractiveCanvas(parent, dispAttrs), level(0), level_min(0), level_max(1), inputValue(0), userInputValue(0), showUserInput(true) { glContext = new MeterContext(this, &wxGetApp().GetContext(this)); } diff --git a/src/visual/MeterCanvas.h b/src/visual/MeterCanvas.h index 46b9c00..56dd8ed 100644 --- a/src/visual/MeterCanvas.h +++ b/src/visual/MeterCanvas.h @@ -14,7 +14,7 @@ class MeterCanvas: public InteractiveCanvas { public: - MeterCanvas(wxWindow *parent, int *attribList = NULL); + MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~MeterCanvas(); void setLevel(float level_in); diff --git a/src/visual/ModeSelectorCanvas.cpp b/src/visual/ModeSelectorCanvas.cpp index 188e702..2354d58 100644 --- a/src/visual/ModeSelectorCanvas.cpp +++ b/src/visual/ModeSelectorCanvas.cpp @@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(ModeSelectorCanvas::OnMouseLeftWindow) EVT_ENTER_WINDOW(ModeSelectorCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() -ModeSelectorCanvas::ModeSelectorCanvas(wxWindow *parent, int *attribList) : -InteractiveCanvas(parent, attribList), numChoices(0), currentSelection(-1), toggleMode(false), inputChanged(false), padX(4.0), padY(4.0), highlightOverride(false) { +ModeSelectorCanvas::ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : +InteractiveCanvas(parent, dispAttrs), numChoices(0), currentSelection(-1), toggleMode(false), inputChanged(false), padX(4.0), padY(4.0), highlightOverride(false) { glContext = new ModeSelectorContext(this, &wxGetApp().GetContext(this)); diff --git a/src/visual/ModeSelectorCanvas.h b/src/visual/ModeSelectorCanvas.h index af020d7..2def4d9 100644 --- a/src/visual/ModeSelectorCanvas.h +++ b/src/visual/ModeSelectorCanvas.h @@ -24,7 +24,7 @@ public: class ModeSelectorCanvas: public InteractiveCanvas { public: - ModeSelectorCanvas(wxWindow *parent, int *attribList = NULL); + ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~ModeSelectorCanvas(); int getHoveredSelection(); diff --git a/src/visual/ScopeCanvas.cpp b/src/visual/ScopeCanvas.cpp index 4dc4685..a63b276 100644 --- a/src/visual/ScopeCanvas.cpp +++ b/src/visual/ScopeCanvas.cpp @@ -28,7 +28,7 @@ EVT_LEAVE_WINDOW(ScopeCanvas::OnMouseLeftWindow) EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() -ScopeCanvas::ScopeCanvas(wxWindow *parent, int *attribList) : InteractiveCanvas(parent, attribList), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") { +ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") { glContext = new ScopeContext(this, &wxGetApp().GetContext(this)); inputData.set_max_num_items(2); diff --git a/src/visual/ScopeCanvas.h b/src/visual/ScopeCanvas.h index 222166a..b2077cd 100644 --- a/src/visual/ScopeCanvas.h +++ b/src/visual/ScopeCanvas.h @@ -14,7 +14,7 @@ class ScopeCanvas: public InteractiveCanvas { public: - ScopeCanvas(wxWindow *parent, int *attribList = NULL); + ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~ScopeCanvas(); void setDeviceName(std::string device_name); diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp index 54967da..6645e5d 100644 --- a/src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp @@ -29,8 +29,8 @@ EVT_RIGHT_DOWN(SpectrumCanvas::OnMouseRightDown) EVT_RIGHT_UP(SpectrumCanvas::OnMouseRightReleased) wxEND_EVENT_TABLE() -SpectrumCanvas::SpectrumCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList), waterfallCanvas(NULL) { +SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) { glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); diff --git a/src/visual/SpectrumCanvas.h b/src/visual/SpectrumCanvas.h index bb566e0..5798c3c 100644 --- a/src/visual/SpectrumCanvas.h +++ b/src/visual/SpectrumCanvas.h @@ -13,7 +13,7 @@ class WaterfallCanvas; class SpectrumCanvas: public InteractiveCanvas { public: - SpectrumCanvas(wxWindow *parent, int *attribList = NULL); + SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~SpectrumCanvas(); void attachWaterfallCanvas(WaterfallCanvas *canvas_in); diff --git a/src/visual/TuningCanvas.cpp b/src/visual/TuningCanvas.cpp index 34f694f..5bd4361 100644 --- a/src/visual/TuningCanvas.cpp +++ b/src/visual/TuningCanvas.cpp @@ -30,8 +30,8 @@ EVT_MOUSEWHEEL(TuningCanvas::OnMouseWheelMoved) //EVT_KEY_UP(TuningCanvas::OnKeyUp) wxEND_EVENT_TABLE() -TuningCanvas::TuningCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList), dragAccum(0), uxDown(0), top(false), bottom(false), freq(-1), bw(-1), center(-1), halfBand(false) { +TuningCanvas::TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + InteractiveCanvas(parent, dispAttrs), dragAccum(0), uxDown(0), top(false), bottom(false), freq(-1), bw(-1), center(-1), halfBand(false) { glContext = new TuningContext(this, &wxGetApp().GetContext(this)); diff --git a/src/visual/TuningCanvas.h b/src/visual/TuningCanvas.h index 47460f2..1b89c44 100644 --- a/src/visual/TuningCanvas.h +++ b/src/visual/TuningCanvas.h @@ -17,7 +17,7 @@ public: enum ActiveState { TUNING_HOVER_NONE, TUNING_HOVER_FREQ, TUNING_HOVER_BW, TUNING_HOVER_PPM, TUNING_HOVER_CENTER }; - TuningCanvas(wxWindow *parent, int *attribList = NULL); + TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); ~TuningCanvas(); void setHelpTip(std::string tip); diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index d985e14..3bfabe2 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -34,8 +34,8 @@ EVT_ENTER_WINDOW(WaterfallCanvas::OnMouseEnterWindow) EVT_MOUSEWHEEL(WaterfallCanvas::OnMouseWheelMoved) wxEND_EVENT_TABLE() -WaterfallCanvas::WaterfallCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList), dragState(WF_DRAG_NONE), nextDragState(WF_DRAG_NONE), fft_size(0), new_fft_size(0), waterfall_lines(0), +WaterfallCanvas::WaterfallCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : + InteractiveCanvas(parent, dispAttrs), dragState(WF_DRAG_NONE), nextDragState(WF_DRAG_NONE), fft_size(0), new_fft_size(0), waterfall_lines(0), dragOfs(0), mouseZoom(1), zoom(1), freqMoving(false), freqMove(0.0), hoverAlpha(1.0) { glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); diff --git a/src/visual/WaterfallCanvas.h b/src/visual/WaterfallCanvas.h index c9b9760..8409340 100644 --- a/src/visual/WaterfallCanvas.h +++ b/src/visual/WaterfallCanvas.h @@ -18,7 +18,7 @@ public: WF_DRAG_NONE, WF_DRAG_BANDWIDTH_LEFT, WF_DRAG_BANDWIDTH_RIGHT, WF_DRAG_FREQUENCY, WF_DRAG_RANGE }; - WaterfallCanvas(wxWindow *parent, int *attribList = NULL); + WaterfallCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs); void setup(unsigned int fft_size_in, int waterfall_lines_in); void setFFTSize(unsigned int fft_size_in); ~WaterfallCanvas(); From bfb2b1bdf3d580a6658c9a2d772a42a43ba138a4 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 22 Mar 2016 20:58:47 -0400 Subject: [PATCH 11/15] Tweak font cache agression --- src/util/GLFont.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp index c3b9555..c821351 100644 --- a/src/util/GLFont.cpp +++ b/src/util/GLFont.cpp @@ -445,7 +445,7 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A std::lock_guard lock(cache_busy); - if (gcCounter > 200) { + if (gcCounter > 50) { doCacheGC(); gcCounter = 0; } @@ -678,6 +678,8 @@ void GLFont::doCacheGC() { for (cache_iter = stringCache.begin(); cache_iter != stringCache.end(); cache_iter++) { cache_iter->second->gc--; + } + for (cache_iter = stringCache.begin(); cache_iter != stringCache.end(); cache_iter++) { if (cache_iter->second->gc < -10) { // std::cout << "gc'd " << cache_iter->first << std::endl; stringCache.erase(cache_iter); From e0df7cb41dd25551ef6acc6bceb9ae792327541e Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 29 Mar 2016 21:16:18 -0400 Subject: [PATCH 12/15] Get rid of some old patched cmake cruft for wxWidgets --- cmake/Modules/CMakeParseArguments.cmake | 161 --- .../FindPackageHandleStandardArgs.cmake | 382 ------ cmake/Modules/FindPackageMessage.cmake | 57 - cmake/Modules/FindwxWidgets.cmake | 1083 ----------------- 4 files changed, 1683 deletions(-) delete mode 100644 cmake/Modules/CMakeParseArguments.cmake delete mode 100644 cmake/Modules/FindPackageHandleStandardArgs.cmake delete mode 100644 cmake/Modules/FindPackageMessage.cmake delete mode 100644 cmake/Modules/FindwxWidgets.cmake diff --git a/cmake/Modules/CMakeParseArguments.cmake b/cmake/Modules/CMakeParseArguments.cmake deleted file mode 100644 index 8553f38..0000000 --- a/cmake/Modules/CMakeParseArguments.cmake +++ /dev/null @@ -1,161 +0,0 @@ -#.rst: -# CMakeParseArguments -# ------------------- -# -# -# -# CMAKE_PARSE_ARGUMENTS( -# args...) -# -# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions -# for parsing the arguments given to that macro or function. It -# processes the arguments and defines a set of variables which hold the -# values of the respective options. -# -# The argument contains all options for the respective macro, -# i.e. keywords which can be used when calling the macro without any -# value following, like e.g. the OPTIONAL keyword of the install() -# command. -# -# The argument contains all keywords for this macro -# which are followed by one value, like e.g. DESTINATION keyword of the -# install() command. -# -# The argument contains all keywords for this -# macro which can be followed by more than one value, like e.g. the -# TARGETS or FILES keywords of the install() command. -# -# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the -# keywords listed in , and -# a variable composed of the given -# followed by "_" and the name of the respective keyword. These -# variables will then hold the respective value from the argument list. -# For the keywords this will be TRUE or FALSE. -# -# All remaining arguments are collected in a variable -# _UNPARSED_ARGUMENTS, this can be checked afterwards to see -# whether your macro was called with unrecognized parameters. -# -# As an example here a my_install() macro, which takes similar arguments -# as the real install() command: -# -# :: -# -# function(MY_INSTALL) -# set(options OPTIONAL FAST) -# set(oneValueArgs DESTINATION RENAME) -# set(multiValueArgs TARGETS CONFIGURATIONS) -# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" -# "${multiValueArgs}" ${ARGN} ) -# ... -# -# -# -# Assume my_install() has been called like this: -# -# :: -# -# my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub) -# -# -# -# After the cmake_parse_arguments() call the macro will have set the -# following variables: -# -# :: -# -# MY_INSTALL_OPTIONAL = TRUE -# MY_INSTALL_FAST = FALSE (this option was not used when calling my_install() -# MY_INSTALL_DESTINATION = "bin" -# MY_INSTALL_RENAME = "" (was not used) -# MY_INSTALL_TARGETS = "foo;bar" -# MY_INSTALL_CONFIGURATIONS = "" (was not used) -# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL" -# -# -# -# You can then continue and process these variables. -# -# Keywords terminate lists of values, e.g. if directly after a -# one_value_keyword another recognized keyword follows, this is -# interpreted as the beginning of the new option. E.g. -# my_install(TARGETS foo DESTINATION OPTIONAL) would result in -# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION -# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. - -#============================================================================= -# Copyright 2010 Alexander Neundorf -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - - -if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) - return() -endif() -set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) - - -function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) - # first set all result variables to empty/FALSE - foreach(arg_name ${_singleArgNames} ${_multiArgNames}) - set(${prefix}_${arg_name}) - endforeach() - - foreach(option ${_optionNames}) - set(${prefix}_${option} FALSE) - endforeach() - - set(${prefix}_UNPARSED_ARGUMENTS) - - set(insideValues FALSE) - set(currentArgName) - - # now iterate over all arguments and fill the result variables - foreach(currentArg ${ARGN}) - list(FIND _optionNames "${currentArg}" optionIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _singleArgNames "${currentArg}" singleArgIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _multiArgNames "${currentArg}" multiArgIndex) # ... then this marks the end of the arguments belonging to this keyword - - if(${optionIndex} EQUAL -1 AND ${singleArgIndex} EQUAL -1 AND ${multiArgIndex} EQUAL -1) - if(insideValues) - if("${insideValues}" STREQUAL "SINGLE") - set(${prefix}_${currentArgName} ${currentArg}) - set(insideValues FALSE) - elseif("${insideValues}" STREQUAL "MULTI") - list(APPEND ${prefix}_${currentArgName} ${currentArg}) - endif() - else() - list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg}) - endif() - else() - if(NOT ${optionIndex} EQUAL -1) - set(${prefix}_${currentArg} TRUE) - set(insideValues FALSE) - elseif(NOT ${singleArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "SINGLE") - elseif(NOT ${multiArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "MULTI") - endif() - endif() - - endforeach() - - # propagate the result variables to the caller: - foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames}) - set(${prefix}_${arg_name} ${${prefix}_${arg_name}} PARENT_SCOPE) - endforeach() - set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE) - -endfunction() diff --git a/cmake/Modules/FindPackageHandleStandardArgs.cmake b/cmake/Modules/FindPackageHandleStandardArgs.cmake deleted file mode 100644 index 2de1fb3..0000000 --- a/cmake/Modules/FindPackageHandleStandardArgs.cmake +++ /dev/null @@ -1,382 +0,0 @@ -#.rst: -# FindPackageHandleStandardArgs -# ----------------------------- -# -# -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS( ... ) -# -# This function is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED, QUIET and version-related arguments to -# find_package(). It also sets the _FOUND variable. The -# package is considered found if all variables ... listed contain -# valid results, e.g. valid filepaths. -# -# There are two modes of this function. The first argument in both -# modes is the name of the Find-module where it is called (in original -# casing). -# -# The first simple mode looks like this: -# -# :: -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS( -# (DEFAULT_MSG|"Custom failure message") ... ) -# -# If the variables to are all valid, then -# _FOUND will be set to TRUE. If DEFAULT_MSG is given -# as second argument, then the function will generate itself useful -# success and error messages. You can also supply a custom error -# message for the failure case. This is not recommended. -# -# The second mode is more powerful and also supports version checking: -# -# :: -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME -# [FOUND_VAR ] -# [REQUIRED_VARS ...] -# [VERSION_VAR ] -# [HANDLE_COMPONENTS] -# [CONFIG_MODE] -# [FAIL_MESSAGE "Custom failure message"] ) -# -# In this mode, the name of the result-variable can be set either to -# either _FOUND or _FOUND using the -# FOUND_VAR option. Other names for the result-variable are not -# allowed. So for a Find-module named FindFooBar.cmake, the two -# possible names are FooBar_FOUND and FOOBAR_FOUND. It is recommended -# to use the original case version. If the FOUND_VAR option is not -# used, the default is _FOUND. -# -# As in the simple mode, if through are all valid, -# _FOUND will be set to TRUE. After REQUIRED_VARS the -# variables which are required for this package are listed. Following -# VERSION_VAR the name of the variable can be specified which holds the -# version of the package which has been found. If this is done, this -# version will be checked against the (potentially) specified required -# version used in the find_package() call. The EXACT keyword is also -# handled. The default messages include information about the required -# version and the version which has been actually found, both if the -# version is ok or not. If the package supports components, use the -# HANDLE_COMPONENTS option to enable handling them. In this case, -# find_package_handle_standard_args() will report which components have -# been found and which are missing, and the _FOUND variable -# will be set to FALSE if any of the required components (i.e. not the -# ones listed after OPTIONAL_COMPONENTS) are missing. Use the option -# CONFIG_MODE if your FindXXX.cmake module is a wrapper for a -# find_package(... NO_MODULE) call. In this case VERSION_VAR will be -# set to _VERSION and the macro will automatically check whether -# the Config module was found. Via FAIL_MESSAGE a custom failure -# message can be specified, if this is not used, the default message -# will be displayed. -# -# Example for mode 1: -# -# :: -# -# find_package_handle_standard_args(LibXml2 DEFAULT_MSG -# LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR) -# -# -# -# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and -# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to -# TRUE. If it is not found and REQUIRED was used, it fails with -# FATAL_ERROR, independent whether QUIET was used or not. If it is -# found, success will be reported, including the content of . On -# repeated Cmake runs, the same message won't be printed again. -# -# Example for mode 2: -# -# :: -# -# find_package_handle_standard_args(LibXslt -# FOUND_VAR LibXslt_FOUND -# REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS -# VERSION_VAR LibXslt_VERSION_STRING) -# -# In this case, LibXslt is considered to be found if the variable(s) -# listed after REQUIRED_VAR are all valid, i.e. LibXslt_LIBRARIES and -# LibXslt_INCLUDE_DIRS in this case. The result will then be stored in -# LibXslt_FOUND . Also the version of LibXslt will be checked by using -# the version contained in LibXslt_VERSION_STRING. Since no -# FAIL_MESSAGE is given, the default messages will be printed. -# -# Another example for mode 2: -# -# :: -# -# find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4) -# find_package_handle_standard_args(Automoc4 CONFIG_MODE) -# -# In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4 -# NO_MODULE) and adds an additional search directory for automoc4. Here -# the result will be stored in AUTOMOC4_FOUND. The following -# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper -# success/error message. - -#============================================================================= -# Copyright 2007-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) - -# internal helper macro -macro(_FPHSA_FAILURE_MESSAGE _msg) - if (${_NAME}_FIND_REQUIRED) - message(FATAL_ERROR "${_msg}") - else () - if (NOT ${_NAME}_FIND_QUIETLY) - message(STATUS "${_msg}") - endif () - endif () -endmacro() - - -# internal helper macro to generate the failure message when used in CONFIG_MODE: -macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE) - # _CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found: - if(${_NAME}_CONFIG) - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})") - else() - # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version. - # List them all in the error message: - if(${_NAME}_CONSIDERED_CONFIGS) - set(configsText "") - list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount) - math(EXPR configsCount "${configsCount} - 1") - foreach(currentConfigIndex RANGE ${configsCount}) - list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename) - list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version) - set(configsText "${configsText} ${filename} (version ${version})\n") - endforeach() - if (${_NAME}_NOT_FOUND_MESSAGE) - set(configsText "${configsText} Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n") - endif() - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}") - - else() - # Simple case: No Config-file was found at all: - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}") - endif() - endif() -endmacro() - - -function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) - -# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in -# new extended or in the "old" mode: - set(options CONFIG_MODE HANDLE_COMPONENTS) - set(oneValueArgs FAIL_MESSAGE VERSION_VAR FOUND_VAR) - set(multiValueArgs REQUIRED_VARS) - set(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} ) - list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX) - - if(${INDEX} EQUAL -1) - set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG}) - set(FPHSA_REQUIRED_VARS ${ARGN}) - set(FPHSA_VERSION_VAR) - else() - - CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN}) - - if(FPHSA_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"") - endif() - - if(NOT FPHSA_FAIL_MESSAGE) - set(FPHSA_FAIL_MESSAGE "DEFAULT_MSG") - endif() - endif() - -# now that we collected all arguments, process them - - if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG") - set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}") - endif() - - # In config-mode, we rely on the variable _CONFIG, which is set by find_package() - # when it successfully found the config-file, including version checking: - if(FPHSA_CONFIG_MODE) - list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG) - list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS) - set(FPHSA_VERSION_VAR ${_NAME}_VERSION) - endif() - - if(NOT FPHSA_REQUIRED_VARS) - message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()") - endif() - - list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR) - - string(TOUPPER ${_NAME} _NAME_UPPER) - string(TOLOWER ${_NAME} _NAME_LOWER) - - if(FPHSA_FOUND_VAR) - if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$" OR FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$") - set(_FOUND_VAR ${FPHSA_FOUND_VAR}) - else() - message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.") - endif() - else() - set(_FOUND_VAR ${_NAME_UPPER}_FOUND) - endif() - - # collect all variables which were not found, so they can be printed, so the - # user knows better what went wrong (#6375) - set(MISSING_VARS "") - set(DETAILS "") - # check if all passed variables are valid - unset(${_FOUND_VAR}) - foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS}) - if(NOT ${_CURRENT_VAR}) - set(${_FOUND_VAR} FALSE) - set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}") - else() - set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]") - endif() - endforeach() - if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE") - set(${_FOUND_VAR} TRUE) - endif() - - # component handling - unset(FOUND_COMPONENTS_MSG) - unset(MISSING_COMPONENTS_MSG) - - if(FPHSA_HANDLE_COMPONENTS) - foreach(comp ${${_NAME}_FIND_COMPONENTS}) - if(${_NAME}_${comp}_FOUND) - - if(NOT DEFINED FOUND_COMPONENTS_MSG) - set(FOUND_COMPONENTS_MSG "found components: ") - endif() - set(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}") - - else() - - if(NOT DEFINED MISSING_COMPONENTS_MSG) - set(MISSING_COMPONENTS_MSG "missing components: ") - endif() - set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}") - - if(${_NAME}_FIND_REQUIRED_${comp}) - set(${_FOUND_VAR} FALSE) - set(MISSING_VARS "${MISSING_VARS} ${comp}") - endif() - - endif() - endforeach() - set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}") - set(DETAILS "${DETAILS}[c${COMPONENT_MSG}]") - endif() - - # version handling: - set(VERSION_MSG "") - set(VERSION_OK TRUE) - set(VERSION ${${FPHSA_VERSION_VAR}}) - - # check with DEFINED here as the requested or found version may be "0" - if (DEFINED ${_NAME}_FIND_VERSION) - if(DEFINED ${FPHSA_VERSION_VAR}) - - if(${_NAME}_FIND_VERSION_EXACT) # exact version required - # count the dots in the version string - string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${VERSION}") - # add one dot because there is one dot more than there are components - string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS) - if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT) - # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT - # is at most 4 here. Therefore a simple lookup table is used. - if (${_NAME}_FIND_VERSION_COUNT EQUAL 1) - set(_VERSION_REGEX "[^.]*") - elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2) - set(_VERSION_REGEX "[^.]*\\.[^.]*") - elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3) - set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*") - else () - set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*") - endif () - string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${VERSION}") - unset(_VERSION_REGEX) - if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD) - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable exact version \"${VERSION}\")") - endif () - unset(_VERSION_HEAD) - else () - if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL VERSION) - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable exact version \"${VERSION}\")") - endif () - endif () - unset(_VERSION_DOTS) - - else() # minimum version specified: - if (${_NAME}_FIND_VERSION VERSION_GREATER VERSION) - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")") - endif () - endif() - - else() - - # if the package was not found, but a version was given, add that to the output: - if(${_NAME}_FIND_VERSION_EXACT) - set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")") - else() - set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")") - endif() - - endif() - else () - if(VERSION) - set(VERSION_MSG "(found version \"${VERSION}\")") - endif() - endif () - - if(VERSION_OK) - set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]") - else() - set(${_FOUND_VAR} FALSE) - endif() - - - # print the result: - if (${_FOUND_VAR}) - FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}") - else () - - if(FPHSA_CONFIG_MODE) - _FPHSA_HANDLE_FAILURE_CONFIG_MODE() - else() - if(NOT VERSION_OK) - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})") - else() - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}") - endif() - endif() - - endif () - - set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE) - -endfunction() diff --git a/cmake/Modules/FindPackageMessage.cmake b/cmake/Modules/FindPackageMessage.cmake deleted file mode 100644 index a0349d3..0000000 --- a/cmake/Modules/FindPackageMessage.cmake +++ /dev/null @@ -1,57 +0,0 @@ -#.rst: -# FindPackageMessage -# ------------------ -# -# -# -# FIND_PACKAGE_MESSAGE( "message for user" "find result details") -# -# This macro is intended to be used in FindXXX.cmake modules files. It -# will print a message once for each unique find result. This is useful -# for telling the user where a package was found. The first argument -# specifies the name (XXX) of the package. The second argument -# specifies the message to display. The third argument lists details -# about the find result so that if they change the message will be -# displayed again. The macro also obeys the QUIET argument to the -# find_package command. -# -# Example: -# -# :: -# -# if(X11_FOUND) -# FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}" -# "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]") -# else() -# ... -# endif() - -#============================================================================= -# Copyright 2008-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -function(FIND_PACKAGE_MESSAGE pkg msg details) - # Avoid printing a message repeatedly for the same find result. - if(NOT ${pkg}_FIND_QUIETLY) - string(REPLACE "\n" "" details "${details}") - set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg}) - if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}") - # The message has not yet been printed. - message(STATUS "${msg}") - - # Save the find details in the cache to avoid printing the same - # message again. - set("${DETAILS_VAR}" "${details}" - CACHE INTERNAL "Details about finding ${pkg}") - endif() - endif() -endfunction() diff --git a/cmake/Modules/FindwxWidgets.cmake b/cmake/Modules/FindwxWidgets.cmake deleted file mode 100644 index 9cd8e7c..0000000 --- a/cmake/Modules/FindwxWidgets.cmake +++ /dev/null @@ -1,1083 +0,0 @@ -#.rst: -# FindwxWidgets -# ------------- -# -# Find a wxWidgets (a.k.a., wxWindows) installation. -# -# This module finds if wxWidgets is installed and selects a default -# configuration to use. wxWidgets is a modular library. To specify the -# modules that you will use, you need to name them as components to the -# package: -# -# find_package(wxWidgets COMPONENTS core base ...) -# -# There are two search branches: a windows style and a unix style. For -# windows, the following variables are searched for and set to defaults -# in case of multiple choices. Change them if the defaults are not -# desired (i.e., these are the only variables you should change to -# select a configuration): -# -# :: -# -# wxWidgets_ROOT_DIR - Base wxWidgets directory -# (e.g., C:/wxWidgets-2.6.3). -# wxWidgets_LIB_DIR - Path to wxWidgets libraries -# (e.g., C:/wxWidgets-2.6.3/lib/vc_lib). -# wxWidgets_CONFIGURATION - Configuration to use -# (e.g., msw, mswd, mswu, mswunivud, etc.) -# wxWidgets_EXCLUDE_COMMON_LIBRARIES -# - Set to TRUE to exclude linking of -# commonly required libs (e.g., png tiff -# jpeg zlib regex expat). -# -# -# -# For unix style it uses the wx-config utility. You can select between -# debug/release, unicode/ansi, universal/non-universal, and -# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF -# the following variables: -# -# :: -# -# wxWidgets_USE_DEBUG -# wxWidgets_USE_UNICODE -# wxWidgets_USE_UNIVERSAL -# wxWidgets_USE_STATIC -# -# -# -# There is also a wxWidgets_CONFIG_OPTIONS variable for all other -# options that need to be passed to the wx-config utility. For example, -# to use the base toolkit found in the /usr/local path, set the variable -# (before calling the FIND_PACKAGE command) as such: -# -# :: -# -# set(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr) -# -# -# -# The following are set after the configuration is done for both windows -# and unix style: -# -# :: -# -# wxWidgets_FOUND - Set to TRUE if wxWidgets was found. -# wxWidgets_INCLUDE_DIRS - Include directories for WIN32 -# i.e., where to find "wx/wx.h" and -# "wx/setup.h"; possibly empty for unices. -# wxWidgets_LIBRARIES - Path to the wxWidgets libraries. -# wxWidgets_LIBRARY_DIRS - compile time link dirs, useful for -# rpath on UNIX. Typically an empty string -# in WIN32 environment. -# wxWidgets_DEFINITIONS - Contains defines required to compile/link -# against WX, e.g. WXUSINGDLL -# wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link -# against WX debug builds, e.g. __WXDEBUG__ -# wxWidgets_CXX_FLAGS - Include dirs and compiler flags for -# unices, empty on WIN32. Essentially -# "`wx-config --cxxflags`". -# wxWidgets_USE_FILE - Convenience include file. -# -# -# -# Sample usage: -# -# :: -# -# # Note that for MinGW users the order of libs is important! -# find_package(wxWidgets COMPONENTS net gl core base) -# if(wxWidgets_FOUND) -# include(${wxWidgets_USE_FILE}) -# # and for each of your dependent executable/library targets: -# target_link_libraries( ${wxWidgets_LIBRARIES}) -# endif() -# -# -# -# If wxWidgets is required (i.e., not an optional part): -# -# :: -# -# find_package(wxWidgets REQUIRED net gl core base) -# include(${wxWidgets_USE_FILE}) -# # and for each of your dependent executable/library targets: -# target_link_libraries( ${wxWidgets_LIBRARIES}) - -#============================================================================= -# Copyright 2004-2009 Kitware, Inc. -# Copyright 2007-2009 Miguel A. Figueroa-Villanueva -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# -# FIXME: check this and provide a correct sample usage... -# Remember to connect back to the upper text. -# Sample usage with monolithic wx build: -# -# find_package(wxWidgets COMPONENTS mono) -# ... - -# NOTES -# -# This module has been tested on the WIN32 platform with wxWidgets -# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to -# easily extend support to all possible builds, e.g., static/shared, -# debug/release, unicode, universal, multilib/monolithic, etc.. -# -# If you want to use the module and your build type is not supported -# out-of-the-box, please contact me to exchange information on how -# your system is setup and I'll try to add support for it. -# -# AUTHOR -# -# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org). -# Jan Woetzel (jw at mip.informatik.uni-kiel.de). -# -# Based on previous works of: -# Jan Woetzel (FindwxWindows.cmake), -# Jorgen Bodde and Jerry Fath (FindwxWin.cmake). - -# TODO/ideas -# -# (1) Option/Setting to use all available wx libs -# In contrast to expert developer who lists the -# minimal set of required libs in wxWidgets_USE_LIBS -# there is the newbie user: -# - who just wants to link against WX with more 'magic' -# - doesn't know the internal structure of WX or how it was built, -# in particular if it is monolithic or not -# - want to link against all available WX libs -# Basically, the intent here is to mimic what wx-config would do by -# default (i.e., `wx-config --libs`). -# -# Possible solution: -# Add a reserved keyword "std" that initializes to what wx-config -# would default to. If the user has not set the wxWidgets_USE_LIBS, -# default to "std" instead of "base core" as it is now. To implement -# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe -# checking whether a minimal set was found. - - -# FIXME: This and all the DBG_MSG calls should be removed after the -# module stabilizes. -# -# Helper macro to control the debugging output globally. There are -# two versions for controlling how verbose your output should be. -macro(DBG_MSG _MSG) -# message(STATUS -# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") -endmacro() -macro(DBG_MSG_V _MSG) -# message(STATUS -# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") -endmacro() - -# Clear return values in case the module is loaded more than once. -set(wxWidgets_FOUND FALSE) -set(wxWidgets_INCLUDE_DIRS "") -set(wxWidgets_LIBRARIES "") -set(wxWidgets_LIBRARY_DIRS "") -set(wxWidgets_CXX_FLAGS "") - -# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on -# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM -# to prevent UsewxWidgets.cmake from using SYSTEM. -# -# See cmake mailing list discussions for more info: -# http://www.cmake.org/pipermail/cmake/2008-April/021115.html -# http://www.cmake.org/pipermail/cmake/2008-April/021146.html -# -if(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") - set(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1) -endif() - -# DEPRECATED: This is a patch to support the DEPRECATED use of -# wxWidgets_USE_LIBS. -# -# If wxWidgets_USE_LIBS is set: -# - if using , then override wxWidgets_USE_LIBS -# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS -if(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS) - set(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS}) -endif() -DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}") - -# Add the convenience use file if available. -# -# Get dir of this file which may reside in: -# - CMAKE_MAKE_ROOT/Modules on CMake installation -# - CMAKE_MODULE_PATH if user prefers his own specialized version -set(wxWidgets_USE_FILE "") -get_filename_component( - wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) -# Prefer an existing customized version, but the user might override -# the FindwxWidgets module and not the UsewxWidgets one. -if(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") - set(wxWidgets_USE_FILE - "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") -else() - set(wxWidgets_USE_FILE UsewxWidgets) -endif() - -#===================================================================== -# Determine whether unix or win32 paths should be used -#===================================================================== -if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING) - set(wxWidgets_FIND_STYLE "win32") -else() - set(wxWidgets_FIND_STYLE "unix") -endif() - -#===================================================================== -# WIN32_FIND_STYLE -#===================================================================== -if(wxWidgets_FIND_STYLE STREQUAL "win32") - # Useful common wx libs needed by almost all components. - set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat) - - # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead. - if(NOT wxWidgets_FIND_COMPONENTS) - if(wxWidgets_USE_MONOLITHIC) - set(wxWidgets_FIND_COMPONENTS mono) - else() - set(wxWidgets_FIND_COMPONENTS core base) # this is default - endif() - endif() - - # Add the common (usually required libs) unless - # wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set. - if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES) - list(APPEND wxWidgets_FIND_COMPONENTS - ${wxWidgets_COMMON_LIBRARIES}) - endif() - - #------------------------------------------------------------------- - # WIN32: Helper MACROS - #------------------------------------------------------------------- - # - # Get filename components for a configuration. For example, - # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d - # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG="" - # - macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG) - string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}") - string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}") - if(${_UCD} STREQUAL ${_CONFIGURATION}) - set(${_UCD} "") - endif() - string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}") - endmacro() - - # - # Find libraries associated to a configuration. - # - macro(WX_FIND_LIBS _UNV _UCD _DBG) - DBG_MSG_V("m_unv = ${_UNV}") - DBG_MSG_V("m_ucd = ${_UCD}") - DBG_MSG_V("m_dbg = ${_DBG}") - - # FIXME: What if both regex libs are available. regex should be - # found outside the loop and only wx${LIB}${_UCD}${_DBG}. - # Find wxWidgets common libraries. - foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) - find_library(WX_${LIB}${_DBG} - NAMES - wx${LIB}${_UCD}${_DBG} # for regex - wx${LIB}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - - # Find wxWidgets multilib base libraries. - find_library(WX_base${_DBG} - NAMES - wxbase30${_UCD}${_DBG} - wxbase29${_UCD}${_DBG} - wxbase28${_UCD}${_DBG} - wxbase27${_UCD}${_DBG} - wxbase26${_UCD}${_DBG} - wxbase25${_UCD}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_base${_DBG}) - foreach(LIB net odbc xml) - find_library(WX_${LIB}${_DBG} - NAMES - wxbase30${_UCD}${_DBG}_${LIB} - wxbase29${_UCD}${_DBG}_${LIB} - wxbase28${_UCD}${_DBG}_${LIB} - wxbase27${_UCD}${_DBG}_${LIB} - wxbase26${_UCD}${_DBG}_${LIB} - wxbase25${_UCD}${_DBG}_${LIB} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - - # Find wxWidgets monolithic library. - find_library(WX_mono${_DBG} - NAMES - wxmsw${_UNV}30${_UCD}${_DBG} - wxmsw${_UNV}29${_UCD}${_DBG} - wxmsw${_UNV}28${_UCD}${_DBG} - wxmsw${_UNV}27${_UCD}${_DBG} - wxmsw${_UNV}26${_UCD}${_DBG} - wxmsw${_UNV}25${_UCD}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_mono${_DBG}) - - # Find wxWidgets multilib libraries. - foreach(LIB core adv aui html media xrc dbgrid gl qa richtext - stc ribbon propgrid webview) - find_library(WX_${LIB}${_DBG} - NAMES - wxmsw${_UNV}30${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}26${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}25${_UCD}${_DBG}_${LIB} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - endmacro() - - # - # Clear all library paths, so that FIND_LIBRARY refinds them. - # - # Clear a lib, reset its found flag, and mark as advanced. - macro(WX_CLEAR_LIB _LIB) - set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE) - set(${_LIB}_FOUND FALSE) - mark_as_advanced(${_LIB}) - endmacro() - # Clear all debug or release library paths (arguments are "d" or ""). - macro(WX_CLEAR_ALL_LIBS _DBG) - # Clear wxWidgets common libraries. - foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - - # Clear wxWidgets multilib base libraries. - WX_CLEAR_LIB(WX_base${_DBG}) - foreach(LIB net odbc xml) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - - # Clear wxWidgets monolithic library. - WX_CLEAR_LIB(WX_mono${_DBG}) - - # Clear wxWidgets multilib libraries. - foreach(LIB core adv aui html media xrc dbgrid gl qa richtext - stc ribbon propgrid) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - endmacro() - # Clear all wxWidgets debug libraries. - macro(WX_CLEAR_ALL_DBG_LIBS) - WX_CLEAR_ALL_LIBS("d") - endmacro() - # Clear all wxWidgets release libraries. - macro(WX_CLEAR_ALL_REL_LIBS) - WX_CLEAR_ALL_LIBS("") - endmacro() - - # - # Set the wxWidgets_LIBRARIES variable. - # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails. - # - macro(WX_SET_LIBRARIES _LIBS _DBG) - DBG_MSG_V("Looking for ${${_LIBS}}") - if(WX_USE_REL_AND_DBG) - foreach(LIB ${${_LIBS}}) - DBG_MSG_V("Searching for ${LIB} and ${LIB}d") - DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}") - DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}") - if(WX_${LIB} AND WX_${LIB}d) - DBG_MSG_V("Found ${LIB} and ${LIB}d") - list(APPEND wxWidgets_LIBRARIES - debug ${WX_${LIB}d} optimized ${WX_${LIB}} - ) - else() - DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}") - set(wxWidgets_FOUND FALSE) - endif() - endforeach() - else() - foreach(LIB ${${_LIBS}}) - DBG_MSG_V("Searching for ${LIB}${_DBG}") - DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}") - if(WX_${LIB}${_DBG}) - DBG_MSG_V("Found ${LIB}${_DBG}") - list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}}) - else() - DBG_MSG_V( - "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}") - set(wxWidgets_FOUND FALSE) - endif() - endforeach() - endif() - - DBG_MSG_V("OpenGL") - list(FIND ${_LIBS} gl WX_USE_GL) - if(NOT WX_USE_GL EQUAL -1) - DBG_MSG_V("- is required.") - list(APPEND wxWidgets_LIBRARIES opengl32 glu32) - endif() - - list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32) - endmacro() - - #------------------------------------------------------------------- - # WIN32: Start actual work. - #------------------------------------------------------------------- - - # Look for an installation tree. - find_path(wxWidgets_ROOT_DIR - NAMES include/wx/wx.h - PATHS - ENV wxWidgets_ROOT_DIR - ENV WXWIN - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x - C:/ - D:/ - ENV ProgramFiles - PATH_SUFFIXES - wxWidgets-3.0.2 - wxWidgets-3.0.0 - wxWidgets-2.9.5 - wxWidgets-2.9.4 - wxWidgets-2.9.3 - wxWidgets-2.9.2 - wxWidgets-2.9.1 - wxWidgets-2.9.0 - wxWidgets-2.8.9 - wxWidgets-2.8.8 - wxWidgets-2.8.7 - wxWidgets-2.8.6 - wxWidgets-2.8.5 - wxWidgets-2.8.4 - wxWidgets-2.8.3 - wxWidgets-2.8.2 - wxWidgets-2.8.1 - wxWidgets-2.8.0 - wxWidgets-2.7.4 - wxWidgets-2.7.3 - wxWidgets-2.7.2 - wxWidgets-2.7.1 - wxWidgets-2.7.0 - wxWidgets-2.7.0-1 - wxWidgets-2.6.4 - wxWidgets-2.6.3 - wxWidgets-2.6.2 - wxWidgets-2.6.1 - wxWidgets-2.5.4 - wxWidgets-2.5.3 - wxWidgets-2.5.2 - wxWidgets-2.5.1 - wxWidgets - DOC "wxWidgets base/installation directory" - ) - - # If wxWidgets_ROOT_DIR changed, clear lib dir. - if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR) - set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR} - CACHE INTERNAL "wxWidgets_ROOT_DIR") - set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND" - CACHE PATH "Cleared." FORCE) - endif() - - if(WX_ROOT_DIR) - # Select one default tree inside the already determined wx tree. - # Prefer static/shared order usually consistent with build - # settings. - if(MINGW) - set(WX_LIB_DIR_PREFIX gcc) - elseif(CMAKE_CL_64) - set(WX_LIB_DIR_PREFIX vc_x64) - else() - set(WX_LIB_DIR_PREFIX vc) - endif() - if(BUILD_SHARED_LIBS) - find_path(wxWidgets_LIB_DIR - NAMES - msw/wx/setup.h - mswd/wx/setup.h - mswu/wx/setup.h - mswud/wx/setup.h - mswuniv/wx/setup.h - mswunivd/wx/setup.h - mswunivu/wx/setup.h - mswunivud/wx/setup.h - PATHS - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib - DOC "Path to wxWidgets libraries" - NO_DEFAULT_PATH - ) - else() - find_path(wxWidgets_LIB_DIR - NAMES - msw/wx/setup.h - mswd/wx/setup.h - mswu/wx/setup.h - mswud/wx/setup.h - mswuniv/wx/setup.h - mswunivd/wx/setup.h - mswunivu/wx/setup.h - mswunivud/wx/setup.h - PATHS - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll - DOC "Path to wxWidgets libraries" - NO_DEFAULT_PATH - ) - endif() - - # If wxWidgets_LIB_DIR changed, clear all libraries. - if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) - set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR") - WX_CLEAR_ALL_DBG_LIBS() - WX_CLEAR_ALL_REL_LIBS() - endif() - - if(WX_LIB_DIR) - # If building shared libs, define WXUSINGDLL to use dllimport. - if(WX_LIB_DIR MATCHES "[dD][lL][lL]") - set(wxWidgets_DEFINITIONS WXUSINGDLL) - DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") - endif() - - # Search for available configuration types. - foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) - set(WX_${CFG}_FOUND FALSE) - if(EXISTS ${WX_LIB_DIR}/${CFG}) - list(APPEND WX_CONFIGURATION_LIST ${CFG}) - set(WX_${CFG}_FOUND TRUE) - set(WX_CONFIGURATION ${CFG}) - endif() - endforeach() - DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") - - if(WX_CONFIGURATION) - set(wxWidgets_FOUND TRUE) - - # If the selected configuration wasn't found force the default - # one. Otherwise, use it but still force a refresh for - # updating the doc string with the current list of available - # configurations. - if(NOT WX_${wxWidgets_CONFIGURATION}_FOUND) - set(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING - "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) - else() - set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING - "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) - endif() - - # If release config selected, and both release/debug exist. - if(WX_${wxWidgets_CONFIGURATION}d_FOUND) - option(wxWidgets_USE_REL_AND_DBG - "Use release and debug configurations?" TRUE) - set(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG}) - else() - # If the option exists (already in cache), force it false. - if(wxWidgets_USE_REL_AND_DBG) - set(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL - "No ${wxWidgets_CONFIGURATION}d found." FORCE) - endif() - set(WX_USE_REL_AND_DBG FALSE) - endif() - - # Get configuration parameters from the name. - WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) - - # Set wxWidgets lib setup include directory. - if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) - set(wxWidgets_INCLUDE_DIRS - ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) - else() - DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.") - set(wxWidgets_FOUND FALSE) - endif() - - # Set wxWidgets main include directory. - if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) - list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include) - else() - DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h") - set(wxWidgets_FOUND FALSE) - endif() - - # Find wxWidgets libraries. - WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}") - if(WX_USE_REL_AND_DBG) - WX_FIND_LIBS("${UNV}" "${UCD}" "d") - endif() - - # Settings for requested libs (i.e., include dir, libraries, etc.). - WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}") - - # Add necessary definitions for unicode builds - if("${UCD}" STREQUAL "u") - list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE) - endif() - - # Add necessary definitions for debug builds - set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__) - - endif() - endif() - endif() - -#===================================================================== -# UNIX_FIND_STYLE -#===================================================================== -else() - if(wxWidgets_FIND_STYLE STREQUAL "unix") - #----------------------------------------------------------------- - # UNIX: Helper MACROS - #----------------------------------------------------------------- - # - # Set the default values based on "wx-config --selected-config". - # - macro(WX_CONFIG_SELECT_GET_DEFAULT) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --selected-config - OUTPUT_VARIABLE _wx_selected_config - RESULT_VARIABLE _wx_result - ERROR_QUIET - ) - if(_wx_result EQUAL 0) - foreach(_opt_name debug static unicode universal) - string(TOUPPER ${_opt_name} _upper_opt_name) - if(_wx_selected_config MATCHES "${_opt_name}") - set(wxWidgets_DEFAULT_${_upper_opt_name} ON) - else() - set(wxWidgets_DEFAULT_${_upper_opt_name} OFF) - endif() - endforeach() - else() - foreach(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL) - set(wxWidgets_DEFAULT_${_upper_opt_name} OFF) - endforeach() - endif() - endmacro() - - # - # Query a boolean configuration option to determine if the system - # has both builds available. If so, provide the selection option - # to the user. - # - macro(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes - RESULT_VARIABLE _wx_result_yes - OUTPUT_QUIET - ERROR_QUIET - ) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=no - RESULT_VARIABLE _wx_result_no - OUTPUT_QUIET - ERROR_QUIET - ) - string(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME) - if(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0) - option(wxWidgets_USE_${_UPPER_OPT_NAME} - ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}}) - else() - # If option exists (already in cache), force to available one. - if(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME}) - if(_wx_result_yes EQUAL 0) - set(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE) - else() - set(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE) - endif() - endif() - endif() - endmacro() - - # - # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting - # among multiple builds. - # - macro(WX_CONFIG_SELECT_SET_OPTIONS) - set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS}) - foreach(_opt_name debug static unicode universal) - string(TOUPPER ${_opt_name} _upper_opt_name) - if(DEFINED wxWidgets_USE_${_upper_opt_name}) - if(wxWidgets_USE_${_upper_opt_name}) - list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes) - else() - list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no) - endif() - endif() - endforeach() - endmacro() - - #----------------------------------------------------------------- - # UNIX: Start actual work. - #----------------------------------------------------------------- - # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE wx-config - DOC "Location of wxWidgets library configuration provider binary (wx-config)." - ONLY_CMAKE_FIND_ROOT_PATH - ) - - if(wxWidgets_CONFIG_EXECUTABLE) - set(wxWidgets_FOUND TRUE) - - # get defaults based on "wx-config --selected-config" - WX_CONFIG_SELECT_GET_DEFAULT() - - # for each option: if both builds are available, provide option - WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?") - WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?") - WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?") - WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?") - - # process selection to set wxWidgets_SELECT_OPTIONS - WX_CONFIG_SELECT_SET_OPTIONS() - DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}") - - # run the wx-config program to get cxxflags - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_SELECT_OPTIONS} --cxxflags - OUTPUT_VARIABLE wxWidgets_CXX_FLAGS - RESULT_VARIABLE RET - ERROR_QUIET - ) - if(RET EQUAL 0) - string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS) - separate_arguments(wxWidgets_CXX_FLAGS) - - DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") - - # parse definitions from cxxflags; - # drop -D* from CXXFLAGS and the -D prefix - string(REGEX MATCHALL "-D[^;]+" - wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE "-D[^;]+(;|$)" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE ";$" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REPLACE "-D" "" - wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}") - - # parse include dirs from cxxflags; drop -I prefix - string(REGEX MATCHALL "-I[^;]+" - wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE "-I[^;]+;" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REPLACE "-I" "" - wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") - - DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}") - DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}") - DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") - - else() - set(wxWidgets_FOUND FALSE) - DBG_MSG_V( - "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}") - endif() - - # run the wx-config program to get the libs - # - NOTE: wx-config doesn't verify that the libs requested exist - # it just produces the names. Maybe a TRY_COMPILE would - # be useful here... - string(REPLACE ";" "," - wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}") - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS} - OUTPUT_VARIABLE wxWidgets_LIBRARIES - RESULT_VARIABLE RET - ERROR_QUIET - ) - if(RET EQUAL 0) - string(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES) - separate_arguments(wxWidgets_LIBRARIES) - string(REPLACE "-framework;" "-framework " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - string(REPLACE "-arch;" "-arch " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - string(REPLACE "-isysroot;" "-isysroot " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - - # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES) - string(REGEX MATCHALL "-L[^;]+" - wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}") - string(REPLACE "-L" "" - wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}") - - DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}") - DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}") - - else() - set(wxWidgets_FOUND FALSE) - DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}") - endif() - endif() - -#===================================================================== -# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE -#===================================================================== - else() - if(NOT wxWidgets_FIND_QUIETLY) - message(STATUS - "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n" - " Platform unknown/unsupported. It's neither WIN32 nor UNIX " - "find style." - ) - endif() - endif() -endif() - -# Debug output: -DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}") -DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}") -DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}") -DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}") -DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}") -DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") - -#===================================================================== -#===================================================================== -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND) -# Maintain consistency with all other variables. -set(wxWidgets_FOUND ${WXWIDGETS_FOUND}) - -#===================================================================== -# Macros for use in wxWidgets apps. -# - This module will not fail to find wxWidgets based on the code -# below. Hence, it's required to check for validity of: -# -# wxWidgets_wxrc_EXECUTABLE -#===================================================================== - -# Resource file compiler. -find_program(wxWidgets_wxrc_EXECUTABLE wxrc - ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw - DOC "Location of wxWidgets resource file compiler binary (wxrc)" - ) - -# -# WX_SPLIT_ARGUMENTS_ON( ...) -# -# Sets and to contain arguments to the left and right, -# respectively, of . -# -# Example usage: -# function(WXWIDGETS_ADD_RESOURCES outfiles) -# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN}) -# ... -# endfunction() -# -# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C) -# -# NOTE: This is a generic piece of code that should be renamed to -# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as -# FindPackageStandardArgs.cmake. At the time of this writing -# FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied -# here a bit more generalized. So, there are already two find modules -# using this approach. -# -function(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar) - # FIXME: Document that the input variables will be cleared. - #list(APPEND ${_leftvar} "") - #list(APPEND ${_rightvar} "") - set(${_leftvar} "") - set(${_rightvar} "") - - set(_doing_right FALSE) - foreach(element ${ARGN}) - if("${element}" STREQUAL "${_keyword}") - set(_doing_right TRUE) - else() - if(_doing_right) - list(APPEND ${_rightvar} "${element}") - else() - list(APPEND ${_leftvar} "${element}") - endif() - endif() - endforeach() - - set(${_leftvar} ${${_leftvar}} PARENT_SCOPE) - set(${_rightvar} ${${_rightvar}} PARENT_SCOPE) -endfunction() - -# -# WX_GET_DEPENDENCIES_FROM_XML( -# -# -# -# -# -# ) -# -# FIXME: Add documentation here... -# -function(WX_GET_DEPENDENCIES_FROM_XML - _depends - _match_patt - _clean_patt - _xml_contents - _depends_path - ) - - string(REGEX MATCHALL - ${_match_patt} - dep_file_list - "${${_xml_contents}}" - ) - foreach(dep_file ${dep_file_list}) - string(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}") - - # make the file have an absolute path - if(NOT IS_ABSOLUTE "${dep_file}") - set(dep_file "${${_depends_path}}/${dep_file}") - endif() - - # append file to dependency list - list(APPEND ${_depends} "${dep_file}") - endforeach() - - set(${_depends} ${${_depends}} PARENT_SCOPE) -endfunction() - -# -# WXWIDGETS_ADD_RESOURCES( -# OPTIONS [NO_CPP_CODE]) -# -# Adds a custom command for resource file compilation of the -# and appends the output files to . -# -# Example usages: -# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc) -# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx) -# -function(WXWIDGETS_ADD_RESOURCES _outfiles) - WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN}) - - # Parse files for dependencies. - set(rc_file_list_abs "") - set(rc_depends "") - foreach(rc_file ${rc_file_list}) - get_filename_component(depends_path ${rc_file} PATH) - - get_filename_component(rc_file_abs ${rc_file} ABSOLUTE) - list(APPEND rc_file_list_abs "${rc_file_abs}") - - # All files have absolute paths or paths relative to the location - # of the rc file. - file(READ "${rc_file_abs}" rc_file_contents) - - # get bitmap/bitmap2 files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*>" - rc_file_contents - depends_path - ) - - # get url files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*>" - rc_file_contents - depends_path - ) - - # get wxIcon files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*class=\"wxIcon\"[^<]+" - "^]*>" - rc_file_contents - depends_path - ) - endforeach() - - # - # Parse options. - # - # If NO_CPP_CODE option specified, then produce .xrs file rather - # than a .cpp file (i.e., don't add the default --cpp-code option). - list(FIND rc_options NO_CPP_CODE index) - if(index EQUAL -1) - list(APPEND rc_options --cpp-code) - # wxrc's default output filename for cpp code. - set(outfile resource.cpp) - else() - list(REMOVE_AT rc_options ${index}) - # wxrc's default output filename for xrs file. - set(outfile resource.xrs) - endif() - - # Get output name for use in ADD_CUSTOM_COMMAND. - # - short option scanning - list(FIND rc_options -o index) - if(NOT index EQUAL -1) - math(EXPR filename_index "${index} + 1") - list(GET rc_options ${filename_index} outfile) - #list(REMOVE_AT rc_options ${index} ${filename_index}) - endif() - # - long option scanning - string(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}") - if(outfile_opt) - string(REPLACE "--output=" "" outfile "${outfile_opt}") - endif() - #string(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}") - #string(REGEX REPLACE ";$" "" rc_options "${rc_options}") - - if(NOT IS_ABSOLUTE "${outfile}") - set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}") - endif() - add_custom_command( - OUTPUT "${outfile}" - COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs} - DEPENDS ${rc_file_list_abs} ${rc_depends} - ) - - # Add generated header to output file list. - list(FIND rc_options -e short_index) - list(FIND rc_options --extra-cpp-code long_index) - if(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1) - get_filename_component(outfile_ext ${outfile} EXT) - string(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}") - list(APPEND ${_outfiles} "${outfile_header}") - set_source_files_properties( - "${outfile_header}" PROPERTIES GENERATED TRUE - ) - endif() - - # Add generated file to output file list. - list(APPEND ${_outfiles} "${outfile}") - - set(${_outfiles} ${${_outfiles}} PARENT_SCOPE) -endfunction() From f22ef685f5da0149f52b1cde69a10b616a7853b8 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 30 Mar 2016 19:34:36 -0400 Subject: [PATCH 13/15] Static analysis related fixes --- src/AppFrame.cpp | 4 +-- src/audio/AudioThread.cpp | 6 ++-- src/audio/AudioThread.h | 1 + src/demod/DemodulatorInstance.cpp | 41 ++++++++++++++++----------- src/demod/DemodulatorWorkerThread.cpp | 2 +- src/sdr/SDRPostThread.cpp | 4 ++- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index 829d34b..a09f068 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -1610,7 +1610,7 @@ bool AppFrame::loadSession(std::string fileName) { DataNode *demodTypeNode = demod->hasAnother("type")?demod->getNext("type"):nullptr; - if (demodTypeNode->element()->getDataType() == DATA_INT) { + if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_INT) { int legacyType = *demodTypeNode; int legacyStereo = demod->hasAnother("stereo") ? (int) *demod->getNext("stereo") : 0; switch (legacyType) { // legacy demod ID @@ -1632,7 +1632,7 @@ bool AppFrame::loadSession(std::string fileName) { case 16: type = "I/Q"; break; default: type = "FM"; break; } - } else if (demodTypeNode->element()->getDataType() == DATA_STRING) { + } else if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_STRING) { demodTypeNode->element()->get(type); } diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp index ec107f1..2a02a03 100644 --- a/src/audio/AudioThread.cpp +++ b/src/audio/AudioThread.cpp @@ -20,11 +20,13 @@ AudioThread::AudioThread() : IOThread(), outputDevice.store(-1); gain.store(1.0); - boundThreads.store(new std::vector); + vBoundThreads = new std::vector; + boundThreads.store(vBoundThreads); } AudioThread::~AudioThread() { - delete boundThreads.load(); + boundThreads.store(nullptr); + delete vBoundThreads; } void AudioThread::bindThread(AudioThread *other) { diff --git a/src/audio/AudioThread.h b/src/audio/AudioThread.h index 7af40b3..5712288 100644 --- a/src/audio/AudioThread.h +++ b/src/audio/AudioThread.h @@ -100,5 +100,6 @@ public: static void deviceCleanup(); static void setDeviceSampleRate(int deviceId, int sampleRate); std::atomic *> boundThreads; + std::vector *vBoundThreads; }; diff --git a/src/demod/DemodulatorInstance.cpp b/src/demod/DemodulatorInstance.cpp index 32e8232..0a1595a 100644 --- a/src/demod/DemodulatorInstance.cpp +++ b/src/demod/DemodulatorInstance.cpp @@ -137,17 +137,23 @@ bool DemodulatorInstance::isTerminated() { switch (cmd.cmd) { case DemodulatorThreadCommand::DEMOD_THREAD_CMD_AUDIO_TERMINATED: - t_Audio->join(); - audioTerminated = true; - delete t_Audio; + if (t_Audio) { + t_Audio->join(); + audioTerminated = true; + delete t_Audio; + t_Audio = nullptr; + } break; case DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_TERMINATED: -#ifdef __APPLE__ - pthread_join(t_Demod, NULL); -#else - t_Demod->join(); - delete t_Demod; -#endif + if (t_Demod) { + #ifdef __APPLE__ + pthread_join(t_Demod, nullptr); + #else + t_Demod->join(); + delete t_Demod; + #endif + t_Demod = nullptr; + } #if ENABLE_DIGITAL_LAB if (activeOutput) { closeOutput(); @@ -156,13 +162,16 @@ bool DemodulatorInstance::isTerminated() { demodTerminated = true; break; case DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED: -#ifdef __APPLE__ - pthread_join(t_PreDemod, NULL); -#else - t_PreDemod->join(); - delete t_PreDemod; -#endif - preDemodTerminated = true; + if (t_PreDemod) { + #ifdef __APPLE__ + pthread_join(t_PreDemod, NULL); + #else + t_PreDemod->join(); + delete t_PreDemod; + #endif + preDemodTerminated = true; + t_PreDemod = nullptr; + } break; default: break; diff --git a/src/demod/DemodulatorWorkerThread.cpp b/src/demod/DemodulatorWorkerThread.cpp index 492b439..dd43aaf 100644 --- a/src/demod/DemodulatorWorkerThread.cpp +++ b/src/demod/DemodulatorWorkerThread.cpp @@ -84,7 +84,7 @@ void DemodulatorWorkerThread::run() { float As = 60.0f; // stop-band attenuation [dB] - if (result.sampleRate && result.bandwidth) { + if (cModem && result.sampleRate && result.bandwidth) { result.bandwidth = cModem->checkSampleRate(result.bandwidth, makeDemod?demodCommand.audioSampleRate:filterCommand.audioSampleRate); result.iqResampleRatio = (double) (result.bandwidth) / (double) result.sampleRate; result.iqResampler = msresamp_crcf_create(result.iqResampleRatio, As); diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp index ef02c87..fe6f62c 100644 --- a/src/sdr/SDRPostThread.cpp +++ b/src/sdr/SDRPostThread.cpp @@ -184,7 +184,9 @@ void SDRPostThread::run() { } } - data_in->decRefCount(); + if (data_in) { + data_in->decRefCount(); + } bool doUpdate = false; for (size_t j = 0; j < nRunDemods; j++) { From cd41a8197e55472a4d2303624380f2ceb7d7407f Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 31 Mar 2016 20:24:38 -0400 Subject: [PATCH 14/15] Clean-up extraneous glFlush(), it's all in the main thread on shared context.. --- src/ui/UITestContext.cpp | 4 ++-- src/visual/MeterContext.cpp | 4 ++-- src/visual/ModeSelectorContext.cpp | 4 ++-- src/visual/PrimaryGLContext.cpp | 4 ++-- src/visual/ScopeContext.cpp | 4 ++-- src/visual/TuningContext.cpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ui/UITestContext.cpp b/src/ui/UITestContext.cpp index bb91cdc..652bdbe 100644 --- a/src/ui/UITestContext.cpp +++ b/src/ui/UITestContext.cpp @@ -63,8 +63,8 @@ void UITestContext::Draw() { } void UITestContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/MeterContext.cpp b/src/visual/MeterContext.cpp index e1351bf..8387e64 100644 --- a/src/visual/MeterContext.cpp +++ b/src/visual/MeterContext.cpp @@ -44,8 +44,8 @@ void MeterContext::Draw(float r, float g, float b, float a, float level) { } void MeterContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/ModeSelectorContext.cpp b/src/visual/ModeSelectorContext.cpp index d92b06b..dde83bd 100644 --- a/src/visual/ModeSelectorContext.cpp +++ b/src/visual/ModeSelectorContext.cpp @@ -66,8 +66,8 @@ void ModeSelectorContext::DrawSelector(std::string label, int c, int cMax, bool } void ModeSelectorContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp index 9a62538..9cbfd4f 100644 --- a/src/visual/PrimaryGLContext.cpp +++ b/src/visual/PrimaryGLContext.cpp @@ -483,9 +483,9 @@ void PrimaryGLContext::BeginDraw(float r, float g, float b) { } void PrimaryGLContext::EndDraw() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void PrimaryGLContext::setHoverAlpha(float hoverAlpha) { diff --git a/src/visual/ScopeContext.cpp b/src/visual/ScopeContext.cpp index 75741c4..89e8a7d 100644 --- a/src/visual/ScopeContext.cpp +++ b/src/visual/ScopeContext.cpp @@ -51,9 +51,9 @@ void ScopeContext::DrawDeviceName(std::string deviceName) { } void ScopeContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void ScopeContext::DrawDivider() { diff --git a/src/visual/TuningContext.cpp b/src/visual/TuningContext.cpp index d31a975..1ce70f8 100644 --- a/src/visual/TuningContext.cpp +++ b/src/visual/TuningContext.cpp @@ -59,9 +59,9 @@ void TuningContext::Draw(float r, float g, float b, float a, float p1, float p2) } void TuningContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void TuningContext::DrawTuner(long long freq, int count, float displayPos, float displayWidth) { From b828b3636ffad2421cc734c3178c7deec9bf37b4 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 31 Mar 2016 21:32:50 -0400 Subject: [PATCH 15/15] Add 'Reduced CPU Usage' menu option and config entry. --- src/AppConfig.cpp | 17 +++++++++++- src/AppConfig.h | 5 +++- src/AppFrame.cpp | 35 +++++++++++++++++++++++-- src/AppFrame.h | 4 +++ src/process/SpectrumVisualProcessor.cpp | 8 ++++++ src/process/SpectrumVisualProcessor.h | 1 + 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/src/AppConfig.cpp b/src/AppConfig.cpp index 53e4e2d..506c4c9 100644 --- a/src/AppConfig.cpp +++ b/src/AppConfig.cpp @@ -199,6 +199,7 @@ AppConfig::AppConfig() : configName("") { winH.store(0); winMax.store(false); showTips.store(true); + lowPerfMode.store(false); themeId.store(0); snap.store(1); centerFreq.store(100000000); @@ -265,6 +266,14 @@ bool AppConfig::getShowTips() { return showTips.load(); } +void AppConfig::setLowPerfMode(bool show) { + lowPerfMode.store(show); +} + +bool AppConfig::getLowPerfMode() { + return lowPerfMode.load(); +} + wxRect *AppConfig::getWindow() { wxRect *r = NULL; if (winH.load() && winW.load()) { @@ -360,6 +369,7 @@ bool AppConfig::save() { *window_node->newChild("max") = winMax.load(); *window_node->newChild("tips") = showTips.load(); + *window_node->newChild("low_perf_mode") = lowPerfMode.load(); *window_node->newChild("theme") = themeId.load(); *window_node->newChild("snap") = snap.load(); *window_node->newChild("center_freq") = centerFreq.load(); @@ -444,7 +454,7 @@ bool AppConfig::load() { if (cfg.rootNode()->hasAnother("window")) { int x,y,w,h; - int max,tips; + int max,tips,lpm; DataNode *win_node = cfg.rootNode()->getNext("window"); @@ -470,6 +480,11 @@ bool AppConfig::load() { showTips.store(tips?true:false); } + if (win_node->hasAnother("low_perf_mode")) { + win_node->getNext("low_perf_mode")->element()->get(lpm); + lowPerfMode.store(lpm?true:false); + } + if (win_node->hasAnother("theme")) { int theme; win_node->getNext("theme")->element()->get(theme); diff --git a/src/AppConfig.h b/src/AppConfig.h index dabadb1..4b1198d 100644 --- a/src/AppConfig.h +++ b/src/AppConfig.h @@ -73,6 +73,9 @@ public: void setShowTips(bool show); bool getShowTips(); + void setLowPerfMode(bool lpm); + bool getLowPerfMode(); + void setTheme(int themeId); int getTheme(); @@ -127,7 +130,7 @@ private: std::string configName; std::map deviceConfig; std::atomic_int winX,winY,winW,winH; - std::atomic_bool winMax, showTips; + std::atomic_bool winMax, showTips, lowPerfMode; std::atomic_int themeId; std::atomic_llong snap; std::atomic_llong centerFreq; diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index a09f068..b6cac84 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -605,6 +605,14 @@ void AppFrame::updateDeviceParams() { showTipMenuItem = newSettingsMenu->AppendCheckItem(wxID_SET_TIPS, "Show Hover Tips"); showTipMenuItem->Check(wxGetApp().getConfig()->getShowTips()); + lowPerfMode = wxGetApp().getConfig()->getLowPerfMode(); + lowPerfMenuItem = newSettingsMenu->AppendCheckItem(wxID_LOW_PERF, "Reduce CPU Usage"); + if (lowPerfMode) { + lowPerfMenuItem->Check(true); + } + + newSettingsMenu->AppendSeparator(); + newSettingsMenu->Append(wxID_SET_FREQ_OFFSET, "Frequency Offset"); if (devInfo->hasCORR(SOAPY_SDR_RX, 0)) { @@ -626,6 +634,10 @@ void AppFrame::updateDeviceParams() { SoapySDR::ArgInfoList::const_iterator args_i; settingArgs = soapyDev->getSettingInfo(); + + if (settingArgs.size()) { + newSettingsMenu->AppendSeparator(); + } for (args_i = settingArgs.begin(); args_i != settingArgs.end(); args_i++) { SoapySDR::ArgInfo arg = (*args_i); @@ -781,6 +793,21 @@ void AppFrame::OnMenu(wxCommandEvent& event) { wxGetApp().setDevice(dev); } } + } else if (event.GetId() == wxID_LOW_PERF) { + lowPerfMode = lowPerfMenuItem->IsChecked(); + wxGetApp().getConfig()->setLowPerfMode(lowPerfMode); + +// long srate = wxGetApp().getSampleRate(); +// if (srate > CHANNELIZER_RATE_MAX && lowPerfMode) { +// if (wxGetApp().getSpectrumProcessor()->getFFTSize() != 1024) { +// setMainWaterfallFFTSize(1024); +// } +// } else if (srate > CHANNELIZER_RATE_MAX) { +// if (wxGetApp().getSpectrumProcessor()->getFFTSize() != 2048) { +// setMainWaterfallFFTSize(2048); +// } +// } + } else if (event.GetId() == wxID_SET_TIPS ) { if (wxGetApp().getConfig()->getShowTips()) { wxGetApp().getConfig()->setShowTips(false); @@ -1462,9 +1489,13 @@ void AppFrame::OnIdle(wxIdleEvent& event) { #endif if (!this->IsActive()) { - std::this_thread::sleep_for(std::chrono::milliseconds(25)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); } else { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); + if (lowPerfMode) { + std::this_thread::sleep_for(std::chrono::milliseconds(30)); + } else { + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } } event.RequestMore(); diff --git a/src/AppFrame.h b/src/AppFrame.h index 2e06889..5b89b6f 100644 --- a/src/AppFrame.h +++ b/src/AppFrame.h @@ -31,6 +31,7 @@ #define wxID_SDR_DEVICES 2008 #define wxID_AGC_CONTROL 2009 #define wxID_SDR_START_STOP 2010 +#define wxID_LOW_PERF 2011 #define wxID_MAIN_SPLITTER 2050 #define wxID_VIS_SPLITTER 2051 @@ -134,6 +135,7 @@ private: wxMenu *sampleRateMenu; wxMenuItem *agcMenuItem; wxMenuItem *iqSwapMenuItem; + wxMenuItem *lowPerfMenuItem; wxMenu *settingsMenu; SoapySDR::ArgInfoList settingArgs; int settingsIdMax; @@ -152,6 +154,8 @@ private: ModemArgInfoList newModemArgs; wxMenuItem *showTipMenuItem; + bool lowPerfMode; + #ifdef USE_HAMLIB void enableRig(); void disableRig(); diff --git a/src/process/SpectrumVisualProcessor.cpp b/src/process/SpectrumVisualProcessor.cpp index 1a43af4..da8283f 100644 --- a/src/process/SpectrumVisualProcessor.cpp +++ b/src/process/SpectrumVisualProcessor.cpp @@ -201,6 +201,14 @@ void SpectrumVisualProcessor::setFFTSize(unsigned int fftSize_in) { fftSizeChanged.store(true); } +unsigned int SpectrumVisualProcessor::getFFTSize() { + if (fftSizeChanged.load()) { + return newFFTSize; + } + return fftSize.load(); +} + + void SpectrumVisualProcessor::setHideDC(bool hideDC) { this->hideDC.store(hideDC); } diff --git a/src/process/SpectrumVisualProcessor.h b/src/process/SpectrumVisualProcessor.h index 57f3036..59e9236 100644 --- a/src/process/SpectrumVisualProcessor.h +++ b/src/process/SpectrumVisualProcessor.h @@ -47,6 +47,7 @@ public: void setup(unsigned int fftSize); void setFFTSize(unsigned int fftSize); + unsigned int getFFTSize(); void setHideDC(bool hideDC); void setScaleFactor(float sf);