Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Viewer] Show X, Y, Z, and N graphs on the Accel/Gyro dashboard at one time #12732

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

[Viewer] Show X, Y, Z, and N graphs on the Accel/Gyro dashboard at one time #12732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2498579
dashboard shows all graphs at one time
Tamir91 Mar 5, 2024
1bfe1f0
revert value
Tamir91 Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/frame-drops-dashboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void frame_drops_dashboard::draw( ux_window & win, rect r )
auto hist = read_shared_data< std::deque< int > >( [&]() { return drops_history; } );
for( int i = 0; i < hist.size(); i++ )
{
add_point( (float)i, (float)hist[i] );
add_point_n_vector( (float)i, (float)hist[i] );
}
r.h -= ImGui::GetTextLineHeightWithSpacing() + 10;

Expand Down
34 changes: 18 additions & 16 deletions common/motion-dashboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,42 +61,44 @@ void motion_dashboard::process_frame( rs2::frame f )

void motion_dashboard::draw( ux_window & win, rect r )
{
if( plots[plot_index] == x_axes_name )
r.h -= ImGui::GetTextLineHeightWithSpacing() + 10;

if( show_x_graph )
{
auto x_hist = read_shared_data< std::deque< float > >( [&]() { return x_history; } );
for( int i = 0; i < x_hist.size(); i++ )
{
add_point( (float)i, x_hist[i] );
add_point_x_axis( (float)i, x_hist[i] );
}
}

if( plots[plot_index] == y_axes_name )
if( show_y_graph )
{
auto y_hist = read_shared_data< std::deque< float > >( [&]() { return y_history; } );
for( int i = 0; i < y_hist.size(); i++ )
{
add_point( (float)i, y_hist[i] );
add_point_y_axis( (float)i, y_hist[i] );
}
}

if( plots[plot_index] == z_axes_name )
if( show_z_graph )
{
auto z_hist = read_shared_data< std::deque< float > >( [&]() { return z_history; } );
for( int i = 0; i < z_hist.size(); i++ )
{
add_point( (float)i, z_hist[i] );
add_point_z_axis( (float)i, z_hist[i] );
}
}

if( plots[plot_index] == n_axes_name )
if( show_n_graph )
{
auto n_hist = read_shared_data< std::deque< float > >( [&]() { return n_history; } );
for( int i = 0; i < n_hist.size(); i++ )
{
add_point( (float)i, n_hist[i] );
add_point_n_vector( (float)i, n_hist[i] );
}
}
r.h -= ImGui::GetTextLineHeightWithSpacing() + 10;

draw_dashboard( win, r );

ImGui::SetCursorPosX( ImGui::GetCursorPosX() + ImGui::GetTextLineHeightWithSpacing() * 2 );
Expand Down Expand Up @@ -141,28 +143,28 @@ void motion_dashboard::clear( bool full )
void motion_dashboard::show_radiobuttons()
{
ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 1.0f, 0.0f, 0.0f, 1.0f ) ); // -> Red
ImGui::RadioButton( "X", &plot_index, 0 );
ImGui::Checkbox( x_axis_name, &show_x_graph );
if( ImGui::IsItemHovered() )
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << x_axes_name ).c_str() );
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << x_axis_name ).c_str() );
ImGui::PopStyleColor();
ImGui::SameLine();

ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 0.00f, 1.00f, 0.00f, 1.00f ) ); // -> Green
ImGui::RadioButton( "Y", &plot_index, 1 );
ImGui::Checkbox( y_axis_name, &show_y_graph );
if( ImGui::IsItemHovered() )
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << y_axes_name ).c_str() );
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << y_axis_name ).c_str() );
ImGui::PopStyleColor();
ImGui::SameLine();

ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 0.00f, 0.00f, 1.00f, 1.00f ) ); // -> Blue
ImGui::RadioButton( "Z", &plot_index, 2 );
ImGui::Checkbox( z_axis_name, &show_z_graph );
if( ImGui::IsItemHovered() )
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << z_axes_name ).c_str() );
ImGui::SetTooltip( "%s", std::string( rsutils::string::from() << "Show " << z_axis_name ).c_str() );
ImGui::PopStyleColor();
ImGui::SameLine();

ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 1.00f, 1.00f, 1.00f, 1.00f ) ); // -> White
ImGui::RadioButton( "N", &plot_index, 3 );
ImGui::Checkbox( n_vector_name, &show_n_graph );
if( ImGui::IsItemHovered() )
ImGui::SetTooltip( "%s", "Show Normal - sqrt(x^2 + y^2 + z^2)" );
ImGui::PopStyleColor();
Expand Down
18 changes: 11 additions & 7 deletions common/motion-dashboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,26 @@ namespace rs2
float dashboard_update_rate;
double last_time;

const char * x_axes_name = "X";
const char * y_axes_name = "Y";
const char * z_axes_name = "Z";
const char * n_axes_name = "N";

