comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-05 15:35:01 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup: remove some unused params and variables, conversion warnings seen with #550.

Browse Source
This commit is contained in:
vsonnier
2017-05-29 20:08:45 +02:00
parent be3c0c9778
commit 8f608bbf5c
15 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/GainCanvas.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ void GainCanvas::SetLevel() {
for (auto gi : gainPanels) {
if (gi->isMeterHit(mpos)) {
float value = gi->getMeterHitValue(mpos, *gi);
float value = gi->getMeterHitValue(mpos);
gi->setValue(value);
gi->setChanged(true);
@@ -100,7 +100,7 @@ void GainCanvas::OnMouseMoved(wxMouseEvent& event) {
for (auto gi : gainPanels) {
if (gi->isMeterHit(mpos)) {
float value = gi->getMeterHitValue(mpos, *gi);
float value = gi->getMeterHitValue(mpos);
gi->setHighlight(value);
gi->setHighlightVisible(true);
src/visual/InteractiveCanvas.h
+1 -1
View File
@@ -13,7 +13,7 @@
class InteractiveCanvas: public wxGLCanvas {
public:
InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
~InteractiveCanvas();
virtual ~InteractiveCanvas();
long long getFrequencyAt(float x);
long long getFrequencyAt(float x, long long iqCenterFreq, long long iqBandwidth);
src/visual/PrimaryGLContext.cpp
-6
View File
@@ -356,20 +356,14 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
glEnable(GL_BLEND);
GLFont::Align demodAlign = GLFont::GLFONT_ALIGN_CENTER;
//Displayed string is wstring, so use wxString to do the heavy lifting of converting getDemodulatorType()...
wxString demodStr;
demodStr.assign(demod->getDemodulatorType());
demodAlign = GLFont::GLFONT_ALIGN_CENTER;
if (demodStr == "LSB") {
demodAlign = GLFont::GLFONT_ALIGN_RIGHT;
uxPos -= xOfs;
} else if (demodStr == "USB") {
demodAlign = GLFont::GLFONT_ALIGN_LEFT;
uxPos += xOfs;
}
// advanced demodulators start here