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

Commits on Oct 21, 2020

  1. Copy the full SHA
    27a5639 View commit details
Showing with 6 additions and 1 deletion.
  1. +2 −1 scopehal/FilterParameter.cpp
  2. +3 −0 scopehal/FilterParameter.h
  3. +1 −0 scopeprotocols/EthernetProtocolDecoder.cpp
3 changes: 2 additions & 1 deletion scopehal/FilterParameter.cpp
Original file line number Diff line number Diff line change
@@ -42,7 +42,8 @@ using namespace std;
// FilterParameter

FilterParameter::FilterParameter(ParameterTypes type, Unit unit)
: m_type(type)
: m_fileIsOutput(false)
, m_type(type)
, m_unit(unit)
, m_intval(0)
, m_floatval(0)
3 changes: 3 additions & 0 deletions scopehal/FilterParameter.h
Original file line number Diff line number Diff line change
@@ -77,6 +77,9 @@ class FilterParameter
std::string m_fileFilterMask;
std::string m_fileFilterName;

//Specifies TYPE_FILENAME is an output
bool m_fileIsOutput;

//Add an enumerated value
void AddEnumValue(const std::string& name, int value)
{
1 change: 1 addition & 0 deletions scopeprotocols/EthernetProtocolDecoder.cpp
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ EthernetProtocolDecoder::EthernetProtocolDecoder(const string& color)
m_parameters[m_outfile] = FilterParameter(FilterParameter::TYPE_FILENAME, Unit(Unit::UNIT_COUNTS));
m_parameters[m_outfile].m_fileFilterMask = "*.pcap";
m_parameters[m_outfile].m_fileFilterName = "PCAP files (*.pcap)";
m_parameters[m_outfile].m_fileIsOutput = true;

m_fpOut = NULL;
}