VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00
Code Issues Projects Releases Wiki Activity

Renamed ScopeVisNG to ScopeVis

Browse Source
This commit is contained in:
f4exb
2018-08-12 17:18:58 +02:00
parent 4a733cae51
commit aa6f2e9f2f
12 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glscope.cpp
+6 -6
View File
@@ -92,7 +92,7 @@ void GLScope::setDisplayTraceIntensity(int intensity)
update();
}
void GLScope::setTraces(std::vector<ScopeVisNG::TraceData>* tracesData, std::vector<float *>* traces)
void GLScope::setTraces(std::vector<ScopeVis::TraceData>* tracesData, std::vector<float *>* traces)
{
m_tracesData = tracesData;
m_traces = traces;
@@ -304,7 +304,7 @@ void GLScope::paintGL()
if (m_traceSize > 0)
{
const float *trace = (*m_traces)[0];
const ScopeVisNG::TraceData& traceData = (*m_tracesData)[0];
const ScopeVis::TraceData& traceData = (*m_tracesData)[0];
if (traceData.m_viewTrace)
{
@@ -487,7 +487,7 @@ void GLScope::paintGL()
for (unsigned int i = 1; i < m_traces->size(); i++)
{
const float *trace = (*m_traces)[i];
const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i];
const ScopeVis::TraceData& traceData = (*m_tracesData)[i];
if (!traceData.m_viewTrace) {
continue;
@@ -713,7 +713,7 @@ void GLScope::paintGL()
for (unsigned int i = 0; i < m_traces->size(); i++)
{
const float *trace = (*m_traces)[i];
const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i];
const ScopeVis::TraceData& traceData = (*m_tracesData)[i];
if (!traceData.m_viewTrace) {
continue;
@@ -889,7 +889,7 @@ void GLScope::paintGL()
for (unsigned int i = 1; i < m_traces->size(); i++)
{
const float *trace = (*m_traces)[i];
const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i];
const ScopeVis::TraceData& traceData = (*m_tracesData)[i];
if (!traceData.m_viewTrace) {
continue;
@@ -1865,7 +1865,7 @@ void GLScope::setPolarDisplays()
void GLScope::setYScale(ScaleEngine& scale, uint32_t highlightedTraceIndex)
{
ScopeVisNG::TraceData& traceData = (*m_tracesData)[highlightedTraceIndex];
ScopeVis::TraceData& traceData = (*m_tracesData)[highlightedTraceIndex];
double amp_range = 2.0 / traceData.m_amp;
double amp_ofs = traceData.m_ofs;
double pow_floor = -100.0 + traceData.m_ofs * 100.0;