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

Added addressLabelType to HexViewerWidgetSettings

Browse Source
This commit is contained in:
Nav
2022-09-11 01:48:42 +01:00
parent dc45301ff8
commit 8574918f81
13 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Insight/InsightWorker/Tasks/ConstructHexViewerByteItemScene.cpp
View File

@@ -6,7 +6,7 @@ namespace Bloom
const Targets::TargetMemoryDescriptor& memoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const Widgets::HexViewerWidgetSettings& settings,
Widgets::HexViewerWidgetSettings& settings,
Widgets::Label* hoveredAddressLabel
)
: memoryDescriptor(memoryDescriptor)

4
src/Insight/InsightWorker/Tasks/ConstructHexViewerByteItemScene.hpp
View File

@@ -20,7 +20,7 @@ namespace Bloom
const Targets::TargetMemoryDescriptor& memoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const Widgets::HexViewerWidgetSettings& settings,
Widgets::HexViewerWidgetSettings& settings,
Widgets::Label* hoveredAddressLabel
);
@@ -38,7 +38,7 @@ namespace Bloom
const Targets::TargetMemoryDescriptor& memoryDescriptor;
std::vector<FocusedMemoryRegion>& focusedMemoryRegions;
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions;
const Widgets::HexViewerWidgetSettings& settings;
Widgets::HexViewerWidgetSettings& settings;
Widgets::Label* hoveredAddressLabel;
};
}

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteAddressContainer.cpp
View File

