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

Commits on Nov 27, 2020

  1. Copy the full SHA
    b5c0911 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 scopeprotocols/EyeHeightMeasurement.cpp
  2. +2 −2 scopeprotocols/EyeJitterMeasurement.cpp
  3. +2 −2 scopeprotocols/EyeWidthMeasurement.cpp
4 changes: 2 additions & 2 deletions scopeprotocols/EyeHeightMeasurement.cpp
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ bool EyeHeightMeasurement::ValidateChannel(size_t i, StreamDescriptor stream)
void EyeHeightMeasurement::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "EyeHeightSlice(%s, %s, %s)",
snprintf(hwname, sizeof(hwname), "EyeHeight(%s, %s, %s)",
GetInputDisplayName(0).c_str(),
m_parameters[m_startname].ToString().c_str(),
m_parameters[m_endname].ToString().c_str());
@@ -92,7 +92,7 @@ void EyeHeightMeasurement::SetDefaultName()

string EyeHeightMeasurement::GetProtocolName()
{
return "Eye Height Slice";
return "Eye Height";
}

bool EyeHeightMeasurement::IsOverlay()
4 changes: 2 additions & 2 deletions scopeprotocols/EyeJitterMeasurement.cpp
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ bool EyeJitterMeasurement::ValidateChannel(size_t i, StreamDescriptor stream)
void EyeJitterMeasurement::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "EyeJitterSlice(%s, %s, %s)",
snprintf(hwname, sizeof(hwname), "EyePPJitter(%s, %s, %s)",
GetInputDisplayName(0).c_str(),
m_parameters[m_startname].ToString().c_str(),
m_parameters[m_endname].ToString().c_str());
@@ -88,7 +88,7 @@ void EyeJitterMeasurement::SetDefaultName()

string EyeJitterMeasurement::GetProtocolName()
{
return "Eye Jitter Slice";
return "Eye P-P Jitter";
}

bool EyeJitterMeasurement::IsOverlay()
4 changes: 2 additions & 2 deletions scopeprotocols/EyeWidthMeasurement.cpp
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ bool EyeWidthMeasurement::ValidateChannel(size_t i, StreamDescriptor stream)
void EyeWidthMeasurement::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "EyeWidthSlice(%s, %s, %s)",
snprintf(hwname, sizeof(hwname), "EyeWidth(%s, %s, %s)",
GetInputDisplayName(0).c_str(),
m_parameters[m_startname].ToString().c_str(),
m_parameters[m_endname].ToString().c_str());
@@ -88,7 +88,7 @@ void EyeWidthMeasurement::SetDefaultName()

string EyeWidthMeasurement::GetProtocolName()
{
return "Eye Width Slice";
return "Eye Width";
}

bool EyeWidthMeasurement::IsOverlay()