add rect over updated text in hovered list view

aiekick · aiekick · commit 6cbe3bb03c63 · 2024-12-01T03:05:52.000+01:00
add settings for that in hovered list view
diff --git a/.clang-format b/.clang-format
@@ -2,12 +2,12 @@ BasedOnStyle: Google
 Language: Cpp
 Standard: Latest
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
 AlignOperands: false
-AlignTrailingComments: true
+AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: true
@@ -16,7 +16,7 @@ AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
@@ -96,10 +96,10 @@ ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakBeforeFirstCallParameter: 100
 PenaltyBreakComment: 200
 PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 200
+PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
diff --git a/3rdparty/ImGuiPack b/3rdparty/ImGuiPack
@@ -1 +1 @@
-Subproject commit c3e11c837629e431fc2e600405d85add16faaca4
+Subproject commit a75e47d44a2b6d0031c8618dec166fa4204ef4d8
diff --git a/3rdparty/ezlibs b/3rdparty/ezlibs
@@ -1 +1 @@
-Subproject commit 60e2fd5b0f333dcbaed493d119a99c595ea2bcfb
+Subproject commit 45784cb3b5f0ebbd376a9b0ce68131043767a75b
diff --git a/3rdparty/iagp b/3rdparty/iagp
@@ -1 +1 @@
-Subproject commit ea58b65bd1e48aabceae6d7d779127b62fac90c8
+Subproject commit b27f68f5a8d4978d65811298e7ae9d39a62dc430
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-LogToGraph_Windows_Debug_x64_v0.3.3583 
+LogToGraph_Windows_Release_x64_v0.3.3583 
diff --git a/plugins/LuaScripting/src/headers/LuaScriptingBuild.h b/plugins/LuaScripting/src/headers/LuaScriptingBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define LuaScripting_Prefix "LuaScripting"
-#define LuaScripting_BuildNumber 327
+#define LuaScripting_BuildNumber 331
 #define LuaScripting_MinorNumber 1
 #define LuaScripting_MajorNumber 0
-#define LuaScripting_BuildId "0.1.327"
+#define LuaScripting_BuildId "0.1.331"
diff --git a/src/backend/MainBackend.cpp b/src/backend/MainBackend.cpp
@@ -164,7 +164,7 @@ bool MainBackend::IsNeedToCloseApp() {
     return m_NeedToCloseApp;
 }
 
