doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed TargetMemoryDescriptor dependency in MemoryRegion class (in preparation for saving & loading memory regions from Bloom's project settings file)

Browse Source
This commit is contained in:
Nav
2022-01-16 18:50:12 +00:00
parent 5ae7bd020c
commit b9d05e03eb
16 changed files with 136 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.cpp
View File

@@ -38,7 +38,7 @@ AnnotationItem::AnnotationItem(
AnnotationItem::AnnotationItem(const FocusedMemoryRegion& focusedMemoryRegion, AnnotationItemPosition position)
: AnnotationItem(
focusedMemoryRegion.getAbsoluteAddressRange(),
focusedMemoryRegion.addressRange,
focusedMemoryRegion.name,
position
) {}

10
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.cpp
View File

@@ -89,16 +89,18 @@ void ByteItemGraphicsScene::refreshRegions() {
byteWidget->excludedMemoryRegion = nullptr;
for (const auto& focusedRegion : this->focusedMemoryRegions) {
const auto addressRange = focusedRegion.getAbsoluteAddressRange();
if (byteAddress >= addressRange.startAddress && byteAddress <= addressRange.endAddress) {
if (byteAddress >= focusedRegion.addressRange.startAddress
&& byteAddress <= focusedRegion.addressRange.endAddress
) {
byteWidget->focusedMemoryRegion = &focusedRegion;
break;
}
}
for (const auto& excludedRegion : this->excludedMemoryRegions) {
const auto addressRange = excludedRegion.getAbsoluteAddressRange();
if (byteAddress >= addressRange.startAddress && byteAddress <= addressRange.endAddress) {
if (byteAddress >= excludedRegion.addressRange.startAddress
&& byteAddress <= excludedRegion.addressRange.endAddress
) {
byteWidget->excludedMemoryRegion = &excludedRegion;
break;
}