diff --git a/glass/src/lib/native/cpp/other/Plot.cpp b/glass/src/lib/native/cpp/other/Plot.cpp index 5514f74ec8..5e9495093d 100644 --- a/glass/src/lib/native/cpp/other/Plot.cpp +++ b/glass/src/lib/native/cpp/other/Plot.cpp @@ -119,7 +119,7 @@ class Plot { std::string m_name; bool m_visible = true; bool m_showPause = true; - unsigned int m_plotFlags = ImPlotFlags_Default; + unsigned int m_plotFlags = ImPlotFlags_None; bool m_lockPrevX = false; bool m_paused = false; float m_viewTime = 10; @@ -348,13 +348,13 @@ PlotSeries::Action PlotSeries::EmitPlot(PlotView& view, double now, size_t i, if (IsDigital()) { ImPlot::PushStyleVar(ImPlotStyleVar_DigitalBitHeight, m_digitalBitHeight); ImPlot::PushStyleVar(ImPlotStyleVar_DigitalBitGap, m_digitalBitGap); - ImPlot::PlotDigital(label, getter, &getterData, size + 1); + ImPlot::PlotDigitalG(label, getter, &getterData, size + 1); ImPlot::PopStyleVar(); ImPlot::PopStyleVar(); } else { ImPlot::SetPlotYAxis(m_yAxis); ImPlot::SetNextMarkerStyle(m_marker - 1); - ImPlot::PlotLine(label, getter, &getterData, size + 1); + ImPlot::PlotLineG(label, getter, &getterData, size + 1); } // DND source for PlotSeries @@ -492,9 +492,9 @@ bool Plot::ReadIni(wpi::StringRef name, wpi::StringRef value) { return true; } if (num == 0) { - m_plotFlags &= ~ImPlotFlags_Legend; + m_plotFlags |= ImPlotFlags_NoLegend; } else { - m_plotFlags |= ImPlotFlags_Legend; + m_plotFlags &= ~ImPlotFlags_NoLegend; } return true; } else if (name == "yaxis2") { @@ -580,7 +580,7 @@ void Plot::WriteIni(ImGuiTextBuffer* out) { "name=%s\nvisible=%d\nshowPause=%d\nlockPrevX=%d\nlegend=%d\n" "yaxis2=%d\nyaxis3=%d\nviewTime=%d\nheight=%d\n", m_name.c_str(), m_visible ? 1 : 0, m_showPause ? 1 : 0, - m_lockPrevX ? 1 : 0, (m_plotFlags & ImPlotFlags_Legend) ? 1 : 0, + m_lockPrevX ? 1 : 0, (m_plotFlags & ImPlotFlags_NoLegend) ? 0 : 1, (m_plotFlags & ImPlotFlags_YAxis2) ? 1 : 0, (m_plotFlags & ImPlotFlags_YAxis3) ? 1 : 0, static_cast(m_viewTime * 1000), m_height); @@ -658,9 +658,9 @@ void Plot::EmitPlot(PlotView& view, double now, bool paused, size_t i) { (paused || m_paused) ? ImGuiCond_Once : ImGuiCond_Always); } - ImPlotAxisFlags yFlags[3] = {ImPlotAxisFlags_Default, - ImPlotAxisFlags_Auxiliary, - ImPlotAxisFlags_Auxiliary}; + ImPlotAxisFlags yFlags[3] = {ImPlotAxisFlags_None, + ImPlotAxisFlags_NoGridLines, + ImPlotAxisFlags_NoGridLines}; for (int i = 0; i < 3; ++i) { ImPlot::SetNextPlotLimitsY( m_axisRange[i].min, m_axisRange[i].max, @@ -675,8 +675,8 @@ void Plot::EmitPlot(PlotView& view, double now, bool paused, size_t i) { } if (ImPlot::BeginPlot(label, nullptr, nullptr, ImVec2(-1, m_height), - m_plotFlags, ImPlotAxisFlags_Default, yFlags[0], - yFlags[1], yFlags[2])) { + m_plotFlags, ImPlotAxisFlags_None, yFlags[0], yFlags[1], + yFlags[2])) { for (size_t j = 0; j < m_series.size(); ++j) { ImGui::PushID(j); switch (m_series[j]->EmitPlot(view, now, j, i)) { @@ -733,7 +733,7 @@ void Plot::EmitSettings(size_t i) { ImGui::InputText("##editname", &m_name); ImGui::Checkbox("Visible", &m_visible); ImGui::Checkbox("Show Pause Button", &m_showPause); - ImGui::CheckboxFlags("Show Legend", &m_plotFlags, ImPlotFlags_Legend); + ImGui::CheckboxFlags("Hide Legend", &m_plotFlags, ImPlotFlags_NoLegend); if (i != 0) { ImGui::Checkbox("Lock X-axis to previous plot", &m_lockPrevX); } diff --git a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp index af9b0ca24b..2af6e5e9b0 100644 --- a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp +++ b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp @@ -160,7 +160,7 @@ bool DeleteButton(ImGuiID id, const ImVec2& pos) { bool HeaderDeleteButton(const char* label) { ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiContext& g = *GImGui; - ImGuiItemHoveredDataBackup last_item_backup; + ImGuiLastItemDataBackup last_item_backup; ImGuiID id = window->GetID(label); float button_size = g.FontSize; float button_x = ImMax(window->DC.LastItemRect.Min.x, diff --git a/imgui/CMakeLists.txt.in b/imgui/CMakeLists.txt.in index 998837d33d..0016ae6f40 100644 --- a/imgui/CMakeLists.txt.in +++ b/imgui/CMakeLists.txt.in @@ -5,7 +5,7 @@ project(imgui-download NONE) include(ExternalProject) ExternalProject_Add(glfw3 GIT_REPOSITORY https://github.com/glfw/glfw.git - GIT_TAG 63af05c41961c238c2f891e2c923e1b89c1271b6 + GIT_TAG 2a5ac9a6d6cbe9f4113c0f17158cb13ab7f263bf SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/glfw-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/glfw-build" CONFIGURE_COMMAND "" @@ -23,7 +23,7 @@ ExternalProject_Add(gl3w ) ExternalProject_Add(imgui GIT_REPOSITORY https://github.com/ocornut/imgui.git - GIT_TAG v1.76 + GIT_TAG v1.79 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/imgui-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/imgui-build" CONFIGURE_COMMAND "" @@ -33,7 +33,7 @@ ExternalProject_Add(imgui ) ExternalProject_Add(implot GIT_REPOSITORY https://github.com/epezent/implot.git - GIT_TAG 90693cca1bd0ca5f0d49bc9cb8187d56b0b8f289 + GIT_TAG a6bab98517b1baa3116db52518dda1eb2d7eaab7 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/implot-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/implot-build" CONFIGURE_COMMAND "" diff --git a/shared/config.gradle b/shared/config.gradle index 796cfe64e7..f71aa8de06 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -11,7 +11,7 @@ nativeUtils { niLibVersion = "2020.10.1" opencvVersion = "3.4.7-5" googleTestVersion = "1.9.0-5-437e100-1" - imguiVersion = "1.76-10" + imguiVersion = "1.79-1" wpimathVersion = "-1" } }