Skip to content

Commit fd78b47

Browse files
committed
attributes and new IMU viewwer
1 parent 616e267 commit fd78b47

6 files changed

Lines changed: 11 additions & 3 deletions

File tree

api/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ target_sources(dsr_api
4949
dsr_camera_api.cpp
5050
dsr_agent_info_api.cpp
5151
dsr_inner_eigen_api.cpp
52+
dsr_inner_gaussian_api.cpp
5253
dsr_rt_api.cpp
5354
dsr_utils.cpp
5455
dsr_signal_emitter.cpp

api/include/dsr/api/dsr_api.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "dsr/core/traits.h"
2727
#include "dsr/api/dsr_agent_info_api.h"
2828
#include "dsr/api/dsr_inner_eigen_api.h"
29+
#include "dsr/api/dsr_inner_gaussian_api.h"
2930
#include "dsr/api/dsr_camera_api.h"
3031
#include "dsr/api/dsr_rt_api.h"
3132
#include "dsr/api/dsr_utils.h"
@@ -80,6 +81,7 @@ namespace DSR
8081
std::map<uint64_t, Node> getCopy() const;
8182

8283
std::unique_ptr<InnerEigenAPI> get_inner_eigen_api() { return std::make_unique<InnerEigenAPI>(this); };
84+
std::unique_ptr<InnerGaussianAPI> get_inner_gaussian_api() { return std::make_unique<InnerGaussianAPI>(this); };
8385
std::unique_ptr<RT_API> get_rt_api() { return std::make_unique<RT_API>(this); };
8486
std::unique_ptr<CameraAPI> get_camera_api(const DSR::Node &camera_node) { return std::make_unique<CameraAPI>(this, camera_node); };
8587

core/include/dsr/core/types/type_checking/dsr_attr_name.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ REGISTER_TYPE(imu_id, int, false)
406406
REGISTER_TYPE(imu_accelerometer, std::reference_wrapper<const std::vector<float>>, false)
407407
REGISTER_TYPE(imu_gyroscope, std::reference_wrapper<const std::vector<float>>, false)
408408
REGISTER_TYPE(imu_compass, float, false)
409-
REGISTER_TYPE(imu_time_stamp, float, false)
410-
REGISTER_TYPE(imu_sensor_tick, float, false)
409+
REGISTER_TYPE(imu_time_stamp, uint64_t, false)
410+
REGISTER_TYPE(imu_sensor_tick, uint64_t, false)
411411

412412
REGISTER_TYPE(imu_linear_pose, std::reference_wrapper<const std::vector<float>>, false)
413413
REGISTER_TYPE(imu_angular_euler_xyz_pose, std::reference_wrapper<const std::vector<float>>, false)

gui/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ set(headers_to_moc
6060
include/dsr/gui/viewers/graph_viewer/graph_edge.h
6161
include/dsr/gui/viewers/graph_viewer/graph_edge_widget.h
6262
include/dsr/gui/viewers/graph_viewer/graph_edge_rt_widget.h
63+
include/dsr/gui/viewers/graph_viewer/graph_node_imu_widget.h
6364
include/dsr/gui/viewers/graph_viewer/graph_node_laser_widget.h
6465
include/dsr/gui/viewers/graph_viewer/graph_node_rgbd_widget.h
6566
include/dsr/gui/viewers/graph_viewer/graph_node_person_widget.h

gui/viewers/graph_viewer/graph_node.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <dsr/gui/viewers/graph_viewer/graph_node.h>
1818
//#include <dsr/gui/viewers/graph_viewer/node_colors.h>
1919
#include <dsr/gui/viewers/graph_viewer/graph_colors.h>
20+
#include <dsr/gui/viewers/graph_viewer/graph_node_imu_widget.h>
2021
#include <dsr/gui/viewers/graph_viewer/graph_node_laser_widget.h>
2122
#include <dsr/gui/viewers/graph_viewer/graph_node_widget.h>
2223
#include <dsr/gui/viewers/graph_viewer/graph_node_rgbd_widget.h>
@@ -62,7 +63,7 @@ void GraphNode::setTag(const std::string &tag_)
6263
void GraphNode::setType(const std::string &type_)
6364
{
6465
type = type_;
65-
if(type == "laser" or type == "rgbd" or type == "person")
66+
if(type == "laser" or type == "rgbd" or type == "person" or type == "imu")
6667
{
6768
QAction *stuff_action = new QAction("View data");
6869
contextMenu->addAction(stuff_action);
@@ -256,6 +257,8 @@ void GraphNode::show_node_widget(const std::string &show_type)
256257
node_widget = std::make_unique<GraphNodeRGBDWidget>(graph, id_in_graph);
257258
else if(show_type=="person")
258259
node_widget = std::make_unique<GraphNodePersonWidget>(graph, id_in_graph);
260+
else if(show_type=="imu")
261+
node_widget = std::make_unique<GraphNodeIMUWidget>(graph, id_in_graph);
259262
else
260263
node_widget = std::make_unique<GraphNodeWidget>(graph, id_in_graph);
261264

tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ add_executable(tests test.cpp
3030
graph/graph_operations.cpp
3131
graph/attribute_operations.cpp
3232
graph/convenience_operations.cpp
33+
graph/inner_gaussian.cpp
3334
graph/rt_timestamp.cpp
3435
crdt/crdt_operations.cpp
3536
synchronization/graph_synchronization.cpp

0 commit comments

Comments
 (0)