@@ -2,6 +2,10 @@
namespace Bloom::Widgets
{
ByteAddressContainer::ByteAddressContainer(const HexViewerWidgetSettings& settings)
: settings(settings)
{}
void ByteAddressContainer::adjustAddressLabels(
const std::map<std::size_t, std::vector<ByteItem*>>& byteItemsByRowIndex
) {
@@ -15,7 +19,7 @@ namespace Bloom::Widgets
ByteAddressItem* addressLabel = nullptr;
if (static_cast<int>(rowIndex) > layoutItemMaxIndex) {
addressLabel = new ByteAddressItem(rowIndex, byteItemsByRowIndex, this);
addressLabel = new ByteAddressItem(rowIndex, byteItemsByRowIndex, this->settings.addressLabelType, this);
this->addressItemsByRowIndex.emplace(rowIndex, addressLabel);
} else {

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteAddressContainer.hpp
View File

@@ -9,6 +9,7 @@
#include "ByteItem.hpp"
#include "ByteAddressItem.hpp"
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidgetSettings.hpp"
namespace Bloom::Widgets
{
@@ -17,7 +18,7 @@ namespace Bloom::Widgets
public:
static constexpr int WIDTH = 88;
ByteAddressContainer() = default;
ByteAddressContainer(const HexViewerWidgetSettings& settings);
[[nodiscard]] QRectF boundingRect() const override {
return QRectF(
@@ -28,10 +29,11 @@ namespace Bloom::Widgets
);
}
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override;
void adjustAddressLabels(const std::map<std::size_t, std::vector<ByteItem*>>& byteItemsByRowIndex);
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override;
private:
const HexViewerWidgetSettings& settings;
std::map<std::size_t, ByteAddressItem*> addressItemsByRowIndex;
};
}

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteAddressItem.cpp
View File

@@ -7,10 +7,12 @@ namespace Bloom::Widgets
ByteAddressItem::ByteAddressItem(
std::size_t rowIndex,
const std::map<std::size_t, std::vector<ByteItem*>>& byteItemsByRowIndex,
const AddressType& addressType,
QGraphicsItem* parent
)
: rowIndex(rowIndex)
, byteItemsByRowIndex(byteItemsByRowIndex)
, addressType(addressType)
, QGraphicsItem(parent)
{
this->setCacheMode(
@@ -36,7 +38,9 @@ namespace Bloom::Widgets
painter->drawText(
widgetRect,
Qt::AlignLeft,
this->byteItemsByRowIndex.at(this->rowIndex)[0]->relativeAddressHex
this->addressType == AddressType::RELATIVE
? this->byteItemsByRowIndex.at(this->rowIndex)[0]->relativeAddressHex
: this->byteItemsByRowIndex.at(this->rowIndex)[0]->addressHex
);
}
}

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteAddressItem.hpp
View File

@@ -6,6 +6,8 @@
#include "ByteItem.hpp"
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/AddressType.hpp"
namespace Bloom::Widgets
{
class ByteAddressItem: public QGraphicsItem
@@ -19,6 +21,7 @@ namespace Bloom::Widgets
explicit ByteAddressItem(
std::size_t rowIndex,
const std::map<std::size_t, std::vector<ByteItem*>>& byteItemsByRowIndex,
const AddressType& addressType,
QGraphicsItem* parent
);
@@ -35,5 +38,6 @@ namespace Bloom::Widgets
private:
const std::map<std::size_t, std::vector<ByteItem*>>& byteItemsByRowIndex;
const AddressType& addressType;
};
}

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

@@ -25,7 +25,7 @@ namespace Bloom::Widgets
const TargetMemoryDescriptor& targetMemoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const HexViewerWidgetSettings& settings,
HexViewerWidgetSettings& settings,
Label* hoveredAddressLabel
) {
auto* constructSceneTask = new ConstructHexViewerByteItemScene(

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemContainerGraphicsView.hpp
View File

@@ -24,7 +24,7 @@ namespace Bloom::Widgets
const Targets::TargetMemoryDescriptor& targetMemoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const HexViewerWidgetSettings& settings,
HexViewerWidgetSettings& settings,
Label* hoveredAddressLabel
);

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

@@ -12,7 +12,7 @@ namespace Bloom::Widgets
const TargetMemoryDescriptor& targetMemoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const HexViewerWidgetSettings& settings,
HexViewerWidgetSettings& settings,
Label* hoveredAddressLabel,
QGraphicsView* parent
)
@@ -25,7 +25,7 @@ namespace Bloom::Widgets
{
this->setObjectName("byte-widget-container");
this->byteAddressContainer = new ByteAddressContainer();
this->byteAddressContainer = new ByteAddressContainer(this->settings);
this->addItem(this->byteAddressContainer);
// Construct ByteWidget objects

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.hpp
View File

@@ -44,7 +44,7 @@ namespace Bloom::Widgets
const Targets::TargetMemoryDescriptor& targetMemoryDescriptor,
std::vector<FocusedMemoryRegion>& focusedMemoryRegions,
std::vector<ExcludedMemoryRegion>& excludedMemoryRegions,
const HexViewerWidgetSettings& settings,
HexViewerWidgetSettings& settings,
Label* hoveredAddressLabel,
QGraphicsView* parent
);
@@ -91,7 +91,7 @@ namespace Bloom::Widgets
Targets::TargetState targetState = Targets::TargetState::UNKNOWN;
const QMargins margins = QMargins(10, 10, 10, 10);
const HexViewerWidgetSettings& settings;
HexViewerWidgetSettings& settings;
Label* hoveredAddressLabel = nullptr;

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidgetSettings.hpp
View File

@@ -1,5 +1,7 @@
#pragma once
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/AddressType.hpp"
namespace Bloom::Widgets
{
struct HexViewerWidgetSettings
@@ -9,5 +11,7 @@ namespace Bloom::Widgets
bool highlightHoveredRowAndCol = true;
bool displayAsciiValues = false;
bool displayAnnotations = true;
AddressType addressLabelType = AddressType::ABSOLUTE;
};
}

27
src/ProjectSettings.cpp
View File

