Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patterns: Increased highlighting performance

This commit is contained in:
WerWolv 2021-09-26 02:23:27 +02:00
parent e3dd5900e2
commit ae9f4fa876
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -807,16 +807,17 @@ namespace hex::pl {
std::optional<u32> highlightBytes(size_t offset) override{ std::optional<u32> highlightBytes(size_t offset) override{
auto entry = this->m_template->clone(); auto entry = this->m_template->clone();
ON_SCOPE_EXIT { delete entry; };
for (u64 address = this->getOffset(); address < this->getOffset() + this->getSize(); address += this->m_template->getSize()) { if (offset < this->getOffset() || offset >= this->getOffset() + this->getSize())
entry->setOffset(address); return { };
if (auto color = entry->highlightBytes(offset); color.has_value())
return color.value();
}
delete entry; auto index = (offset - this->getOffset()) / this->m_template->getSize();
entry->setOffset(this->getOffset() + this->m_template->getSize() * index);
return { }; if (auto color = entry->highlightBytes(offset); color.has_value())
return color.value();
else
return { };
} }
std::map<u64, u32> getHighlightedAddresses() override { std::map<u64, u32> getHighlightedAddresses() override {

6
source/views/view_pattern_editor.cpp
View File

@ -341,9 +341,9 @@ namespace hex {
void ViewPatternEditor::parsePattern(char *buffer) { void ViewPatternEditor::parsePattern(char *buffer) {
this->m_evaluatorRunning = true; this->m_evaluatorRunning = true;
this->clearPatternData();
this->m_textEditor.SetErrorMarkers({ }); this->m_textEditor.SetErrorMarkers({ });
this->m_console.clear(); this->m_console.clear();
this->clearPatternData();
EventManager::post<EventPatternChanged>(); EventManager::post<EventPatternChanged>();
std::thread([this, buffer = std::string(buffer)] { std::thread([this, buffer = std::string(buffer)] {
@ -358,9 +358,9 @@ namespace hex {
if (result.has_value()) { if (result.has_value()) {
SharedData::patternData = std::move(result.value()); SharedData::patternData = std::move(result.value());
View::doLater([]{ //View::doLater([]{
EventManager::post<EventPatternChanged>(); EventManager::post<EventPatternChanged>();
}); //});
} }
this->m_evaluatorRunning = false; this->m_evaluatorRunning = false;