This commit is contained in:
Nav
2022-04-28 21:08:55 +01:00
parent 178df2d9e0
commit 80405057f6
8 changed files with 275 additions and 265 deletions

View File

@@ -53,8 +53,7 @@ namespace Bloom::Widgets
size.setWidth(static_cast<int>( size.setWidth(static_cast<int>(
std::cos(angleRadians) * textSize.width() std::cos(angleRadians) * textSize.width()
+ std::ceil(std::sin(angleRadians) * textSize.height()) + std::ceil(std::sin(angleRadians) * textSize.height())
)) ));
;
size.setHeight(static_cast<int>( size.setHeight(static_cast<int>(
std::sin(angleRadians) * textSize.width() std::sin(angleRadians) * textSize.width()
+ std::ceil(std::cos(angleRadians) * textSize.height()) + std::ceil(std::cos(angleRadians) * textSize.height())

View File

@@ -12,7 +12,9 @@ namespace Bloom::Widgets
public: public:
RotatableLabel(const QString& text, QWidget* parent): QLabel(text, parent) {}; RotatableLabel(const QString& text, QWidget* parent): QLabel(text, parent) {};
RotatableLabel(int angleDegrees, const QString& text, QWidget* parent) RotatableLabel(int angleDegrees, const QString& text, QWidget* parent)
: QLabel(text, parent), angle(angleDegrees) {}; : QLabel(text, parent),
angle(angleDegrees)
{};
void setAngle(int angleDegrees) { void setAngle(int angleDegrees) {
this->angle = angleDegrees; this->angle = angleDegrees;
@@ -23,11 +25,11 @@ namespace Bloom::Widgets
[[nodiscard]] QSize sizeHint() const override { [[nodiscard]] QSize sizeHint() const override {
return this->getContainerSize(); return this->getContainerSize();
}; }
[[nodiscard]] QSize minimumSizeHint() const override { [[nodiscard]] QSize minimumSizeHint() const override {
return this->getContainerSize(); return this->getContainerSize();
}; }
private: private:
int angle = 90; int angle = 90;

View File

@@ -12,7 +12,8 @@
#include "src/Helpers/Paths.hpp" #include "src/Helpers/Paths.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom::Widgets; namespace Bloom::Widgets
{
using namespace Bloom::Exceptions; using namespace Bloom::Exceptions;
using Bloom::Targets::TargetMemoryDescriptor; using Bloom::Targets::TargetMemoryDescriptor;
@@ -294,3 +295,4 @@ void TargetMemoryInspectionPane::openMemoryRegionManagerWindow() {
void TargetMemoryInspectionPane::onMemoryRegionsChange() { void TargetMemoryInspectionPane::onMemoryRegionsChange() {
this->hexViewerWidget->refreshRegions(); this->hexViewerWidget->refreshRegions();
} }
}

View File

@@ -9,7 +9,6 @@
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/ErrorDialogue.hpp" #include "src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/ErrorDialogue.hpp"
#include "src/Helpers/Paths.hpp" #include "src/Helpers/Paths.hpp"
#include "src/Helpers/DateTime.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
#include "src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp" #include "src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp"

View File

@@ -25,7 +25,11 @@ namespace Bloom::Widgets
const TargetDescriptor& targetDescriptor, const TargetDescriptor& targetDescriptor,
InsightWorker& insightWorker, InsightWorker& insightWorker,
PanelWidget* parent PanelWidget* parent
): PaneWidget(parent), targetDescriptor(targetDescriptor), insightWorker(insightWorker) { )
: PaneWidget(parent)
, targetDescriptor(targetDescriptor)
, insightWorker(insightWorker)
{
this->setObjectName("target-registers-side-pane"); this->setObjectName("target-registers-side-pane");
auto targetRegistersPaneUiFile = QFile( auto targetRegistersPaneUiFile = QFile(

View File

@@ -12,7 +12,11 @@ namespace Bloom::Widgets::InsightTargetWidgets
Targets::TargetVariant targetVariant, Targets::TargetVariant targetVariant,
InsightWorker& insightWorker, InsightWorker& insightWorker,
QWidget* parent QWidget* parent
): QWidget(parent), targetVariant(std::move(targetVariant)), insightWorker(insightWorker) { )
: QWidget(parent)
, targetVariant(std::move(targetVariant))
, insightWorker(insightWorker)
{
QObject::connect( QObject::connect(
&(this->insightWorker), &(this->insightWorker),
&InsightWorker::targetStateUpdated, &InsightWorker::targetStateUpdated,

View File

@@ -3,7 +3,7 @@
#include "Command.hpp" #include "Command.hpp"
#include "src/TargetController/Responses/TargetMemoryRead.hpp" #include "src/TargetController/Responses/TargetMemoryRead.hpp"
#include "src/Targets/TargetRegister.hpp" #include "src/Targets/TargetMemory.hpp"
namespace Bloom::TargetController::Commands namespace Bloom::TargetController::Commands
{ {