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

Commits on Feb 23, 2020

  1. Unit: fixed incorrect pretty-printing of gigascale values. Fixes #55.

    @azonenberg
    azonenberg committed Feb 23, 2020
    Copy the full SHA
    b2f97f3 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 scopehal/Unit.cpp
4 changes: 2 additions & 2 deletions scopehal/Unit.cpp
View file
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@ string Unit::PrettyPrint(double value)
double value_rescaled = value;

//Default scaling and prefixes for SI base units
if(fabs(value) > 1e9)
if(fabs(value) > 1e9f)
{
value_rescaled /= 1e9;
scale = "G";
}
if(fabs(value) > 1e6)
else if(fabs(value) > 1e6)
{
value_rescaled /= 1e6;
scale = "M";