development/ImHex
development/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex synced 2024-10-22 18:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show evaluator errors in a console window instead of the first line

Browse source
This commit is contained in:
WerWolv 2021-01-09 21:45:21 +01:00
parent 575903f921
commit 9f275cc84f
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/ImGui/source/TextEditor.cpp vendored
View file

@ -1127,7 +1127,7 @@ void TextEditor::Render(const char* aTitle, const ImVec2& aSize, bool aBorder)
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::ColorConvertU32ToFloat4(mPalette[(int)PaletteIndex::Background]));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f));
if (!mIgnoreImGuiChild)
ImGui::BeginChild(aTitle, aSize, aBorder, ImGuiWindowFlags_HorizontalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_NoMove);
ImGui::BeginChild(aTitle, aSize, aBorder, ImGuiWindowFlags_HorizontalScrollbar | ImGuiWindowFlags_NoMove);
if (mHandleKeyboardInputs)
{

1
include/views/view_pattern.hpp
View file

@ -29,6 +29,7 @@ namespace hex {
std::filesystem::path m_possiblePatternFile;
TextEditor m_textEditor;
std::vector<std::string> m_console;
imgui_addons::ImGuiFileBrowser m_fileBrowser;
void loadPatternFile(std::string path);

19
source/views/view_pattern.cpp
View file

@ -185,7 +185,21 @@ namespace hex {
auto provider = *SharedData::get().currentProvider;
if (provider != nullptr && provider->isAvailable()) {
this->m_textEditor.Render("Pattern");
auto textEditorSize = ImGui::GetContentRegionAvail();
textEditorSize.y *= 4.0/5.0;
this->m_textEditor.Render("Pattern", textEditorSize, true);
auto consoleSize = ImGui::GetContentRegionAvail();
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.0, 0.0, 0.0, 1.0));
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0, 1.0, 1.0, 1.0));
if (ImGui::BeginChild("##console", consoleSize, true, ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
for (auto &line : this->m_console)
ImGui::TextUnformatted(line.c_str());
}
ImGui::EndChild();
ImGui::PopStyleColor(2);
if (this->m_textEditor.IsTextChanged()) {
this->parsePattern(this->m_textEditor.GetText().data());
@ -254,6 +268,7 @@ namespace hex {
void ViewPattern::parsePattern(char *buffer) {
this->clearPatternData();
this->m_textEditor.SetErrorMarkers({ });
this->m_console.clear();
this->postEvent(Events::PatternChanged);
hex::lang::Preprocessor preprocessor;
@ -307,7 +322,7 @@ namespace hex {
hex::lang::Evaluator evaluator(provider, defaultDataEndianess);
auto patternData = evaluator.evaluate(ast.value());
if (!patternData.has_value()) {
this->m_textEditor.SetErrorMarkers({ evaluator.getError() });
this->m_console.push_back(evaluator.getError().second);
return;
}