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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27098762823c
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c01f3cac929
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 23, 2020

  1. Difference/moving average filters now properly propagate X axis units… 

    … as well as Y
    @azonenberg
    azonenberg committed May 23, 2020
    Copy the full SHA
    6c01f3c View commit details
Showing with 3 additions and 1 deletion.
  1. +2 −1 scopeprotocols/DifferenceDecoder.cpp
  2. +1 −0 scopeprotocols/MovingAverageDecoder.cpp
3 changes: 2 additions & 1 deletion scopeprotocols/DifferenceDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -114,8 +114,9 @@ void DifferenceDecoder::Refresh()
}

//Set up units and complain if they're inconsistent
m_xAxisUnit = m_channels[0]->GetXAxisUnits();
m_yAxisUnit = m_channels[0]->GetYAxisUnits();
if(m_yAxisUnit != m_channels[1]->GetYAxisUnits())
if( (m_xAxisUnit != m_channels[1]->GetXAxisUnits()) || (m_yAxisUnit != m_channels[1]->GetYAxisUnits()) )
{
SetData(NULL);
return;
1 change: 1 addition & 0 deletions scopeprotocols/MovingAverageDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -123,6 +123,7 @@ void MovingAverageDecoder::Refresh()

size_t depth = m_parameters[m_depthname].GetIntVal();

m_xAxisUnit = m_channels[0]->GetXAxisUnits();
m_yAxisUnit = m_channels[0]->GetYAxisUnits();

//Do the average