From f76e3d8a07e80211dd6670b8996ca2bcaa5cdfdb Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 23 Oct 2021 12:45:39 +0100 Subject: [PATCH] Decreased the pin body widget sizes for the QFP target widget Plan to correct the labelling later --- .../Widgets/TargetWidgets/QFP/BodyWidget.cpp | 8 ++++---- .../Widgets/TargetWidgets/QFP/PinBodyWidget.hpp | 4 ++-- .../InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp | 2 +- .../TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss | 7 +++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp index 778671b3..3672c209 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp @@ -23,8 +23,8 @@ void BodyWidget::drawWidget(QPainter& painter) { painter.setBrush(targetBodyColor); const auto containerSize = this->size(); - auto targetBodyWidth = containerSize.width() - 16; - auto targetBodyHeight = containerSize.height() - 16; + auto targetBodyWidth = containerSize.width() - 14; + auto targetBodyHeight = containerSize.height() - 14; auto targetBodyPoint = QPoint( (containerSize.width() / 2) - (targetBodyWidth / 2), @@ -42,7 +42,7 @@ void BodyWidget::drawWidget(QPainter& painter) { painter.drawEllipse(QRectF( targetBodyPoint.x() + 13, targetBodyPoint.y() + 13, - 20, - 20 + 18, + 18 )); } diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp index 90de8b76..d1f14be6 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp @@ -15,8 +15,8 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp Q_OBJECT public: - static const int WIDTH = 30; - static const int HEIGHT = 40; + static const int WIDTH = 25; + static const int HEIGHT = 34; PinBodyWidget(QWidget* parent, Targets::TargetPinDescriptor pinDescriptor, bool isVertical): TargetPinBodyWidget(parent, std::move(pinDescriptor)), isVertical(isVertical) { diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp index 306f45fd..54200989 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp @@ -16,7 +16,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp public: static const int PIN_WIDGET_LAYOUT_PADDING = 46; - static const int WIDTH_SPACING = 8; + static const int WIDTH_SPACING = 7; static const int MAXIMUM_LABEL_COUNT = 3; static const int LABEL_HEIGHT = 20; static const int MAXIMUM_LABEL_WIDTH = PinBodyWidget::WIDTH; diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss index 4ee46b8f..fa0558ca 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss @@ -1,10 +1,8 @@ -#target-pin-number, #target-pin-number { - font-size: 14px; + font-size: 12px; } -#target-pin-name, -#target-pin-direction { +#target-pin-name { font-size: 11px; } @@ -14,6 +12,7 @@ #target-pin-direction { color: #8a8a8d; + font-size: 10px; } #target-pin-body {