std::vector< std::string > plots = { x_axes_name, y_axes_name, z_axes_name, n_axes_name };
int plot_index = 0;
const char * x_axis_name = "X";
const char * y_axis_name = "Y";
const char * z_axis_name = "Z";
const char * n_vector_name = "N";

enum rs2_stream stream_type;
const float MIN_FRAME_RATE = 0.01f;
const float MAX_FRAME_RATE = 0.1f;

const int DEQUE_SIZE = 200;
std::deque< float > x_history;
bool show_x_graph = true;

std::deque< float > y_history;
bool show_y_graph = false;

std::deque< float > z_history;
bool show_z_graph = false;

std::deque< float > n_history;
bool show_n_graph = false;
};
}
161 changes: 137 additions & 24 deletions common/output-model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,22 +994,9 @@ void stream_dashboard::draw_dashboard(ux_window& win, rect& r)
auto min_x = 0.f;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

min/max can be members to support separating this to functions that can be overloaded

auto max_x = 1.f;
auto min_y = 0.f;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should check if ImGui functions needs the graph to be normalized to [0,1] range or can we work with actual values (removing divisions to normalize deque values)

auto max_y = 1.f;
auto max_y = 0.f;

if (xy.size())
{
min_x = xy[0].first;
max_x = xy[0].first;
min_y = xy[0].second;
max_y = xy[0].second;
for (auto&& p : xy)
{
min_x = std::min(min_x, p.first);
min_y = std::min(min_y, p.second);
max_x = std::max(max_x, p.first);
max_y = std::max(max_y, p.second);
}
}
set_dashboard_size( min_x, max_x, min_y, max_y );

auto gap_y = max_y - min_y;
auto gap_x = max_x - min_x;
Expand Down Expand Up @@ -1095,28 +1082,154 @@ void stream_dashboard::draw_dashboard(ux_window& win, rect& r)
{ pos.x + max_y_label_width + 15 + i * (graph_width / ticks_x), pos.y + ImGui::GetTextLineHeight() + 5 + height_y }, ImColor(light_grey));
}

std::sort(xy.begin(), xy.end(), [](const std::pair<float, float>& a, const std::pair<float, float>& b) { return a.first < b.first; });
std::sort(xy_x_axis.begin(), xy_x_axis.end(), [](const std::pair<float, float>& a, const std::pair<float, float>& b) { return a.first < b.first; });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have a function that takes a deque + color and plots in the dashboard. frame-drops-dashboard will call once, motion-dashboard will call for active axes.

std::sort(xy_y_axis.begin(), xy_y_axis.end(), [](const std::pair<float, float>& a, const std::pair<float, float>& b) { return a.first < b.first; });
std::sort(xy_z_axis.begin(), xy_z_axis.end(), [](const std::pair<float, float>& a, const std::pair<float, float>& b) { return a.first < b.first; });
std::sort(xy_n_vector.begin(), xy_n_vector.end(), [](const std::pair<float, float>& a, const std::pair<float, float>& b) { return a.first < b.first; });

for (int i = 0; i + 1 < xy.size(); i++)
for( auto i = 0; i + 1 < xy_x_axis.size(); i++ )
{
auto x0 = xy[i].first;
auto y0 = xy[i].second;
auto x0 = xy_x_axis[i].first;
auto y0 = xy_x_axis[i].second;

auto x1 = xy[i+1].first;
auto y1 = xy[i+1].second;
auto x1 = xy_x_axis[i + 1].first;
auto y1 = xy_x_axis[i + 1].second;

x0 = (x0 - min_x) / (max_x - min_x);
x1 = (x1 - min_x) / (max_x - min_x);

y0 = (y0 - min_y) / (max_y - min_y);
y1 = (y1 - min_y) / (max_y - min_y);

ImGui::GetWindowDrawList()->AddLine({ pos.x + 15 + max_y_label_width + x0 * graph_width, pos.y + ImGui::GetTextLineHeight() + 5 + height_y * (1.f - y0) },
{ pos.x + 15 + max_y_label_width + x1 * graph_width, pos.y + ImGui::GetTextLineHeight() + 5 + height_y * (1.f - y1) }, ImColor(black));
// Draw X graph line
ImGui::GetWindowDrawList()->AddLine( { pos.x + 15 + max_y_label_width + x0 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y0 ) },
{ pos.x + 15 + max_y_label_width + x1 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y1 ) },
ImColor( red ) );
}

for( int i = 0; i+1 < xy_y_axis.size(); i++ )
{
auto x0 = xy_y_axis[i].first;
auto y0 = xy_y_axis[i].second;

auto x1 = xy_y_axis[i + 1].first;
auto y1 = xy_y_axis[i + 1].second;

x0 = ( x0 - min_x ) / ( max_x - min_x );
x1 = ( x1 - min_x ) / ( max_x - min_x );

y0 = ( y0 - min_y ) / ( max_y - min_y );
y1 = ( y1 - min_y ) / ( max_y - min_y );

// Draw Y graph line
ImGui::GetWindowDrawList()->AddLine( { pos.x + 15 + max_y_label_width + x0 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y0 ) },
{ pos.x + 15 + max_y_label_width + x1 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y1 ) },
ImColor( green ) );
}

