Skip to content

Commit c7b35ec

Browse files
committed
A couple more compile fixes for Linux
1 parent f126bf3 commit c7b35ec

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

source/viewer/utilities/data_decimator.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Created by Sidney on 28/07/2020.
33
//
44

5+
#include <cmath>
56
#include "data_decimator.h"
67

78
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
2122
for(size_t i = 0; i < threshold - 2; ++ i)
2223
{
2324
// 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());
2627

2728
double average_x = 0.0;
2829
double average_y = 0.0;
@@ -38,8 +39,8 @@ std::vector<telemetry_data_point> decimate_data(const std::vector<telemetry_data
3839

3940

4041

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());
4344

4445
const double point_a_x = input[a].timestamp;
4546
const double point_a_y = input[a].value.get<double>();

source/viewer/widgets/chart_widget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void chart_widget::rescale_axes()
449449
case telemetry_unit::memory:
450450
min_value = scale_memory(axis->minimum);
451451
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)));
453453
break;
454454

455455
default:

source/viewer/widgets/document_window.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ void document_window::update_telemetry()
737737

738738
QTreeWidgetItem *item = new QTreeWidgetItem(root);
739739
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)));
741741
item->setText(2, path);
742742

743743
for (auto &child: event.get_children())

0 commit comments

Comments
 (0)