From c7a20868500b57e5a9af87831f4113e271bf4ec5 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Tue, 3 May 2022 23:31:08 +0200 Subject: [PATCH] Change Source filter to Color Correction Removed filter selection from UI --- ImGuiVisitor.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/ImGuiVisitor.cpp b/ImGuiVisitor.cpp index 8a58b5c..60b7230 100644 --- a/ImGuiVisitor.cpp +++ b/ImGuiVisitor.cpp @@ -395,17 +395,17 @@ void ImGuiVisitor::visit(ImageProcessingShader &n) } ImGui::SameLine(0, IMGUI_SAME_LINE); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); - if (ImGui::Combo("Invert", &n.invert, "None\0Invert Color\0Invert Luminance\0")) + if (ImGui::Combo("Invert", &n.invert, "None\0Color RGB\0Luminance\0")) Action::manager().store("Invert " + std::string(n.invert<1 ? "None": (n.invert>1 ? "Luminance" : "Color"))); - if (ImGuiToolkit::IconButton(1, 7)) { - n.filterid = 0; - Action::manager().store("Filter None"); - } - ImGui::SameLine(0, IMGUI_SAME_LINE); - ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); - if (ImGui::Combo("Filter", &n.filterid, ImageProcessingShader::filter_names, IM_ARRAYSIZE(ImageProcessingShader::filter_names) ) ) - Action::manager().store("Filter " + std::string(ImageProcessingShader::filter_names[n.filterid])); +// if (ImGuiToolkit::IconButton(1, 7)) { +// n.filterid = 0; +// Action::manager().store("Filter None"); +// } +// ImGui::SameLine(0, IMGUI_SAME_LINE); +// ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); +// if (ImGui::Combo("Filter", &n.filterid, ImageProcessingShader::filter_names, IM_ARRAYSIZE(ImageProcessingShader::filter_names) ) ) +// Action::manager().store("Filter " + std::string(ImageProcessingShader::filter_names[n.filterid])); ImGui::PopID(); @@ -485,11 +485,14 @@ void ImGuiVisitor::visit (Source& s) bool on = s.imageProcessingEnabled(); ImGui::SetCursorPos( ImVec2( pos.x, pos.y + preview_height)); if (on) { - ImGuiToolkit::Icon(6, 2); ImGui::SameLine(0, IMGUI_SAME_LINE); ImGui::Text("Filters"); + ImGuiToolkit::Icon(6, 2); + ImGui::SameLine(0, IMGUI_SAME_LINE); + ImGui::Text("Color correction"); } else { - ImGuiToolkit::Indication("Filters disabled", 6, 2); - ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::TextDisabled("Filters"); + ImGuiToolkit::Indication("Color correction disabled", 6, 2); + ImGui::SameLine(0, IMGUI_SAME_LINE); + ImGui::TextDisabled("Color correction"); } pos = ImGui::GetCursorPos(); @@ -502,7 +505,7 @@ void ImGuiVisitor::visit (Source& s) { if (ImGui::MenuItem("Enable", NULL, &on)) { std::ostringstream oss; - oss << s.name() << ": " << ( on ? "Enable Filter" : "Disable Filter"); + oss << s.name() << ": " << ( on ? "Enable Color correction" : "Disable Color correction"); Action::manager().store(oss.str()); s.setImageProcessingEnabled(on); }