Skip to content

Legend Position Manual Adjust #692

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

Open
Sajeeth-Wimalasuriyan wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Legend Position Manual Adjust #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 52 additions & 22 deletions src/view/src/compute/rocprofvis_compute_roofline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ Roofline::Roofline(DataProvider& data_provider)
, m_settings(SettingsManager::GetInstance())
, m_show_menus(true)
, m_menus_mode(Legend)
, m_menus_position(TopRight)
, m_scale_intensity(true)
, m_hovered_item_distance(FLT_MAX)
, m_menus_height(0.0f)
, m_plot_left_x(0.0f)
, m_workload_changed(false)
, m_kernel_changed(false)
, m_options_changed(false)
Expand Down Expand Up @@ -345,6 +348,8 @@ Roofline::Render()
ImPlot::PushStyleColor(ImPlotCol_FrameBg,
m_settings.GetColor(Colors::kTransparent));
ImPlot::PushColormap("flame");
float screen_to_local_x =
ImGui::GetCursorScreenPos().x - ImGui::GetCursorPos().x;
if(ImPlot::BeginPlot("plot", ImVec2(-1, -1),
ImPlotFlags_NoTitle | ImPlotFlags_NoFrame |
ImPlotFlags_NoLegend | ImPlotFlags_NoMenus |
Expand Down Expand Up @@ -533,6 +538,8 @@ Roofline::Render()
ImGui::PopID();
}
}
m_plot_left_x =
ImPlot::GetPlotPos().x - screen_to_local_x;
ImPlot::EndPlot();
}
bool menus_item_hovered = false;
Expand Down Expand Up @@ -567,42 +574,64 @@ void
Roofline::RenderMenus(const ImVec2 region, const ImGuiStyle& style,
const ImPlotStyle& plot_style, bool& item_hovered)
{
ImVec2 window_pos = ImVec2(0.75f * region.x - 2 * plot_style.PlotPadding.x,
ImGui::GetFontSize() + plot_style.PlotBorderSize +
3 * plot_style.PlotPadding.y);
ImVec2 button_pos =
m_show_menus ? window_pos - ImVec2(ImGui::GetFrameHeightWithSpacing(), 0.0f)
: ImVec2(region.x - 2 * plot_style.PlotPadding.x -
ImGui::GetFrameHeightWithSpacing(),
ImGui::GetFontSize() + plot_style.PlotBorderSize +
3 * plot_style.PlotPadding.y);
bool is_right = (m_menus_position == TopRight || m_menus_position == BottomRight);
bool is_bottom = (m_menus_position == BottomLeft || m_menus_position == BottomRight);
float menus_width = region.x * 0.25f;
float frame_h = ImGui::GetFrameHeightWithSpacing();
float top_y = ImGui::GetFontSize() + plot_style.PlotBorderSize +
3 * plot_style.PlotPadding.y;
float max_menus_height = region.y - top_y - 3 * ImGui::GetFontSize() -
5 * plot_style.PlotPadding.y - plot_style.PlotBorderSize;
float bottom_y = top_y + max_menus_height;
float menus_h = m_menus_height > 0.0f ? m_menus_height : max_menus_height;
float base_y = is_bottom ? std::max(top_y, bottom_y - menus_h) : top_y;

ImVec2 window_pos;
ImVec2 button_pos;
ImGuiDir arrow_dir;
if(is_right)
{
window_pos.x = 0.75f * region.x - 2 * plot_style.PlotPadding.x;
button_pos.x = m_show_menus ? window_pos.x - frame_h
: region.x - 2 * plot_style.PlotPadding.x - frame_h;
arrow_dir = m_show_menus ? ImGuiDir_Right : ImGuiDir_Left;
}
else
{
float left_x = m_plot_left_x + plot_style.PlotPadding.x;
window_pos.x = left_x;
button_pos.x = m_show_menus ? left_x + menus_width : left_x;
arrow_dir = m_show_menus ? ImGuiDir_Left : ImGuiDir_Right;
}
window_pos.y = base_y;
button_pos.y = base_y;

ImGui::SetCursorPos(button_pos);
if(ImGui::ArrowButton("toggle_menus", m_show_menus ? ImGuiDir_Right : ImGuiDir_Left))
if(ImGui::ArrowButton("toggle_menus", arrow_dir))
{
m_show_menus = !m_show_menus;
}
if(m_show_menus)
{
ImGui::SetCursorPos(button_pos +
ImVec2(0.0f, ImGui::GetFrameHeightWithSpacing()));
ImGui::SetCursorPos(button_pos + ImVec2(0.0f, frame_h));
ImGui::PushFont(m_settings.GetFontManager().GetIconFont(FontType::kDefault));
if(ImGui::Button(m_menus_mode == Legend ? ICON_GEAR : ICON_LIST))
{
if(m_menus_mode == Legend)
{
m_menus_mode = Options;
}
else
m_menus_mode = (m_menus_mode == Legend) ? Options : Legend;
}
ImGui::SetCursorPos(button_pos + ImVec2(0.0f, 2 * frame_h));
if(ImGui::Button(ICON_ARROW_MOVE))
{
switch(m_menus_position)
{
m_menus_mode = Legend;
case TopRight: m_menus_position = TopLeft; break;
case TopLeft: m_menus_position = BottomLeft; break;
case BottomLeft: m_menus_position = BottomRight; break;
case BottomRight: m_menus_position = TopRight; break;
}
}
ImGui::PopFont();
ImGui::SetCursorPos(window_pos);
float menus_width = region.x * 0.25f;
float max_menus_height = ImGui::GetContentRegionAvail().y -
3 * ImGui::GetFontSize() - 5 * plot_style.PlotPadding.y -
plot_style.PlotBorderSize;
ImGui::SetNextWindowSizeConstraints(
ImVec2(menus_width, ImGui::GetFrameHeightWithSpacing() * 2.0f),
ImVec2(menus_width, max_menus_height));
Expand Down Expand Up @@ -756,6 +785,7 @@ Roofline::RenderMenus(const ImVec2 region, const ImGuiStyle& style,
ImGui::GetContentRegionAvail().x, region.x * 0.5f, true);
}
ImGui::EndChild();
m_menus_height = ImGui::GetItemRectSize().y;
ImGui::PopStyleColor();
ImGui::PopStyleVar();
ImGui::SetItemKeyOwner(ImGuiKey_MouseWheelX);
Expand Down
16 changes: 13 additions & 3 deletions src/view/src/compute/rocprofvis_compute_roofline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ class Roofline : public RocWidget
Legend,
Options
};
enum MenusPosition
{
TopRight,
TopLeft,
BottomLeft,
BottomRight
};
struct ItemModel
{
enum Type
Expand Down Expand Up @@ -92,9 +99,10 @@ class Roofline : public RocWidget
std::vector<PresetModel> m_presets;

// User options...
bool m_show_menus;
MenusMode m_menus_mode;
bool m_scale_intensity;
bool m_show_menus;
MenusMode m_menus_mode;
MenusPosition m_menus_position;
bool m_scale_intensity;

// Internal state...
bool m_workload_changed;
Expand All @@ -106,6 +114,8 @@ class Roofline : public RocWidget
bool m_options_changed;
std::optional<size_t> m_hovered_item_idx;
float m_hovered_item_distance;
float m_menus_height;
float m_plot_left_x;

DataProvider& m_data_provider;
SettingsManager& m_settings;
Expand Down
2 changes: 2 additions & 0 deletions src/view/src/icons/rocprovfis_icon_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ constexpr ImWchar icon_ranges[] = {
0xF13D, 0xF13D,
0xF1FE, 0xF1FE,
0xF218, 0xF218,
0xF263, 0xF263,
0xF267, 0xF267,
0xF273, 0xF273,
0xF2B5, 0xF2B5,
Expand All @@ -32,6 +33,7 @@ constexpr const char* ICON_EYE = u8"\uF133";
constexpr const char* ICON_GEAR = u8"\uF13D";
constexpr const char* ICON_CHAIN = u8"\uF1FE";
constexpr const char* ICON_ADD_NOTE = u8"\uF218";
constexpr const char* ICON_ARROW_MOVE = u8"\uF263";
constexpr const char* ICON_ARROWS_SHRINK = u8"\uF267";
constexpr const char* ICON_COMPASS = u8"\uF273";
constexpr const char* ICON_CHART_BAR = u8"\uF2B5";
Expand Down