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

Changed GPIO pin direction label positioning, in QFP target package widget

Browse Source
This commit is contained in:
Nav
2022-04-30 13:24:49 +01:00
parent 75d18b45fb
commit e98f37bfeb
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
View File

@@ -26,8 +26,10 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
public: public:
static constexpr int PIN_WIDGET_LAYOUT_PADDING = 46; static constexpr int PIN_WIDGET_LAYOUT_PADDING = 46;
static constexpr int WIDTH_SPACING = 4; static constexpr int WIDTH_SPACING = 4;
static constexpr int PIN_LABEL_LONG_LINE_LENGTH = 25; static constexpr int PIN_NAME_LABEL_LONG_LINE_LENGTH = 25;
static constexpr int PIN_LABEL_SHORT_LINE_LENGTH = 5; static constexpr int PIN_NAME_LABEL_SHORT_LINE_LENGTH = 5;
static constexpr int PIN_DIRECTION_LABEL_LONG_LINE_LENGTH = 22;
static constexpr int PIN_DIRECTION_LABEL_SHORT_LINE_LENGTH = 21;
static constexpr int PIN_LABEL_SPACING = 2; static constexpr int PIN_LABEL_SPACING = 2;
static constexpr int LABEL_HEIGHT = 20; static constexpr int LABEL_HEIGHT = 20;
static constexpr int MAXIMUM_PIN_NUMBER_LABEL_WIDTH = 26; static constexpr int MAXIMUM_PIN_NUMBER_LABEL_WIDTH = 26;

44
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp
View File

