Improve UX of tables of Vec

SofaImGui/CMakeLists.txt

@@ -109,6 +109,7 @@ set(HEADER_FILES
     ${SOFAIMGUI_SOURCE_DIR}/widgets/MaterialWidget.h
     ${SOFAIMGUI_SOURCE_DIR}/widgets/RigidMass.h
     ${SOFAIMGUI_SOURCE_DIR}/widgets/ScalarWidget.h
+    ${SOFAIMGUI_SOURCE_DIR}/widgets/VecVectorWidget.h
     ${SOFAIMGUI_SOURCE_DIR}/windows/Performances.h
     ${SOFAIMGUI_SOURCE_DIR}/windows/Log.h
     ${SOFAIMGUI_SOURCE_DIR}/windows/MouseManager.h

SofaImGui/src/SofaImGui/ImGuiDataWidget.cpp

@@ -31,6 +31,7 @@
 #include <SofaImGui/widgets/LinearSpringWidget.h>
 #include <SofaImGui/widgets/MaterialWidget.h>
 #include <SofaImGui/widgets/RigidMass.h>
+#include <SofaImGui/widgets/VecVectorWidget.h>
 
 namespace sofaimgui
 {
@@ -178,101 +179,6 @@ void DataWidget<type::Vec<4, float> >::showWidget(MyData& data)
  * Vectors of Vec
  **********************************************************************************************************************/
 
-template< Size N, typename ValueType>
-void showVecTableHeader(Data<type::vector<type::Vec<N, ValueType> > >&)
-{
-    ImGui::TableSetupColumn("");
-    for (unsigned int i = 0; i < N; ++i)
-    {
-        ImGui::TableSetupColumn(std::to_string(i).c_str());
-    }
-}
-
-template<typename ValueType>
-void showVecTableHeader(Data<type::vector<ValueType> >&)
-{
-    ImGui::TableSetupColumn("");
-    ImGui::TableSetupColumn("Value");
-}
-
-template<typename ValueType>
-void showVecTableHeader(Data<type::vector<type::Vec<1, ValueType> > >&)
-{
-    ImGui::TableSetupColumn("");
-    ImGui::TableSetupColumn("X");
-}
-
-template<typename ValueType>
-void showVecTableHeader(Data<type::vector<type::Vec<2, ValueType> > >&)
-{
-    ImGui::TableSetupColumn("");
-    ImGui::TableSetupColumn("X");
-    ImGui::TableSetupColumn("Y");
-}
-
-template<typename ValueType>
-void showVecTableHeader(Data<type::vector<type::Vec<3, ValueType> > >&)
-{
-    ImGui::TableSetupColumn("");
-    ImGui::TableSetupColumn("X");
-    ImGui::TableSetupColumn("Y");
-    ImGui::TableSetupColumn("Z");
-}
-
-template<Size N, typename ValueType>
-bool showLine(unsigned int lineNumber, const std::string& tableLabel, type::Vec<N, ValueType>& vec)
-{
-    for (const auto& v : vec)
-    {
-        ImGui::TableNextColumn();
-        ImGui::Text("%f", v);
-    }
-    return false;
-}
-
-template<typename ValueType>
-bool showLine(unsigned int lineNumber, const std::string& tableLabel, ValueType& value)
-{
-    ImGui::TableNextColumn();
-    return showScalarWidget("", tableLabel + std::to_string(lineNumber), value);
-}
-
-template<class T>
-void showVectorWidget(Data<T>& data)
-{
-    static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody | ImGuiTableFlags_NoHostExtendX;
-    ImGui::Text("%d elements", data.getValue().size());
-    const auto nbColumns = data.getValueTypeInfo()->size() + 1;
-    const auto tableLabel = data.getName() + data.getOwner()->getPathName();
-    if (ImGui::BeginTable(tableLabel.c_str(), nbColumns, flags))
-    {
-        showVecTableHeader(data);
-
-        ImGui::TableHeadersRow();
-
-        auto accessor = helper::getWriteAccessor(data);
-        bool anyChange = false;
-        for (std::size_t i = 0; i < accessor.size(); ++i)
-        {
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            ImGui::Text("%d", i);
-            auto& vec = accessor[i];
-            if (showLine(i, tableLabel, vec))
-            {
-                anyChange = true;
-                data.setDirtyValue();
-            }
-        }
-        if (anyChange)
-        {
-            data.updateIfDirty();
-        }
-
-        ImGui::EndTable();
-    }
-}
-
 template<>
 void DataWidget<type::vector<double> >::showWidget(MyData& data)
 {

SofaImGui/src/SofaImGui/widgets/VecVectorWidget.h

@@ -0,0 +1,201 @@
+/******************************************************************************
+*                 SOFA, Simulation Open-Framework Architecture                *
+*                    (c) 2006 INRIA, USTL, UJF, CNRS, MGH                     *
+*                                                                             *
+* This program is free software; you can redistribute it and/or modify it     *
+* under the terms of the GNU General Public License as published by the Free  *
+* Software Foundation; either version 2 of the License, or (at your option)   *
+* any later version.                                                          *
+*                                                                             *
+* This program is distributed in the hope that it will be useful, but WITHOUT *
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       *
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    *
+* more details.                                                               *
+*                                                                             *
+* You should have received a copy of the GNU General Public License along     *
+* with this program. If not, see <http://www.gnu.org/licenses/>.              *
+*******************************************************************************
+* Authors: The SOFA Team and external contributors (see Authors.txt)          *
+*                                                                             *
+* Contact information: contact@sofa-framework.org                             *
+******************************************************************************/
+#pragma once
+#include <sofa/core/objectmodel/Data.h>
+#include <SofaImGui/widgets/ScalarWidget.h>
+#include <imgui.h>
+#include <unordered_map>
+#include <string>
+
+namespace sofaimgui
+{
+
+using namespace sofa;
+
+/***********************************************************************************************************************
+ * Vectors of Vec
+ **********************************************************************************************************************/
+
+template< Size N, typename ValueType>
+void showVecTableHeader(Data<type::vector<type::Vec<N, ValueType> > >&)
+{
+    ImGui::TableSetupColumn("");
+    for (unsigned int i = 0; i < N; ++i)
+    {
+        ImGui::TableSetupColumn(std::to_string(i).c_str(), ImGuiTableColumnFlags_WidthStretch);
+    }
+}
+
+template<typename ValueType>
+void showVecTableHeader(Data<type::vector<ValueType> >&)
+{
+    ImGui::TableSetupColumn("");
+    ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_WidthStretch);
+}
+
+template<typename ValueType>
+void showVecTableHeader(Data<type::vector<type::Vec<1, ValueType> > >&)
+{
+    ImGui::TableSetupColumn("");
+    ImGui::TableSetupColumn("X", ImGuiTableColumnFlags_WidthStretch);
+}
+
+template<typename ValueType>
+void showVecTableHeader(Data<type::vector<type::Vec<2, ValueType> > >&)
+{
+    ImGui::TableSetupColumn("");
+    ImGui::TableSetupColumn("X", ImGuiTableColumnFlags_WidthStretch);
+    ImGui::TableSetupColumn("Y", ImGuiTableColumnFlags_WidthStretch);
+}
+
+template<typename ValueType>
+void showVecTableHeader(Data<type::vector<type::Vec<3, ValueType> > >&)
+{
+    ImGui::TableSetupColumn("");
+    ImGui::TableSetupColumn("X", ImGuiTableColumnFlags_WidthStretch);
+    ImGui::TableSetupColumn("Y", ImGuiTableColumnFlags_WidthStretch);
+    ImGui::TableSetupColumn("Z", ImGuiTableColumnFlags_WidthStretch);
+}
+
+template<Size N, typename ValueType>
+bool showLine(unsigned int lineNumber, const std::string& tableLabel, type::Vec<N, ValueType>& vec)
+{
+    for (const auto& v : vec)
+    {
+        ImGui::TableNextColumn();
+        ImGui::Text("%f", v);
+    }
+    return false;
+}
+
+template<typename ValueType>
+bool showLine(unsigned int lineNumber, const std::string& tableLabel, ValueType& value)
+{
+    ImGui::TableNextColumn();
+    return showScalarWidget("", tableLabel + std::to_string(lineNumber), value);
+}
+
+namespace
+{
+    enum class TableExpansionState
+    {
+        Collapsed,
+        Expanded
+    };
+
+    // Helper function to toggle expansion state
+    void toggleExpansionState(TableExpansionState& expansionState)
+    {
+        expansionState = (expansionState == TableExpansionState::Expanded) 
+            ? TableExpansionState::Collapsed 
+            : TableExpansionState::Expanded;
+    }
+
+    // Helper function to get or initialize expanded state for a table
+    TableExpansionState& getOrInitializeExpandedState(const std::string& tableLabel)
+    {
+        static std::unordered_map<std::string, TableExpansionState> expandedState;
+        if (!expandedState.contains(tableLabel))
+        {
+            expandedState[tableLabel] = TableExpansionState::Collapsed;
+        }
+        return expandedState[tableLabel];
+    }
+
+    // Helper function to display element count and toggle button
+    void showVectorWidgetHeader(std::size_t elementsCount, const std::string& tableLabel, TableExpansionState& expansionState)
+    {
+        ImGui::Text("%d elements", elementsCount);
+        ImGui::SameLine();
+        const bool isExpanded = (expansionState == TableExpansionState::Expanded);
+
+        if (ImGui::Button(std::string(isExpanded ? "Collapse##" + tableLabel : "Expand##" + tableLabel).c_str()))
+        {
+            toggleExpansionState(expansionState);
+        }
+    }
+
+    // Helper function to render a single table row
+    template<class AccessorType>
+    bool renderTableRow(std::size_t index, const std::string& tableLabel, AccessorType& accessor)
+    {
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text("%d", index);
+        auto& vec = accessor[index];
+        return showLine(index, tableLabel, vec);
+    }
+
+    // Helper function to render all rows when expanded
+    template<class AccessorType>
+    bool renderExpandedTableRows(AccessorType& accessor, const std::string& tableLabel)
+    {
+        bool anyChange = false;
+        for (std::size_t i = 0; i < accessor.size(); ++i)
+        {
+            anyChange |= renderTableRow(i, tableLabel, accessor);
+        }
+        return anyChange;
+    }
+}
+
+template<class T>
+void showVectorWidget(Data<T>& data)
+{
+    static ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody | ImGuiTableFlags_NoHostExtendX;
+
+    const auto nbColumns = data.getValueTypeInfo()->size() + 1;
+    const auto tableLabel = data.getName() + data.getOwner()->getPathName();
+    const auto size = data.getValue().size();
+
+    TableExpansionState& expansionState = getOrInitializeExpandedState(tableLabel);
+    showVectorWidgetHeader(size, tableLabel, expansionState);
+
+    if (expansionState == TableExpansionState::Collapsed)
+    {
+        flags |= ImGuiTableFlags_ScrollY;
+    }
+    else
+    {
+        flags &= ~ImGuiTableFlags_ScrollY;
+    }
+
+    static constexpr float NumberOfLinesToShowWhenCollapsed = 8.5f;
+    ImVec2 outerSize =ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * NumberOfLinesToShowWhenCollapsed );
+    if (ImGui::BeginTable(tableLabel.c_str(), nbColumns, flags, outerSize))
+    {
+        ImGui::TableSetupScrollFreeze(0, 1);
+        showVecTableHeader(data);
+        ImGui::TableHeadersRow();
+
+        auto accessor = helper::getWriteAccessor(data);
+
+        if (renderExpandedTableRows(accessor, tableLabel))
+        {
+            data.updateIfDirty();
+        }
+
+        ImGui::EndTable();
+    }
+}
+
+}