Skip to content

Commit 8139ea9

Browse files
owenduffyowenduffy
committed
Remove inconsistent units.
1 parent 256a6b2 commit 8139ea9

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

‎Graphs.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11747,7 +11747,7 @@ void __fastcall CGraphs::drawTDRLinear(const int graph, const int graph_type, co
1174711747
s = common.secsToStr(m_mouse.secs, false);
1174811748
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1174911749

11750-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
11750+
s.printf(L"%s", common.distToStr(dist, false).c_str());
1175111751
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1175211752
#else
1175311753
GLrgba back_col = colourToGLcolour(settings.m_colours.background);
@@ -11758,7 +11758,7 @@ void __fastcall CGraphs::drawTDRLinear(const int graph, const int graph_type, co
1175811758
s = common.secsToStr(m_mouse.secs, false);
1175911759
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1176011760

11761-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
11761+
s.printf(L"%s", common.distToStr(dist, false).c_str());
1176211762
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1176311763
#endif
1176411764
}
@@ -11797,7 +11797,7 @@ void __fastcall CGraphs::drawTDRLinear(const int graph, const int graph_type, co
1179711797
s[0].printf(L"index %d/%d, mem-%d", 1 + index, size, mem);
1179811798
s[1].printf( L"mag %#.4f", level);
1179911799
s[2].printf( L"time %s", common.secsToStr(secs).c_str());
11800-
s[3].printf( L"dist %s %#.3fft", common.distToStr(dist).c_str(), dist * (float)METERS_TO_FEET);
11800+
s[3].printf( L"dist %s", common.distToStr(dist).c_str());
1180111801
}
1180211802

1180311803
if (gamma > GAMMA_MIN)
@@ -11925,7 +11925,7 @@ void __fastcall CGraphs::drawTDRLinear(const int graph, const int graph_type, co
1192511925
s[0].printf(L"index %d/%d, mem-%d", 1 + p_index, size, mem);
1192611926
s[1].printf( L"mag %#.4f", level);
1192711927
s[2].printf( L"time %s", common.secsToStr(n * mem_max_time).c_str());
11928-
s[3].printf( L"dist %s %#.3fft", common.distToStr(n * mem_max_dist).c_str(), n * mem_max_dist * (float)METERS_TO_FEET);
11928+
s[3].printf( L"dist %s", common.distToStr(n * mem_max_dist).c_str());
1192911929
}
1193011930

1193111931
if (gamma > GAMMA_MIN)
@@ -12129,7 +12129,7 @@ void __fastcall CGraphs::drawTDRLog(const int graph, const int graph_type, const
1212912129
s = common.secsToStr(m_mouse.secs, false);
1213012130
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1213112131

12132-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
12132+
s.printf(L"%s", common.distToStr(dist, false).c_str());
1213312133
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1213412134
#else
1213512135
GLrgba back_col = colourToGLcolour(settings.m_colours.background);
@@ -12140,7 +12140,7 @@ void __fastcall CGraphs::drawTDRLog(const int graph, const int graph_type, const
1214012140
s = common.secsToStr(m_mouse.secs, false);
1214112141
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1214212142

12143-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
12143+
s.printf(L"%s", common.distToStr(dist, false).c_str());
1214412144
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1214512145
#endif
1214612146
}
@@ -12179,7 +12179,7 @@ void __fastcall CGraphs::drawTDRLog(const int graph, const int graph_type, const
1217912179
s[0].printf(L"index %d/%d, mem-%d", 1 + index, size, mem);
1218012180
s[1].printf(L"mag %#.3f dB", level);
1218112181
s[2].printf( L"time %s", common.secsToStr(secs).c_str());
12182-
s[3].printf( L"dist %s %#.3fft", common.distToStr(dist).c_str(), dist * (float)METERS_TO_FEET);
12182+
s[3].printf( L"dist %s", common.distToStr(dist).c_str());
1218312183
}
1218412184

1218512185
int x = gx + IROUND(gw * index * mem_max_time / (max_time * (size - 1)));
@@ -12289,7 +12289,7 @@ void __fastcall CGraphs::drawTDRLog(const int graph, const int graph_type, const
1228912289
s[0].printf(L"index %d/%d, mem-%d", 1 + p_index, size, mem);
1229012290
s[1].printf(L"mag %#.3f dB", level);
1229112291
s[2].printf(L"time %s", common.secsToStr(n * mem_max_time).c_str());
12292-
s[3].printf(L"dist %s %#.3fft", common.distToStr(n * mem_max_dist).c_str(), n * mem_max_dist * (float)METERS_TO_FEET);
12292+
s[3].printf(L"dist %s", common.distToStr(n * mem_max_dist).c_str());
1229312293
}
1229412294

1229512295
int x = gx + IROUND(p_index * time_scale);
@@ -12508,7 +12508,7 @@ void __fastcall CGraphs::drawTDRImpedance(const int graph, const int graph_type,
1250812508
s = common.secsToStr(m_mouse.secs, false);
1250912509
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1251012510

12511-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
12511+
s.printf(L"%s", common.distToStr(dist, false).c_str());
1251212512
m_graph_bm->Canvas->TextOut(mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1251312513
#else
1251412514
GLrgba back_col = colourToGLcolour(settings.m_colours.background);
@@ -12519,7 +12519,6 @@ void __fastcall CGraphs::drawTDRImpedance(const int graph, const int graph_type,
1251912519
s = common.secsToStr(m_mouse.secs, false);
1252012520
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy - 2 - (th * 2), s);
1252112521

12522-
s.printf(L"%s %#.3fft", common.distToStr(dist, false).c_str(), dist * (float)METERS_TO_FEET);
1252312522
glTextOut(0, mx - (m_graph_bm->Canvas->TextWidth(s) / 2), gy + gh + 3 + th, s);
1252412523
#endif
1252512524
}
@@ -12560,7 +12559,7 @@ void __fastcall CGraphs::drawTDRImpedance(const int graph, const int graph_type,
1256012559
// s[1] = "R jX " + common.valueToStr(imp.real(), false, true) + " " + ((imp.imag() >= 0) ? "+j" : "-j") + common.valueToStr(fabs(imp.imag()), false, true);
1256112560
s[1] = "Imp " + common.valueToStr(level, false, true);
1256212561
s[2].printf( L"time %s", common.secsToStr(secs).c_str());
12563-
s[3].printf( L"dist %s %#.3fft", common.distToStr(dist).c_str(), dist * (float)METERS_TO_FEET);
12562+
s[3].printf( L"dist %s", common.distToStr(dist).c_str());
1256412563
}
1256512564

1256612565
if (gamma > GAMMA_MIN)

0 commit comments

Comments
 (0)