@@ -107,15 +107,15 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
const auto height = horizontalLayoutHeight + (verticalPinWidgetHeight * 2) + ( const auto height = horizontalLayoutHeight + (verticalPinWidgetHeight * 2) + (
( (
PinWidget::PIN_LABEL_LONG_LINE_LENGTH PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
+ PinWidget::PIN_LABEL_SHORT_LINE_LENGTH + PinWidget::PIN_DIRECTION_LABEL_LONG_LINE_LENGTH
+ (PinWidget::MAXIMUM_LABEL_HEIGHT * 2) + (PinWidget::MAXIMUM_LABEL_HEIGHT * 2)
+ (PinWidget::PIN_LABEL_SPACING * 3) + (PinWidget::PIN_LABEL_SPACING * 3)
) * 2 ) * 2
); );
const auto width = verticalLayoutWidth + (horizontalPinWidgetWidth * 2) + ( const auto width = verticalLayoutWidth + (horizontalPinWidgetWidth * 2) + (
( (
PinWidget::PIN_LABEL_LONG_LINE_LENGTH PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
+ PinWidget::MAXIMUM_LABEL_WIDTH + PinWidget::MAXIMUM_LABEL_WIDTH
+ PinWidget::MAXIMUM_PIN_DIRECTION_LABEL_WIDTH + PinWidget::MAXIMUM_PIN_DIRECTION_LABEL_WIDTH
+ (PinWidget::PIN_LABEL_SPACING * 2) + (PinWidget::PIN_LABEL_SPACING * 2)
@@ -194,7 +194,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
static auto pinNameFont = QFont("'Ubuntu', sans-serif"); static auto pinNameFont = QFont("'Ubuntu', sans-serif");
static auto pinDirectionFont = pinNameFont; static auto pinDirectionFont = pinNameFont;
pinNameFont.setPixelSize(11); pinNameFont.setPixelSize(11);
pinDirectionFont.setPixelSize(9); pinDirectionFont.setPixelSize(10);
static const auto lineColor = QColor(0x4F, 0x4F, 0x4F); static const auto lineColor = QColor(0x4F, 0x4F, 0x4F);
static const auto pinNameFontColor = QColor(0xA6, 0xA7, 0xAA); static const auto pinNameFontColor = QColor(0xA6, 0xA7, 0xAA);
@@ -214,7 +214,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
if (pinWidget->position == Position::LEFT) { if (pinWidget->position == Position::LEFT) {
painter.setPen(lineColor); painter.setPen(lineColor);
painter.drawLine(QLine( painter.drawLine(QLine(
pinGeoPosition.x() - PinWidget::PIN_LABEL_LONG_LINE_LENGTH, pinGeoPosition.x() - PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH,
pinGeoPosition.y() + (PinWidget::MAXIMUM_HORIZONTAL_HEIGHT / 2), pinGeoPosition.y() + (PinWidget::MAXIMUM_HORIZONTAL_HEIGHT / 2),
pinGeoPosition.x(), pinGeoPosition.x(),
pinGeoPosition.y() + (PinWidget::MAXIMUM_HORIZONTAL_HEIGHT / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_HORIZONTAL_HEIGHT / 2)
@@ -223,7 +223,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
painter.setPen(pinStateChanged ? pinChangedFontColor : pinNameFontColor); painter.setPen(pinStateChanged ? pinChangedFontColor : pinNameFontColor);
painter.drawText( painter.drawText(
QRect( QRect(
pinGeoPosition.x() - PinWidget::PIN_LABEL_LONG_LINE_LENGTH pinGeoPosition.x() - PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
- PinWidget::MAXIMUM_LABEL_WIDTH - (PinWidget::PIN_LABEL_SPACING * 2), - PinWidget::MAXIMUM_LABEL_WIDTH - (PinWidget::PIN_LABEL_SPACING * 2),
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2)
- (PinWidget::MAXIMUM_LABEL_HEIGHT / 2), - (PinWidget::MAXIMUM_LABEL_HEIGHT / 2),
@@ -240,7 +240,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
painter.setPen(pinDirectionFontColor); painter.setPen(pinDirectionFontColor);
painter.drawText( painter.drawText(
QRect( QRect(
pinGeoPosition.x() - PinWidget::PIN_LABEL_LONG_LINE_LENGTH pinGeoPosition.x() - PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
- PinWidget::MAXIMUM_LABEL_WIDTH - (PinWidget::PIN_LABEL_SPACING * 3) - PinWidget::MAXIMUM_LABEL_WIDTH - (PinWidget::PIN_LABEL_SPACING * 3)
- PinWidget::MAXIMUM_PIN_DIRECTION_LABEL_WIDTH, - PinWidget::MAXIMUM_PIN_DIRECTION_LABEL_WIDTH,
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2)
@@ -259,7 +259,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH, pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH,
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2), pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2),
pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH
+ PinWidget::PIN_LABEL_LONG_LINE_LENGTH, + PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH,
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2)
)); ));
@@ -267,7 +267,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
painter.drawText( painter.drawText(
QRect( QRect(
pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH
+ PinWidget::PIN_LABEL_LONG_LINE_LENGTH + 8, + PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH + 8,
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2)
- (PinWidget::MAXIMUM_LABEL_HEIGHT / 2), - (PinWidget::MAXIMUM_LABEL_HEIGHT / 2),
PinWidget::MAXIMUM_LABEL_WIDTH, PinWidget::MAXIMUM_LABEL_WIDTH,
@@ -284,7 +284,7 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
painter.drawText( painter.drawText(
QRect( QRect(
pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH pinGeoPosition.x() + PinWidget::MAXIMUM_HORIZONTAL_WIDTH
+ PinWidget::PIN_LABEL_LONG_LINE_LENGTH + PinWidget::MAXIMUM_LABEL_WIDTH + PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH + PinWidget::MAXIMUM_LABEL_WIDTH
+ (PinWidget::PIN_LABEL_SPACING * 3), + (PinWidget::PIN_LABEL_SPACING * 3),
pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2) pinGeoPosition.y() + (PinWidget::MAXIMUM_VERTICAL_WIDTH / 2)
- (PinWidget::MAXIMUM_LABEL_HEIGHT / 2), - (PinWidget::MAXIMUM_LABEL_HEIGHT / 2),
@@ -298,13 +298,13 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
} else if (pinWidget->position == Position::TOP) { } else if (pinWidget->position == Position::TOP) {
painter.setPen(lineColor); painter.setPen(lineColor);
const auto pinNameLabelLineLength = (pinWidget->getPinNumber() % 2 == 0 ? const auto pinNameLabelLineLength = (pinWidget->getPinNumber() % 2 == 0
PinWidget::PIN_LABEL_LONG_LINE_LENGTH ? PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
: PinWidget::PIN_LABEL_SHORT_LINE_LENGTH : PinWidget::PIN_NAME_LABEL_SHORT_LINE_LENGTH
); );
const auto pinDirectionLabelLineLength = (pinWidget->getPinNumber() % 2 == 0 ? const auto pinDirectionLabelLineLength = (pinWidget->getPinNumber() % 2 == 0
PinWidget::PIN_LABEL_SHORT_LINE_LENGTH ? PinWidget::PIN_DIRECTION_LABEL_SHORT_LINE_LENGTH
: PinWidget::PIN_LABEL_LONG_LINE_LENGTH : PinWidget::PIN_DIRECTION_LABEL_LONG_LINE_LENGTH
); );
painter.drawLine(QLine( painter.drawLine(QLine(
@@ -356,13 +356,13 @@ namespace Bloom::Widgets::InsightTargetWidgets::Qfp
} else if (pinWidget->position == Position::BOTTOM) { } else if (pinWidget->position == Position::BOTTOM) {
painter.setPen(lineColor); painter.setPen(lineColor);
const auto pinNameLabelLineLength = (pinWidget->getPinNumber() % 2 == 0 ? const auto pinNameLabelLineLength = (pinWidget->getPinNumber() % 2 == 0
PinWidget::PIN_LABEL_LONG_LINE_LENGTH ? PinWidget::PIN_NAME_LABEL_LONG_LINE_LENGTH
: PinWidget::PIN_LABEL_SHORT_LINE_LENGTH : PinWidget::PIN_NAME_LABEL_SHORT_LINE_LENGTH
); );
const auto pinDirectionLabelLineLength = (pinWidget->getPinNumber() % 2 == 0 ? const auto pinDirectionLabelLineLength = (pinWidget->getPinNumber() % 2 == 0
PinWidget::PIN_LABEL_SHORT_LINE_LENGTH ? PinWidget::PIN_DIRECTION_LABEL_SHORT_LINE_LENGTH
: PinWidget::PIN_LABEL_LONG_LINE_LENGTH : PinWidget::PIN_DIRECTION_LABEL_LONG_LINE_LENGTH
); );
painter.drawLine(QLine( painter.drawLine(QLine(