Skip to content

Commit f1a5270

Browse files
committed
add a settings do enable/disbale auto resize columns in log and log 2nd views for #17
1 parent 901fb8f commit f1a5270

File tree

5 files changed

+34
-15
lines changed

5 files changed

+34
-15
lines changed

src/headers/LogToGraphBuild.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#define LogToGraph_Prefix "LogToGraph"
4-
#define LogToGraph_BuildNumber 1061
4+
#define LogToGraph_BuildNumber 1063
55
#define LogToGraph_MinorNumber 2
66
#define LogToGraph_MajorNumber 0
7-
#define LogToGraph_BuildId "0.2.1061"
7+
#define LogToGraph_BuildId "0.2.1063"

src/panes/LogPane.cpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,14 @@ void LogPane::CheckItem(SignalTickPtr vSignalTick) {
108108
void LogPane::DrawMenuBar() {
109109
bool need_update = false;
110110
if (ImGui::BeginMenu("Settings")) {
111-
if (ImGui::MenuItem("Show variable signals only", nullptr, &ProjectFile::Instance()->m_ShowVariableSignalsInLogView)) {
112-
LogEngine::Instance()->SetHoveredTime(LogEngine::Instance()->GetHoveredTime());
111+
if (ImGui::MenuItem("Collapse Selection", nullptr, &ProjectFile::Instance()->m_CollapseLogSelection)) {
113112
need_update = true;
114113
}
115-
if (ImGui::MenuItem("Collapse Selection", nullptr, &ProjectFile::Instance()->m_CollapseLogSelection)) {
114+
if (ImGui::MenuItem("Auto resize columns", nullptr, &ProjectFile::Instance()->m_AutoResizeLogColumns)) {
115+
need_update = true;
116+
}
117+
if (ImGui::MenuItem("Show variable signals only", nullptr, &ProjectFile::Instance()->m_ShowVariableSignalsInLogView)) {
118+
LogEngine::Instance()->SetHoveredTime(LogEngine::Instance()->GetHoveredTime());
116119
need_update = true;
117120
}
118121
if (ImGui::MenuItem("Hide some values", nullptr, &ProjectFile::Instance()->m_HideSomeLogValues)) {
@@ -147,11 +150,13 @@ void LogPane::DrawMenuBar() {
147150
}
148151

149152
void LogPane::DrawTable() {
150-
151-
static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY |
152-
ImGuiTableFlags_Resizable |
153+
ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY |
153154
ImGuiTableFlags_NoHostExtendY;
154155

156+
if (!ProjectFile::Instance()->m_AutoResizeLogColumns) {
157+
flags |= ImGuiTableFlags_Resizable;
158+
}
159+
155160
// first display
156161
if (m_LogDatas.empty()) {
157162
PrepareLog();

src/panes/LogPaneSecondView.cpp

+11-5
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,14 @@ void LogPaneSecondView::CheckItem(const SignalTickPtr& vSignalTick) {
105105
void LogPaneSecondView::DrawMenuBar() {
106106
bool need_update = false;
107107
if (ImGui::BeginMenu("Settings")) {
108-
if (ImGui::MenuItem("Show variable signals only", nullptr, &ProjectFile::Instance()->m_ShowVariableSignalsInLog2ndView)) {
109-
LogEngine::Instance()->SetHoveredTime(LogEngine::Instance()->GetHoveredTime());
108+
if (ImGui::MenuItem("Collapse Selection", nullptr, &ProjectFile::Instance()->m_CollapseLog2ndSelection)) {
110109
need_update = true;
111110
}
112-
if (ImGui::MenuItem("Collapse Selection", nullptr, &ProjectFile::Instance()->m_CollapseLog2ndSelection)) {
111+
if (ImGui::MenuItem("Auto resize columns", nullptr, &ProjectFile::Instance()->m_AutoResizeLog2ndColumns)) {
112+
need_update = true;
113+
}
114+
if (ImGui::MenuItem("Show variable signals only", nullptr, &ProjectFile::Instance()->m_ShowVariableSignalsInLog2ndView)) {
115+
LogEngine::Instance()->SetHoveredTime(LogEngine::Instance()->GetHoveredTime());
113116
need_update = true;
114117
}
115118
if (ImGui::MenuItem("Hide some values", nullptr, &ProjectFile::Instance()->m_HideSomeLog2ndValues)) {
@@ -144,10 +147,13 @@ void LogPaneSecondView::DrawMenuBar() {
144147
}
145148

146149
void LogPaneSecondView::DrawTable() {
147-
static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY |
148-
ImGuiTableFlags_Resizable |
150+
ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY |
149151
ImGuiTableFlags_NoHostExtendY;
150152

153+
if (!ProjectFile::Instance()->m_AutoResizeLog2ndColumns) {
154+
flags |= ImGuiTableFlags_Resizable;
155+
}
156+
151157
// first display
152158
if (m_LogDatas.empty()) {
153159
PrepareLog();

src/project/ProjectFile.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,9 @@ ez::xml::Nodes ProjectFile::getXmlNodes(const std::string& /*vUserDatas*/) {
282282
node.addChild("show_variable_signals_in_graph_view").setContent(m_ShowVariableSignalsInGraphView);
283283
node.addChild("show_variable_signals_in_hovered_list_view").setContent(m_ShowVariableSignalsInHoveredListView);
284284
node.addChild("show_variable_signals_in_log_view").setContent(m_ShowVariableSignalsInLogView);
285-
node.addChild("show_variable_signals_in_log2nd_view").setContent(m_ShowVariableSignalsInLog2ndView);
285+
node.addChild("show_variable_signals_in_log_2nd_view").setContent(m_ShowVariableSignalsInLog2ndView);
286+
node.addChild("auto_resize_columns_log_view").setContent(m_AutoResizeLogColumns);
287+
node.addChild("auto_resize_columns_log_2nd_view").setContent(m_AutoResizeLog2ndColumns);
286288
node.addChild("last_log_file_path").setContent(m_LastLogFilePath);
287289
node.addChild("script_file").setContent(m_ScriptFilePathName);
288290
auto& childNode = node.addChild("log_files");
@@ -356,8 +358,12 @@ bool ProjectFile::setFromXmlNodes(const ez::xml::Node& vNode, const ez::xml::Nod
356358
m_ShowVariableSignalsInHoveredListView = ez::dvariant(strValue).GetB();
357359
} else if (strName == "show_variable_signals_in_log_view") {
358360
m_ShowVariableSignalsInLogView = ez::dvariant(strValue).GetB();
359-
} else if (strName == "show_variable_signals_in_log2nd_view") {
361+
} else if (strName == "show_variable_signals_in_log_2nd_view") {
360362
m_ShowVariableSignalsInLog2ndView = ez::dvariant(strValue).GetB();
363+
} else if (strName == "auto_resize_columns_log_view") {
364+
m_AutoResizeLogColumns = ez::dvariant(strValue).GetB();
365+
} else if (strName == "auto_resize_columns_log_2nd_view") {
366+
m_AutoResizeLog2ndColumns = ez::dvariant(strValue).GetB();
361367
} else if (strName == "last_log_file_path") {
362368
m_LastLogFilePath = strValue;
363369
} else if (strName == "script_file") {

src/project/ProjectFile.h

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ class ProjectFile : public Ltg::IProject, public ez::xml::Config {
6767
bool m_ShowVariableSignalsInAllGraphView = false;
6868
bool m_ShowVariableSignalsInGraphView = false;
6969
bool m_ShowVariableSignalsInHoveredListView = false;
70+
bool m_AutoResizeLogColumns = false;
71+
bool m_AutoResizeLog2ndColumns = false;
7072

7173
private: // dont save
7274
bool m_IsLoaded = false;

0 commit comments

Comments
 (0)