Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 119371cf57eb
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1ff6aaa49d6f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 23, 2020

  1. Added logarithmic Y axis support for new renderer. Fixes #57.

    @azonenberg
    azonenberg committed Feb 23, 2020
    Copy the full SHA
    1ff6aaa View commit details
Showing with 1 addition and 26 deletions.
  1. +1 −26 glscopeclient/WaveformArea_rendering.cpp
27 changes: 1 addition & 26 deletions glscopeclient/WaveformArea_rendering.cpp
View file
Original file line number Diff line number Diff line change
@@ -70,29 +70,6 @@ bool WaveformArea::PrepareGeometry()
double start = GetTime();
double xscale = pdat->m_timescale * m_group->m_pixelsPerXUnit;

/*
float xleft = data.GetSampleStart(j) * xscale;
float xright = data.GetSampleStart(j+1) * xscale;
if(xright < xleft + 1)
xright = xleft + 1;
float ymid = m_pixelsPerVolt * (data[j] + offset);
float nextymid = m_pixelsPerVolt * (data[j+1] + offset);
//Logarithmic scale for FFT displays
if(fft)
{
double db1 = 20 * log10(data[j]);
double db2 = 20 * log10(data[j+1]);
db1 = -70 - db1; //todo: dont hard code plot limit
db2 = -70 - db2;
ymid = DbToYPosition(db1);
nextymid = DbToYPosition(db2);
}
*/

bool fft = IsFFT();

//Calculate X/Y coordinate of each sample point
@@ -108,9 +85,7 @@ bool WaveformArea::PrepareGeometry()

float y;
if(fft)
{

}
y = DbToYPosition(-70 - (20 * log10(data[j]))); //TODO: don't hard code plot limits
else
y = (m_pixelsPerVolt * (data[j] + offset)) + m_height/2;