Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-25 15:53:43 +01:00
Code Releases Wiki Activity

impr: Added changed data information to diff view table

Browse Source
This commit is contained in:
WerWolv 2024-12-31 00:47:32 +01:00
parent 67a9f314cc
commit 655e068b9b
2 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/diffing/romfs/lang/en_US.json
View File

@ -13,6 +13,7 @@
"hex.diffing.view.diff.modified": "Modified", "hex.diffing.view.diff.modified": "Modified",
"hex.diffing.view.diff.provider_a": "Provider A", "hex.diffing.view.diff.provider_a": "Provider A",
"hex.diffing.view.diff.provider_b": "Provider B", "hex.diffing.view.diff.provider_b": "Provider B",
"hex.diffing.view.diff.changes": "Changes",
"hex.diffing.view.diff.removed": "Removed", "hex.diffing.view.diff.removed": "Removed",
"hex.diffing.view.diff.algorithm": "Diffing Algorithm", "hex.diffing.view.diff.algorithm": "Diffing Algorithm",
"hex.diffing.view.diff.settings": "No settings available", "hex.diffing.view.diff.settings": "No settings available",

77
plugins/diffing/source/content/views/view_diff.cpp
View File

@ -149,6 +149,20 @@ namespace hex::plugin::diffing {
}; };
} }
static void drawByteString(const std::vector<u8> &bytes) {
for (u64 i = 0; i < bytes.size(); i += 1) {
if (i >= 16) {
ImGui::TextDisabled(ICON_VS_ELLIPSIS);
ImGui::SameLine(0, 0);
break;
}
u8 byte = bytes[i];
ImGuiExt::TextFormattedDisabled("{0:02X} ", byte);
ImGui::SameLine(0, (i % 4 == 3) ? 4_scaled : 0);
}
}
void ViewDiff::drawContent() { void ViewDiff::drawContent() {
auto &[a, b] = m_columns; auto &[a, b] = m_columns;
@ -263,11 +277,12 @@ namespace hex::plugin::diffing {
} }
// Draw the differences table // Draw the differences table
if (ImGui::BeginTable("##differences", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_ScrollY | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Resizable)) { if (ImGui::BeginTable("##differences", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_ScrollY | ImGuiTableFlags_Reorderable | ImGuiTableFlags_SizingFixedFit)) {
ImGui::TableSetupScrollFreeze(0, 1); ImGui::TableSetupScrollFreeze(0, 1);
ImGui::TableSetupColumn("hex.ui.common.begin"_lang); ImGui::TableSetupColumn("##Type", ImGuiTableColumnFlags_NoReorder);
ImGui::TableSetupColumn("hex.ui.common.end"_lang); ImGui::TableSetupColumn("hex.diffing.view.diff.provider_a"_lang);
ImGui::TableSetupColumn("hex.ui.common.type"_lang); ImGui::TableSetupColumn("hex.diffing.view.diff.provider_b"_lang);
ImGui::TableSetupColumn("hex.diffing.view.diff.changes"_lang);
ImGui::TableHeadersRow(); ImGui::TableHeadersRow();
// Draw the differences if the providers have been analyzed // Draw the differences if the providers have been analyzed
@ -289,9 +304,28 @@ namespace hex::plugin::diffing {
// Draw a clickable row for each difference that will select the difference in both hex editors // Draw a clickable row for each difference that will select the difference in both hex editors
// Draw difference type
ImGui::TableNextColumn();
switch (typeA) {
case DifferenceType::Mismatch:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffChanged), ICON_VS_DIFF_MODIFIED);
ImGui::SetItemTooltip("hex.diffing.view.diff.modified"_lang);
break;
case DifferenceType::Insertion:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffAdded), ICON_VS_DIFF_ADDED);
ImGui::SetItemTooltip("hex.diffing.view.diff.added"_lang);
break;
case DifferenceType::Deletion:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffRemoved), ICON_VS_DIFF_REMOVED);
ImGui::SetItemTooltip("hex.diffing.view.diff.removed"_lang);
break;
default:
break;
}
// Draw start address // Draw start address
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (ImGui::Selectable(hex::format("0x{:02X}", regionA.start).c_str(), false, ImGuiSelectableFlags_SpanAllColumns)) { if (ImGui::Selectable(hex::format("0x{:04X} - 0x{:04X}", regionA.start, regionA.end).c_str(), false, ImGuiSelectableFlags_SpanAllColumns)) {
const Region selectionA = { regionA.start, ((regionA.end - regionA.start) + 1) }; const Region selectionA = { regionA.start, ((regionA.end - regionA.start) + 1) };
const Region selectionB = { regionB.start, ((regionB.end - regionB.start) + 1) }; const Region selectionB = { regionB.start, ((regionB.end - regionB.start) + 1) };
@ -311,23 +345,42 @@ namespace hex::plugin::diffing {
// Draw end address // Draw end address
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextUnformatted(hex::format("0x{:02X}", regionA.end).c_str()); ImGui::TextUnformatted(hex::format("0x{:04X} - 0x{:04X}", regionB.start, regionB.end).c_str());
// Draw difference type const auto &providers = ImHexApi::Provider::getProviders();
std::vector<u8> data;
// Draw changes
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Indent();
switch (typeA) { switch (typeA) {
case DifferenceType::Mismatch:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffChanged), "hex.diffing.view.diff.modified"_lang);
break;
case DifferenceType::Insertion: case DifferenceType::Insertion:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffAdded), "hex.diffing.view.diff.added"_lang); data.resize(std::min<u64>(17, (regionA.end - regionA.start) + 1));
providers[a.provider]->read(regionA.start, data.data(), data.size());
drawByteString(data);
break;
case DifferenceType::Mismatch:
data.resize(std::min<u64>(17, (regionA.end - regionA.start) + 1));
providers[a.provider]->read(regionA.start, data.data(), data.size());
drawByteString(data);
ImGui::SameLine(0, 0);
ImGuiExt::TextFormatted(" {} ", ICON_VS_ARROW_RIGHT);
ImGui::SameLine(0, 0);
data.resize(std::min<u64>(17, (regionB.end - regionB.start) + 1));
providers[b.provider]->read(regionB.start, data.data(), data.size());
drawByteString(data);
break; break;
case DifferenceType::Deletion: case DifferenceType::Deletion:
ImGuiExt::TextFormattedColored(ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_DiffRemoved), "hex.diffing.view.diff.removed"_lang); data.resize(std::min<u64>(17, (regionB.end - regionB.start) + 1));
providers[b.provider]->read(regionB.start, data.data(), data.size());
drawByteString(data);
break; break;
default: default:
break; break;
} }
ImGui::Unindent();
ImGui::PopID(); ImGui::PopID();
} }