@@ -184,6 +184,12 @@ namespace Bloom
hexViewerSettings.displayAnnotations =
hexViewerSettingsObj.value("displayAnnotations").toBool();
}
if (hexViewerSettingsObj.contains("addressLabelType")) {
hexViewerSettings.addressLabelType = InsightProjectSettings::addressTypesByName.valueAt(
hexViewerSettingsObj.value("addressLabelType").toString()
).value_or(hexViewerSettings.addressLabelType);
}
}
if (jsonObject.contains("focusedRegions")) {
@@ -218,7 +224,7 @@ namespace Bloom
region.createdDate.setSecsSinceEpoch(regionObj.find("createdTimestamp")->toInteger());
const auto addressInputType = InsightProjectSettings::addressRangeInputTypesByName.valueAt(
const auto addressInputType = InsightProjectSettings::addressTypesByName.valueAt(
regionObj.find("addressInputType")->toString()
);
@@ -277,7 +283,7 @@ namespace Bloom
region.createdDate.setSecsSinceEpoch(regionObj.find("createdTimestamp")->toInteger());
const auto addressInputType = InsightProjectSettings::addressRangeInputTypesByName.valueAt(
const auto addressInputType = InsightProjectSettings::addressTypesByName.valueAt(
regionObj.find("addressInputType")->toString()
);
@@ -334,6 +340,10 @@ namespace Bloom
QJsonObject InsightProjectSettings::memoryInspectionPaneSettingsToJson(
const Widgets::TargetMemoryInspectionPaneSettings& inspectionPaneSettings
) const {
const auto& regionDataTypesByName = InsightProjectSettings::regionDataTypesByName;
const auto& regionEndiannessByName = InsightProjectSettings::regionEndiannessByName;
const auto& addressTypesByName = InsightProjectSettings::addressTypesByName;
auto settingsObj = QJsonObject({
{"refreshOnTargetStop", inspectionPaneSettings.refreshOnTargetStop},
{"refreshOnActivation", inspectionPaneSettings.refreshOnActivation},
@@ -346,17 +356,14 @@ namespace Bloom
{"highlightHoveredRowAndCol", hexViewerSettings.highlightHoveredRowAndCol},
{"displayAsciiValues", hexViewerSettings.displayAsciiValues},
{"displayAnnotations", hexViewerSettings.displayAnnotations},
{"addressLabelType", addressTypesByName.valueAt(hexViewerSettings.addressLabelType).value()},
}));
const auto& regionDataTypesByName = InsightProjectSettings::regionDataTypesByName;
const auto& regionEndiannessByName = InsightProjectSettings::regionEndiannessByName;
const auto& addressRangeInputTypesByName = InsightProjectSettings::addressRangeInputTypesByName;
auto focusedRegions = QJsonArray();
for (const auto& focusedRegion : inspectionPaneSettings.focusedMemoryRegions) {
if (!regionDataTypesByName.contains(focusedRegion.dataType)
|| !regionEndiannessByName.contains(focusedRegion.endianness)
|| !addressRangeInputTypesByName.contains(focusedRegion.addressRangeInputType)
|| !addressTypesByName.contains(focusedRegion.addressRangeInputType)
) {
continue;
}
@@ -370,7 +377,7 @@ namespace Bloom
{"name", focusedRegion.name},
{"addressRange", addressRangeObj},
{"createdTimestamp", focusedRegion.createdDate.toSecsSinceEpoch()},
{"addressInputType", addressRangeInputTypesByName.at(focusedRegion.addressRangeInputType)},
{"addressInputType", addressTypesByName.at(focusedRegion.addressRangeInputType)},
{"dataType", regionDataTypesByName.at(focusedRegion.dataType)},
{"endianness", regionEndiannessByName.at(focusedRegion.endianness)},
});
@@ -380,7 +387,7 @@ namespace Bloom
auto excludedRegions = QJsonArray();
for (const auto& excludedRegion : inspectionPaneSettings.excludedMemoryRegions) {
if (!addressRangeInputTypesByName.contains(excludedRegion.addressRangeInputType)) {
if (!addressTypesByName.contains(excludedRegion.addressRangeInputType)) {
continue;
}
@@ -393,7 +400,7 @@ namespace Bloom
{"name", excludedRegion.name},
{"addressRange", addressRangeObj},
{"createdTimestamp", excludedRegion.createdDate.toSecsSinceEpoch()},
{"addressInputType", addressRangeInputTypesByName.at(excludedRegion.addressRangeInputType)},
{"addressInputType", addressTypesByName.at(excludedRegion.addressRangeInputType)},
});
excludedRegions.push_back(regionObj);

2
src/ProjectSettings.hpp
View File

@@ -54,7 +54,7 @@ namespace Bloom
{Targets::TargetMemoryEndianness::BIG, "big"},
};
static const inline BiMap<AddressType, QString> addressRangeInputTypesByName = {
static const inline BiMap<AddressType, QString> addressTypesByName = {
{AddressType::ABSOLUTE, "absolute"},
{AddressType::RELATIVE, "relative"},
};