-void MainBackend::NeedToCloseApp(const bool& vFlag) {
+void MainBackend::NeedToCloseApp(const bool vFlag) {
     m_NeedToCloseApp = vFlag;
 }
 
@@ -200,7 +200,7 @@ int MainBackend::GetMouseButton(int vButton) {
 //// CONSOLE ///////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void MainBackend::SetConsoleVisibility(const bool& vFlag) {
+void MainBackend::SetConsoleVisibility(const bool vFlag) {
     m_ConsoleVisiblity = vFlag;
 
     if (m_ConsoleVisiblity) {
diff --git a/src/backend/MainBackend.h b/src/backend/MainBackend.h
@@ -64,7 +64,7 @@ class MainBackend : public ez::xml::Config {
     void PostRenderingActions();
 
     bool IsNeedToCloseApp();
-    void NeedToCloseApp(const bool& vFlag = true);
+    void NeedToCloseApp(const bool vFlag = true);
     void CloseApp();
 
     void setAppTitle(const std::string& vFilePathName = {});
@@ -78,7 +78,7 @@ class MainBackend : public ez::xml::Config {
     ez::xml::Nodes getXmlNodes(const std::string& vUserDatas = "") final;
     bool setFromXmlNodes(const ez::xml::Node& vNode, const ez::xml::Node& vParent, const std::string& vUserDatas) final;
 
-    void SetConsoleVisibility(const bool& vFlag);
+    void SetConsoleVisibility(const bool vFlag);
     void SwitchConsoleVisibility();
     bool GetConsoleVisibility();
 
diff --git a/src/headers/DatasDef.h b/src/headers/DatasDef.h
@@ -13,6 +13,7 @@
 #include <ImGuiPack.h>
 #include <ezlibs/ezTools.hpp>
 #include <ezlibs/ezXmlConfig.hpp>
+#include <ezlibs/ezCnt.hpp>
 
 #define declareMember(type, var, def)   \
 private:                                \
@@ -82,6 +83,9 @@ typedef std::vector<SignalTickPtr>& SignalTicksContainerRef;
 typedef std::vector<SignalTickWeak> SignalTicksWeakContainer;
 typedef std::vector<SignalTickWeak>& SignalTicksWeakContainerRef;
 
+typedef ez::cnt::DicoVector<SignalName, SignalTickWeak> SignalTicksWeakPreviewContainer;
+typedef ez::cnt::DicoVector<SignalName, SignalTickWeak>& SignalTicksWeakPreviewContainerRef;
+
 typedef std::vector<std::pair<SignalTickWeak, SignalTickWeak>> SignalDiffWeakContainer;
 typedef std::vector<std::pair<SignalTickWeak, SignalTickWeak>>& SignalDiffWeakContainerRef;
 
diff --git a/src/headers/LogToGraphBuild.h b/src/headers/LogToGraphBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define LogToGraph_Prefix "LogToGraph"
-#define LogToGraph_BuildNumber 3583
+#define LogToGraph_BuildNumber 3595
 #define LogToGraph_MinorNumber 3
 #define LogToGraph_MajorNumber 0
-#define LogToGraph_BuildId "0.3.3583"
+#define LogToGraph_BuildId "0.3.3595"
diff --git a/src/models/graphs/GraphView.cpp b/src/models/graphs/GraphView.cpp
@@ -377,7 +377,7 @@ void GraphView::prEraseGroupAt(const size_t& vIdx) {
     }
 }
 
-bool GraphView::prBeginPlot(const std::string& vLabel, ez::dvec2 vRangeValue, const ImVec2& vSize, const bool& vFirstGraph) const {
+bool GraphView::prBeginPlot(const std::string& vLabel, ez::dvec2 vRangeValue, const ImVec2& vSize, const bool vFirstGraph) const {
     const auto& time_range = LogEngine::Instance()->GetTicksTimeSerieRange();
     if (ImPlot::BeginPlot(vLabel.c_str(), vSize, ImPlotFlags_NoChild | ImPlotFlags_NoTitle)) {
         if (m_need_show_hide_x_axis) {
@@ -487,7 +487,7 @@ static bool ImPLotHoveredLineX(int n_id, double* value, const ImVec4& col, float
     return hovered;
 }
 
-void GraphView::prEndPlot(const bool& vFirstGraph) {
+void GraphView::prEndPlot(const bool vFirstGraph) {
     // draw diff first marks
     auto first_mark = ProjectFile::Instance()->m_DiffFirstMark;
     if (first_mark > 0.0) {
@@ -533,7 +533,7 @@ void GraphView::prEndPlot(const bool& vFirstGraph) {
     ImPlot::EndPlot();
 }
 
-void GraphView::prDrawSignalGraph_ImPlot(const SignalSerieWeak& vSignalSerie, const ImVec2& vSize, const bool& vFirstGraph) {
+void GraphView::prDrawSignalGraph_ImPlot(const SignalSerieWeak& vSignalSerie, const ImVec2& vSize, const bool vFirstGraph) {
     auto datas_ptr = vSignalSerie.lock();
     if (datas_ptr && datas_ptr->show_hide_temporary) {
         ImDrawList* draw_list = ImPlot::GetPlotDrawList();
@@ -600,7 +600,7 @@ void GraphView::prDrawSignalGraph_ImPlot(const SignalSerieWeak& vSignalSerie, co
 
                                 value_pos = ImPlot::PlotToPixels(current_point);
 
-                                const bool& _is_hovered = (ImPlot::IsPlotHovered() && hovered_time >= last_time && hovered_time <= current_time);
+                                const bool _is_hovered = (ImPlot::IsPlotHovered() && hovered_time >= last_time && hovered_time <= current_time);
                                 const ImU32& _color = _is_hovered ? _GraphMouseHoveredTimeColor : datas_ptr->color_u32;
 
                                 if (last_string.empty()) {
@@ -832,7 +832,7 @@ void GraphView::DrawGroupedGraphs(const GraphGroupPtr& vGraphGroupPtr, const ImV
 
                                                 ImPlot::FitPoint(ImPlotPoint(current_time, current_value));
 
-                                                const bool& _is_v_hovered = (ImPlot::IsPlotHovered() && hovered_time >= last_time && hovered_time <= current_time);
+                                                const bool _is_v_hovered = (ImPlot::IsPlotHovered() && hovered_time >= last_time && hovered_time <= current_time);
                                                 ImU32 _color = datas_ptr->color_u32;
 
                                                 if (last_string.empty()) {
diff --git a/src/models/graphs/GraphView.h b/src/models/graphs/GraphView.h
@@ -62,10 +62,10 @@ class GraphView {
     void RemoveEmptyGroups();
 
     void prEraseGroupAt(const size_t& vIdx);
-    void prDrawSignalGraph_ImPlot(const SignalSerieWeak& vSignalSerie, const ImVec2& vSize, const bool& vFirstGraph);
+    void prDrawSignalGraph_ImPlot(const SignalSerieWeak& vSignalSerie, const ImVec2& vSize, const bool vFirstGraph);
 
-    bool prBeginPlot(const std::string& vLabel, ez::dvec2 vRangeValue, const ImVec2& vSize, const bool& vFirstGraph) const;
-    static void prEndPlot(const bool& vFirstGraph);
+    bool prBeginPlot(const std::string& vLabel, ez::dvec2 vRangeValue, const ImVec2& vSize, const bool vFirstGraph) const;
+    static void prEndPlot(const bool vFirstGraph);
 
 public:  // singleton
     static std::shared_ptr<GraphView> Instance() {
diff --git a/src/models/log/LogEngine.cpp b/src/models/log/LogEngine.cpp
@@ -324,7 +324,7 @@ void LogEngine::ShowHideSignal(const SignalCategory& vCategory, const SignalName
     }
 }
 
-void LogEngine::ShowHideSignal(const SignalCategory& vCategory, const SignalName& vName, const bool& vFlag) {
+void LogEngine::ShowHideSignal(const SignalCategory& vCategory, const SignalName& vName, const bool vFlag) {
     if (m_SignalSeries.find(vCategory) != m_SignalSeries.end()) {
         auto& cat = m_SignalSeries.at(vCategory);
         if (cat.find(vName) != cat.end()) {
@@ -387,35 +387,45 @@ SignalSeriesContainerRef LogEngine::GetSignalSeries() {
     return m_SignalSeries;
 }
 
-void LogEngine::SetHoveredTime(const SignalEpochTime& vHoveredTime) {
-    m_HoveredTime = vHoveredTime;
-    ProjectFile::Instance()->SetProjectChange();
-    m_PreviewTicks.clear();
-    m_PreviewTicks.reserve(m_SignalsCount);
-    size_t visible_idx = 0U;
-    for (auto& item_cat : m_SignalSeries) {
-        for (auto& item_name : item_cat.second) {
-            if (item_name.second) {
-                if (ProjectFile::Instance()->m_ShowVariableSignalsInHoveredListView && item_name.second->isConstant()) {
-                    continue;
-                }
-                SignalTickPtr last_ptr = nullptr;
-                for (const auto& tick_weak : item_name.second->datas_values) {
-                    auto ptr = tick_weak.lock();
-                    if (last_ptr && vHoveredTime >= last_ptr->time_epoch && ptr && vHoveredTime <= ptr->time_epoch) {
-                        m_PreviewTicks.push_back(last_ptr);
-                        if (ProjectFile::Instance()->m_AutoColorize) {
-                            auto parent_ptr = last_ptr->parent.lock();
-                            if (parent_ptr && parent_ptr->show) {
-                                parent_ptr->color_u32 = ImGui::GetColorU32(GraphView::GetRainBow((int32_t)visible_idx, m_VisibleCount));
-                                parent_ptr->color_v4 = ImGui::ColorConvertU32ToFloat4(parent_ptr->color_u32);
-
-                                ++visible_idx;
+void LogEngine::SetHoveredTime(const SignalEpochTime& vHoveredTime, const bool vForce) {
+    if (vForce || m_HoveredTime != vHoveredTime) {
+        m_HoveredTime = vHoveredTime;
+        ProjectFile::Instance()->SetProjectChange();
+        auto last_previewed_ticks = m_PreviewTicks;
+        m_PreviewTicks.clear();
+        m_PreviewTicks.reserve(m_SignalsCount);
+        size_t visible_idx = 0U;
+        for (auto& item_cat : m_SignalSeries) {
+            for (auto& item_name : item_cat.second) {
+                if (item_name.second) {
+                    if (ProjectFile::Instance()->m_ShowVariableSignalsInHoveredListView && item_name.second->isConstant()) {
+                        continue;
+                    }
+                    SignalTickPtr last_ptr = nullptr;
+                    for (const auto& tick_weak : item_name.second->datas_values) {
+                        auto ptr = tick_weak.lock();
+                        if (last_ptr && vHoveredTime >= last_ptr->time_epoch && ptr != nullptr && vHoveredTime <= ptr->time_epoch) {
+                            if (m_PreviewTicks.tryAdd(item_name.second->name, last_ptr)) {
+                                if (ProjectFile::Instance()->m_AutoColorize) {
+                                    auto parent_ptr = last_ptr->parent.lock();
+                                    if (parent_ptr && parent_ptr->show) {
+                                        parent_ptr->color_u32 = ImGui::GetColorU32(GraphView::GetRainBow((int32_t)visible_idx, m_VisibleCount));
+                                        parent_ptr->color_v4 = ImGui::ColorConvertU32ToFloat4(parent_ptr->color_u32);
+
+                                        ++visible_idx;
+                                    }
+                                }
+                                if (last_previewed_ticks.exist(item_name.second->name)) {
+                                    auto last_previewed_tick_ptr = last_previewed_ticks.value(item_name.second->name).lock();
+                                    if (last_previewed_tick_ptr != nullptr) {
+                                        last_ptr->just_changed = ez::isDifferent(last_previewed_tick_ptr->value, last_ptr->value);
+                                    }
+                                }
                             }
+                            break;
                         }
-                        break;
+                        last_ptr = ptr;
                     }
-                    last_ptr = ptr;
                 }
             }
         }
@@ -452,7 +462,7 @@ void LogEngine::UpdateVisibleSignalsColoring() {
     }
 }
 
-SignalTicksWeakContainerRef LogEngine::GetPreviewTicks() {
+SignalTicksWeakPreviewContainerRef LogEngine::GetPreviewTicks() {
     return m_PreviewTicks;
 }
 
diff --git a/src/models/log/LogEngine.h b/src/models/log/LogEngine.h
@@ -67,7 +67,7 @@ class LogEngine : public ez::xml::Config {
     std::unordered_map<SignalName, std::unordered_map<SignalCategory, SignalSetting>> m_SignalSettings;
 
     // hovered preview ticks
-    SignalTicksWeakContainer m_PreviewTicks;
+    SignalTicksWeakPreviewContainer m_PreviewTicks;
 
     // diff check
     SignalTicksWeakContainer m_DiffFirstTicks;   // first mark container
@@ -97,7 +97,7 @@ class LogEngine : public ez::xml::Config {
 
     // iter SignalDatasContainer
     void ShowHideSignal(const SignalCategory& vCategory, const SignalName& vName);
-    void ShowHideSignal(const SignalCategory& vCategory, const SignalName& vName, const bool& vFlag);
+    void ShowHideSignal(const SignalCategory& vCategory, const SignalName& vName, const bool vFlag);
     bool isSignalShown(const SignalCategory& vCategory, const SignalName& vName, SignalColor* vOutColorPtr = nullptr);
 
     SourceFilesContainerRef GetSourceFiles();
@@ -106,12 +106,12 @@ class LogEngine : public ez::xml::Config {
     SignalTagsContainerRef GetSignalTags();
     SignalSeriesContainerRef GetSignalSeries();
 
-    void SetHoveredTime(const SignalEpochTime& vSignalEpochTime);
+    void SetHoveredTime(const SignalEpochTime& vSignalEpochTime, const bool vForce = false);
     double GetHoveredTime() const;
 
     void UpdateVisibleSignalsColoring();
 
-    SignalTicksWeakContainerRef GetPreviewTicks();
+    SignalTicksWeakPreviewContainerRef GetPreviewTicks();
 
     void PrepareForSave();
     void PrepareAfterLoad();
diff --git a/src/models/log/SignalSerie.cpp b/src/models/log/SignalSerie.cpp
@@ -28,7 +28,7 @@ SignalSeriePtr SignalSerie::Create() {
     return res;
 }
 
-void SignalSerie::insertTick(const SignalTickWeak& vTick, const size_t& vIdx, const bool& vIncBaseRecordsCount) {
+void SignalSerie::insertTick(const SignalTickWeak& vTick, const size_t& vIdx, const bool vIncBaseRecordsCount) {
     if (vIdx < datas_values.size()) {
         auto ptr = vTick.lock();
         if (ptr) {
@@ -45,7 +45,7 @@ void SignalSerie::insertTick(const SignalTickWeak& vTick, const size_t& vIdx, co
     }
 }
 
-void SignalSerie::addTick(const SignalTickWeak& vTick, const bool& vIncBaseRecordsCount) {
+void SignalSerie::addTick(const SignalTickWeak& vTick, const bool vIncBaseRecordsCount) {
     auto ptr = vTick.lock();
     if (ptr) {
         ptr->parent = m_This;
diff --git a/src/models/log/SignalSerie.h b/src/models/log/SignalSerie.h
@@ -52,8 +52,8 @@ class SignalSerie {
     bool show = false;  // signal must be shown on graph screen
 
 public:
-    void insertTick(const SignalTickWeak& vTick, const size_t& vIdx, const bool& vIncBaseRecordsCount = false);
-    void addTick(const SignalTickWeak& vTick, const bool& vIncBaseRecordsCount = false);
+    void insertTick(const SignalTickWeak& vTick, const size_t& vIdx, const bool vIncBaseRecordsCount = false);
+    void addTick(const SignalTickWeak& vTick, const bool vIncBaseRecordsCount = false);
 
     void addGraphAnnotation(GraphAnnotationWeak vGraphAnnotation);
 
diff --git a/src/models/log/SignalTick.h b/src/models/log/SignalTick.h
@@ -40,4 +40,5 @@ class SignalTick {
     SignalStatus status;
     SignalDesc desc;
     SignalSerieWeak parent;
+    bool just_changed = false; // for hovered list view
 };
diff --git a/src/models/script/ScriptingEngine.cpp b/src/models/script/ScriptingEngine.cpp
@@ -241,7 +241,7 @@ void ScriptingEngine::AddSignalStatus(const SignalCategory& vCategory,
 //// THREAD ///////////////////////////////////////////
 ///////////////////////////////////////////////////////
 
-void ScriptingEngine::StartWorkerThread(const bool& vFirstLoad) {
+void ScriptingEngine::StartWorkerThread(const bool vFirstLoad) {
     if (!StopWorkerThread()) {
         if (!vFirstLoad) {
             LogEngine::Instance()->PrepareForSave();
diff --git a/src/models/script/ScriptingEngine.h b/src/models/script/ScriptingEngine.h
@@ -92,7 +92,7 @@ class ScriptingEngine : public Ltg::IDatasModel, public ez::xml::Config {
         const SignalString& vString,
         const SignalStatus& vStatus);
 
-    void StartWorkerThread(const bool& vFirstLoad);
+    void StartWorkerThread(const bool vFirstLoad);
     bool StopWorkerThread();
     bool IsJoinable();
     void Join();
diff --git a/src/panes/GraphListPane.cpp b/src/panes/GraphListPane.cpp
@@ -244,7 +244,7 @@ void GraphListPane::DrawTree() {
 }
 
 void GraphListPane::PrepareLog(const std::string& vSearchString) {
-    const bool& is_their_some_search = !vSearchString.empty();
+    const bool is_their_some_search = !vSearchString.empty();
 
     m_FilteredSignalSeries.clear();
 
diff --git a/src/panes/SignalsHoveredList.cpp b/src/panes/SignalsHoveredList.cpp
diff --git a/src/project/ProjectFile.cpp b/src/project/ProjectFile.cpp
diff --git a/src/project/ProjectFile.h b/src/project/ProjectFile.h

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-LogToGraph_Windows_Debug_x64_v0.3.3583`
	`1`	`+LogToGraph_Windows_Release_x64_v0.3.3583`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ bool MainBackend::IsNeedToCloseApp() {`
`164`	`164`	`return m_NeedToCloseApp;`
`165`	`165`	`}`
`166`	`166`
`167`		`-void MainBackend::NeedToCloseApp(const bool& vFlag) {`
	`167`	`+void MainBackend::NeedToCloseApp(const bool vFlag) {`
`168`	`168`	`m_NeedToCloseApp = vFlag;`
`169`	`169`	`}`
`170`	`170`
`@@ -200,7 +200,7 @@ int MainBackend::GetMouseButton(int vButton) {`
`200`	`200`	`//// CONSOLE ///////////////////////////////////////////////////////////////////////////////////////////////`
`201`	`201`	`////////////////////////////////////////////////////////////////////////////////////////////////////////////`
`202`	`202`
`203`		`-void MainBackend::SetConsoleVisibility(const bool& vFlag) {`
	`203`	`+void MainBackend::SetConsoleVisibility(const bool vFlag) {`
`204`	`204`	`m_ConsoleVisiblity = vFlag;`
`205`	`205`
`206`	`206`	`if (m_ConsoleVisiblity) {`