gwm17/Specter
1
0
Fork 0
mirror of https://github.com/gwm17/Specter.git synced 2024-11-22 18:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Added in feature to zoom in on a specific plot with double click

Browse Source
This commit is contained in:
Gordon McCann 2022-01-13 17:29:43 -05:00
parent f91a3dce69
commit 74ae4818ab
2 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Navigator/src/Navigator/Editor/EditorLayer.cpp
View File

@ -7,6 +7,8 @@ namespace Navigator {
EditorLayer::EditorLayer(HistogramMap* hmap) : EditorLayer::EditorLayer(HistogramMap* hmap) :
Layer("EditorLayer"), m_histMap(hmap) Layer("EditorLayer"), m_histMap(hmap)
{ {
zoomFlag = false;
zoomed_gram = "";
} }
EditorLayer::~EditorLayer() {} EditorLayer::~EditorLayer() {}
@ -134,53 +136,73 @@ namespace Navigator {
static std::vector<std::string> s_selectedGrams; static std::vector<std::string> s_selectedGrams;
static int sizes[2] = { 1,1 }; static int sizes[2] = { 1,1 };
static int total = 1; static int total = 1;
ImGui::SliderInt2("Rows, Columns", sizes, 1, 3); if(zoomFlag && zoomed_gram != "")
total = sizes[0] * sizes[1];
s_selectedGrams.resize(total);
for (auto& gram : s_selectedGrams)
gram = paramList[0].name;
if (ImGui::BeginTable("Select Histograms", sizes[1]))
{ {
std::string label; if(ImPlot::BeginPlot(zoomed_gram.c_str(), ImVec2(-1,-1)))
int this_gram;
for (int i = 0; i < sizes[0]; i++)
{ {
ImGui::TableNextRow(); m_histMap->DrawHistogram(zoomed_gram);
for (int j = 0; j < sizes[1]; j++) if (ImPlot::IsPlotHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
{ {
ImGui::TableNextColumn(); NAV_INFO("We lost 'em, de-zoom and enhance!");
this_gram = i * sizes[1] + j; zoomFlag = false;
label = "Histogram" + std::to_string(this_gram); zoomed_gram = "";
if (ImGui::BeginCombo(label.c_str(), paramList[0].name.c_str())) }
ImPlot::EndPlot();
}
}
else
{
ImGui::SliderInt2("Rows, Columns", sizes, 1, 3);
total = sizes[0] * sizes[1];
s_selectedGrams.resize(total);
for (auto& gram : s_selectedGrams)
gram = paramList[0].name;
if (ImGui::BeginTable("Select Histograms", sizes[1]))
{
std::string label;
int this_gram;
for (int i = 0; i < sizes[0]; i++)
{
ImGui::TableNextRow();
for (int j = 0; j < sizes[1]; j++)
{ {
for (auto& params : paramList) ImGui::TableNextColumn();
if (ImGui::Selectable(params.name.c_str(), params.name == s_selectedGrams[this_gram])) this_gram = i * sizes[1] + j;
s_selectedGrams[this_gram] = params.name; label = "Histogram" + std::to_string(this_gram);
ImGui::EndCombo(); if (ImGui::BeginCombo(label.c_str(), paramList[0].name.c_str()))
{
for (auto& params : paramList)
if (ImGui::Selectable(params.name.c_str(), params.name == s_selectedGrams[this_gram]))
s_selectedGrams[this_gram] = params.name;
ImGui::EndCombo();
}
} }
} }
ImGui::EndTable();
} }
ImGui::EndTable();
} if (ImPlot::BeginSubplots("Histograms", sizes[0], sizes[1], ImVec2(-1, -1)))
if (ImPlot::BeginSubplots("Histograms", sizes[0], sizes[1], ImVec2(-1, -1)))
{
int i = 0;
for (auto& spec : s_selectedGrams)
{ {
if (ImPlot::BeginPlot(spec.c_str())) int i = 0;
for (auto& spec : s_selectedGrams)
{ {
m_histMap->DrawHistogram(spec); if (ImPlot::BeginPlot(spec.c_str()))
if (ImPlot::IsPlotHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
NAV_INFO("We got'em boys, they're in plot {0}", i); m_histMap->DrawHistogram(spec);
ImPlot::EndPlot(); if (ImPlot::IsPlotHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
{
NAV_INFO("We got'em boys, they're in plot {0}. Zoom and enhance!", i);
zoomFlag = true;
zoomed_gram = spec;
}
ImPlot::EndPlot();
}
i++;
} }
i++; ImPlot::EndSubplots();
} }
ImPlot::EndSubplots();
} }
} }
ImGui::End(); ImGui::End();
} }
@ -193,11 +215,11 @@ namespace Navigator {
if (ImGui::TreeNode(params.name.c_str())) if (ImGui::TreeNode(params.name.c_str()))
{ {
ImGui::BulletText("X Parameter: %s", params.x_par.c_str()); ImGui::BulletText("X Parameter: %s", params.x_par.c_str());
ImGui::BulletText("X Bins: %d X Min: %d X Max: %d", params.nbins_x, params.min_x, params.max_x); ImGui::BulletText("X Bins: %d X Min: %f X Max: %f", params.nbins_x, params.min_x, params.max_x);
if (params.y_par != "None") if (params.y_par != "None")
{ {
ImGui::BulletText("Y Parameter: %s", params.y_par.c_str()); ImGui::BulletText("Y Parameter: %s", params.y_par.c_str());
ImGui::BulletText("Y Bins: %d Y Min: %d Y Max: %d", params.nbins_y, params.min_y, params.max_y); ImGui::BulletText("Y Bins: %d Y Min: %f Y Max: %f", params.nbins_y, params.min_y, params.max_y);
} }
ImGui::TreePop(); ImGui::TreePop();

4
Navigator/src/Navigator/Editor/EditorLayer.h
View File

@ -21,6 +21,10 @@ namespace Navigator {
private: private:
HistogramMap* m_histMap; //Not owned by the EditorLayer!! HistogramMap* m_histMap; //Not owned by the EditorLayer!!
//temp
bool zoomFlag;
std::string zoomed_gram;
}; };
} }