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: 783e9bfa95a5
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a28661e5ad2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 13, 2020

  1. ProtocolDecoder: allow use of SI units when scaling parameters

    @azonenberg
    azonenberg committed Feb 13, 2020
    Copy the full SHA
    0a28661 View commit details
Showing with 37 additions and 2 deletions.
  1. +37 −2 scopehal/ProtocolDecoder.cpp
39 changes: 37 additions & 2 deletions scopehal/ProtocolDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -52,6 +52,23 @@ ProtocolDecoderParameter::ProtocolDecoderParameter(ParameterTypes type)

void ProtocolDecoderParameter::ParseString(string str)
{
//Look up the last character of the string and see if there's a SI scaling factor
float scale = 1;
if(str != "")
{
char suffix = str[str.size()-1];
if(suffix == 'G')
scale = 1000000000.0f;
else if(suffix == 'M')
scale = 1000000.0f;
else if(suffix == 'K')
scale = 1000.0f;
else if(suffix == 'm')
scale = 0.001f;
else if(suffix == 'u') //TODO: handle μ
scale = 0.000001f;
}

switch(m_type)
{
case TYPE_BOOL:
@@ -78,6 +95,9 @@ void ProtocolDecoderParameter::ParseString(string str)
m_filename = str;
break;
}

m_intval *= scale;
m_floatval *= scale;
}

string ProtocolDecoderParameter::ToString()
@@ -86,11 +106,26 @@ string ProtocolDecoderParameter::ToString()
switch(m_type)
{
case TYPE_FLOAT:
snprintf(str_out, sizeof(str_out), "%f", m_floatval);
if(fabs(m_floatval) > 1000000000.0f)
snprintf(str_out, sizeof(str_out), "%f G", m_floatval / 1000000000.0f);
else if(fabs(m_floatval) > 1000000.0f)
snprintf(str_out, sizeof(str_out), "%f M", m_floatval / 1000000.0f);
else if(fabs(m_floatval) > 1000.0f)
snprintf(str_out, sizeof(str_out), "%f k", m_floatval / 1000.0f);
else
snprintf(str_out, sizeof(str_out), "%f", m_floatval);
break;
case TYPE_BOOL:
case TYPE_INT:
snprintf(str_out, sizeof(str_out), "%d", m_intval);
if(fabs(m_intval) > 1000000000.0f)
snprintf(str_out, sizeof(str_out), "%f G", m_intval / 1000000000.0f);
else if(fabs(m_intval) > 1000000.0f)
snprintf(str_out, sizeof(str_out), "%f M", m_intval / 1000000.0f);
else if(fabs(m_intval) > 1000.0f)
snprintf(str_out, sizeof(str_out), "%f k", m_intval / 1000.0f);
else
snprintf(str_out, sizeof(str_out), "%d", m_intval);
break;
break;
case TYPE_FILENAME:
return m_filename;