for( int i = 0; i + 1 < xy_z_axis.size(); i++ )
{
auto x0 = xy_z_axis[i].first;
auto y0 = xy_z_axis[i].second;

auto x1 = xy_z_axis[i + 1].first;
auto y1 = xy_z_axis[i + 1].second;

x0 = ( x0 - min_x ) / ( max_x - min_x );
x1 = ( x1 - min_x ) / ( max_x - min_x );

y0 = ( y0 - min_y ) / ( max_y - min_y );
y1 = ( y1 - min_y ) / ( max_y - min_y );

// Draw Z graph line
ImGui::GetWindowDrawList()->AddLine( { pos.x + 15 + max_y_label_width + x0 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y0 ) },
{ pos.x + 15 + max_y_label_width + x1 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y1 ) },
ImColor( light_blue ) );
}

for( int i = 0; i + 1 < xy_n_vector.size(); i++ )
{
auto x0 = xy_n_vector[i].first;
auto y0 = xy_n_vector[i].second;

auto x1 = xy_n_vector[i + 1].first;
auto y1 = xy_n_vector[i + 1].second;

x0 = ( x0 - min_x ) / ( max_x - min_x );
x1 = ( x1 - min_x ) / ( max_x - min_x );

y0 = ( y0 - min_y ) / ( max_y - min_y );
y1 = ( y1 - min_y ) / ( max_y - min_y );

// Draw N vector line
ImGui::GetWindowDrawList()->AddLine( { pos.x + 15 + max_y_label_width + x0 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y0 ) },
{ pos.x + 15 + max_y_label_width + x1 * graph_width,
pos.y + ImGui::GetTextLineHeight() + 5 + height_y * ( 1.f - y1 ) },
ImColor( black ) );
}
//ImGui::PopFont();
ImGui::PopStyleColor();

xy.clear();
xy_x_axis.clear();
xy_y_axis.clear();
xy_z_axis.clear();
xy_n_vector.clear();
}

void stream_dashboard::set_dashboard_size( float& min_x, float& max_x, float& min_y, float& max_y )
{
if( xy_x_axis.size() )
{
for( auto && p : xy_x_axis )
{
min_x = std::min( min_x, p.first );
min_y = std::min( min_y, p.second );
max_x = std::max( max_x, p.first );
max_y = std::max( max_y, p.second );
}
}

if( xy_y_axis.size() )
{
for( auto && p : xy_y_axis )
{
min_x = std::min( min_x, p.first );
min_y = std::min( min_y, p.second );
max_x = std::max( max_x, p.first );
max_y = std::max( max_y, p.second );
}
}

if( xy_z_axis.size() )
{
for( auto && p : xy_z_axis )
{
min_x = std::min( min_x, p.first );
min_y = std::min( min_y, p.second );
max_x = std::max( max_x, p.first );
max_y = std::max( max_y, p.second );
}
}

if( xy_n_vector.size() )
{
for( auto && p : xy_n_vector )
{
min_x = std::min( min_x, p.first );
min_y = std::min( min_y, p.second );
max_x = std::max( max_x, p.first );
max_y = std::max( max_y, p.second );
}
}

// Increase dashboard size (white area) from top and bottom to prevent a graph from being so close to borders.
min_y -= .5f;
max_y += .5f;
}
14 changes: 12 additions & 2 deletions common/output-model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,15 @@ namespace rs2
return res;
}

void add_point(float x, float y) { xy.push_back(std::make_pair(x, y)); }
void add_point_x_axis( float x, float y ) { xy_x_axis.push_back( std::make_pair( x, y ) ); }
void add_point_y_axis( float x, float y ) { xy_y_axis.push_back( std::make_pair( x, y ) ); }
void add_point_z_axis( float x, float y ) { xy_z_axis.push_back( std::make_pair( x, y ) ); }
void add_point_n_vector( float x, float y ) { xy_n_vector.push_back( std::make_pair( x, y ) ); }

void draw_dashboard(ux_window& win, rect& r);

// Scanning all axes data structures and found optimal dashboard size to show them.
void set_dashboard_size( float & min_x, float & max_x, float & min_y, float & max_y );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be a virtual function. motion-dashboard class shuould override and calculate based on active axes

private:
void thread_function()
{
Expand All @@ -83,7 +88,12 @@ namespace rs2
std::mutex m;
std::atomic<int> stop { false };
std::thread t;
std::deque<std::pair<float, float>> xy;

std::deque< std::pair< float, float > > xy_x_axis;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Multiple axes members should be in the motion-dashboard class

std::deque< std::pair< float, float > > xy_y_axis;
std::deque< std::pair< float, float > > xy_z_axis;
std::deque< std::pair< float, float > > xy_n_vector;

bool to_close = false;
};

Expand Down
Loading