File tree 3 files changed +7
-6
lines changed 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 2
2
// Created by Sidney on 28/07/2020.
3
3
//
4
4
5
+ #include < cmath>
5
6
#include " data_decimator.h"
6
7
7
8
std::vector<telemetry_data_point> decimate_data (const std::vector<telemetry_data_point> &input, uint32_t threshold)
@@ -21,8 +22,8 @@ std::vector<telemetry_data_point> decimate_data(const std::vector<telemetry_data
21
22
for (size_t i = 0 ; i < threshold - 2 ; ++ i)
22
23
{
23
24
// Calculate the average
24
- size_t range_start = floor ((i + 1 ) * increment) + 1 ;
25
- size_t range_end = std::min ((size_t )(floor ((i + 2 ) * increment) + 1 ), input.size ());
25
+ size_t range_start = std:: floor ((i + 1 ) * increment) + 1 ;
26
+ size_t range_end = std::min ((size_t )(std:: floor ((i + 2 ) * increment) + 1 ), input.size ());
26
27
27
28
double average_x = 0.0 ;
28
29
double average_y = 0.0 ;
@@ -38,8 +39,8 @@ std::vector<telemetry_data_point> decimate_data(const std::vector<telemetry_data
38
39
39
40
40
41
41
- range_start = floor ((i + 0 ) * increment) + 1 ;
42
- range_end = std::min ((size_t )(floor ((i + 1 ) * increment) + 1 ), input.size ());
42
+ range_start = std:: floor ((i + 0 ) * increment) + 1 ;
43
+ range_end = std::min ((size_t )(std:: floor ((i + 1 ) * increment) + 1 ), input.size ());
43
44
44
45
const double point_a_x = input[a].timestamp ;
45
46
const double point_a_y = input[a].value .get <double >();
Original file line number Diff line number Diff line change @@ -449,7 +449,7 @@ void chart_widget::rescale_axes()
449
449
case telemetry_unit::memory:
450
450
min_value = scale_memory (axis->minimum );
451
451
max_value = scale_memory (axis->maximum );
452
- max_value = 1 << uint32_t (ceil (log2 (max_value)));
452
+ max_value = 1 << uint32_t (std:: ceil (std:: log2 (max_value)));
453
453
break ;
454
454
455
455
default :
Original file line number Diff line number Diff line change @@ -737,7 +737,7 @@ void document_window::update_telemetry()
737
737
738
738
QTreeWidgetItem *item = new QTreeWidgetItem (root);
739
739
item->setText (0 , QString::number (event.get_id ()));
740
- item->setText (1 , QString::number (ceilf (event.get_duration () * 1000 .0f )));
740
+ item->setText (1 , QString::number (std::ceil (event.get_duration () * 1000 .0f )));
741
741
item->setText (2 , path);
742
742
743
743
for (auto &child: event.get_children ())
You can’t perform that action at this time.
0 commit comments