From 2e4810389fb011f873a8775f5e188d3e3d8ea16e Mon Sep 17 00:00:00 2001 From: Nav Date: Wed, 7 Jul 2021 20:54:45 +0100 Subject: [PATCH] Moved Insight target widgets to "Widgets" sub-folder. --- CMakeLists.txt | 20 +++++++++---------- .../InsightWindow/AboutWindow.cpp | 3 +-- .../InsightWindow/InsightWindow.cpp | 8 ++++---- .../InsightWindow/InsightWindow.hpp | 6 +++--- .../TargetWidgets/DIP/BodyWidget.cpp | 2 +- .../TargetWidgets/DIP/BodyWidget.hpp | 2 +- .../DIP/DualInlinePackageWidget.cpp | 6 +++--- .../DIP/DualInlinePackageWidget.hpp | 2 +- .../TargetWidgets/DIP/PinBodyWidget.cpp | 2 +- .../TargetWidgets/DIP/PinBodyWidget.hpp | 2 +- .../TargetWidgets/DIP/PinWidget.cpp | 2 +- .../TargetWidgets/DIP/PinWidget.hpp | 2 +- .../DIP/Stylesheets/DualInlinePackage.qss | 0 .../TargetWidgets/QFP/BodyWidget.cpp | 2 +- .../TargetWidgets/QFP/BodyWidget.hpp | 2 +- .../TargetWidgets/QFP/PinBodyWidget.cpp | 2 +- .../TargetWidgets/QFP/PinBodyWidget.hpp | 2 +- .../TargetWidgets/QFP/PinWidget.cpp | 2 +- .../TargetWidgets/QFP/PinWidget.hpp | 2 +- .../QFP/QuadFlatPackageWidget.cpp | 8 ++++---- .../QFP/QuadFlatPackageWidget.hpp | 2 +- .../QFP/Stylesheets/QuadFlatPackage.qss | 0 .../TargetWidgets/TargetPackageWidget.hpp | 2 +- .../TargetWidgets/TargetPinWidget.hpp | 2 +- src/resources.qrc | 4 ++-- 25 files changed, 43 insertions(+), 44 deletions(-) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/BodyWidget.cpp (96%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/BodyWidget.hpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/DualInlinePackageWidget.cpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/DualInlinePackageWidget.hpp (94%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/PinBodyWidget.cpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/PinBodyWidget.hpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/PinWidget.cpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/PinWidget.hpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss (100%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/BodyWidget.cpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/BodyWidget.hpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/PinBodyWidget.cpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/PinBodyWidget.hpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/PinWidget.cpp (98%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/PinWidget.hpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/QuadFlatPackageWidget.cpp (97%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/QuadFlatPackageWidget.hpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss (100%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/TargetPackageWidget.hpp (95%) rename src/Insight/UserInterfaces/InsightWindow/{ => Widgets}/TargetWidgets/TargetPinWidget.hpp (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7562b5cb..e6182ade 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,16 +113,16 @@ add_executable(Bloom src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp src/Insight/UserInterfaces/InsightWindow/AboutWindow.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPackageWidget.hpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPinWidget.hpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.cpp - src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.cpp + src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp ) set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom) diff --git a/src/Insight/UserInterfaces/InsightWindow/AboutWindow.cpp b/src/Insight/UserInterfaces/InsightWindow/AboutWindow.cpp index f10ca686..d541b9fc 100644 --- a/src/Insight/UserInterfaces/InsightWindow/AboutWindow.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/AboutWindow.cpp @@ -1,14 +1,13 @@ #include #include "AboutWindow.hpp" -#include "TargetWidgets/DIP/DualInlinePackageWidget.hpp" +#include "Widgets/TargetWidgets/DIP/DualInlinePackageWidget.hpp" #include "src/Logger/Logger.hpp" #include "src/Exceptions/Exception.hpp" #include "src/Application.hpp" #include "src/Helpers/Paths.hpp" using namespace Bloom; -using namespace InsightTargetWidgets; using namespace Exceptions; AboutWindow::AboutWindow(QWidget* parent): QObject(parent) { diff --git a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp index b841a5aa..7678dc1c 100644 --- a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp @@ -4,8 +4,8 @@ #include "InsightWindow.hpp" #include "AboutWindow.hpp" -#include "TargetWidgets/DIP/DualInlinePackageWidget.hpp" -#include "TargetWidgets/QFP/QuadFlatPackageWidget.hpp" +#include "Widgets/TargetWidgets/DIP/DualInlinePackageWidget.hpp" +#include "Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.hpp" #include "src/Logger/Logger.hpp" #include "src/Exceptions/Exception.hpp" #include "src/Targets/TargetDescriptor.hpp" @@ -13,7 +13,7 @@ using namespace Bloom; using namespace Bloom::Exceptions; -using namespace Bloom::InsightTargetWidgets; +using namespace Bloom::Widgets; using Bloom::Targets::TargetDescriptor; using Bloom::Targets::TargetState; @@ -445,7 +445,7 @@ void InsightWindow::onTargetPinStatesUpdate(int variantId, Bloom::Targets::Targe } } -void InsightWindow::togglePinIoState(TargetPinWidget* pinWidget) { +void InsightWindow::togglePinIoState(InsightTargetWidgets::TargetPinWidget* pinWidget) { auto pinState = pinWidget->getPinState(); // Currently, we only allow users to toggle the IO state of output pins diff --git a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp index ebe20b82..fec2fbd5 100644 --- a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp @@ -8,7 +8,7 @@ #include "AboutWindow.hpp" #include "src/ApplicationConfig.hpp" -#include "TargetWidgets/TargetPackageWidget.hpp" +#include "Widgets/TargetWidgets/TargetPackageWidget.hpp" #include "src/Targets/TargetState.hpp" #include "src/Targets/TargetDescriptor.hpp" #include "src/Targets/TargetVariant.hpp" @@ -38,7 +38,7 @@ namespace Bloom QWidget* ioContainerWidget = nullptr; QLabel* ioUnavailableWidget = nullptr; - InsightTargetWidgets::TargetPackageWidget* targetPackageWidget = nullptr; + Widgets::InsightTargetWidgets::TargetPackageWidget* targetPackageWidget = nullptr; QWidget* footer = nullptr; QLabel* targetStatusLabel = nullptr; @@ -86,7 +86,7 @@ namespace Bloom void openReportIssuesUrl(); static void openGettingStartedUrl(); void openAboutWindow(); - void togglePinIoState(InsightTargetWidgets::TargetPinWidget* pinWidget); + void togglePinIoState(Widgets::InsightTargetWidgets::TargetPinWidget* pinWidget); signals: void refreshTargetPinStates(int variantId); diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp similarity index 96% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp index 56cb10f2..d27b2a07 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.cpp @@ -4,7 +4,7 @@ #include "src/Logger/Logger.hpp" #include "src/Exceptions/Exception.hpp" -using namespace Bloom::InsightTargetWidgets::Dip; +using namespace Bloom::Widgets::InsightTargetWidgets::Dip; using namespace Bloom::Exceptions; void BodyWidget::paintEvent(QPaintEvent* event) { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp index d4509d83..8df66388 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/BodyWidget.hpp @@ -2,7 +2,7 @@ #include -namespace Bloom::InsightTargetWidgets::Dip +namespace Bloom::Widgets::InsightTargetWidgets::Dip { class BodyWidget: public QWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.cpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.cpp index d31cdd25..ec62c48e 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.cpp @@ -5,7 +5,7 @@ #include #include -#include "../../InsightWindow.hpp" +#include "../../../InsightWindow.hpp" #include "DualInlinePackageWidget.hpp" #include "src/Logger/Logger.hpp" #include "src/Exceptions/Exception.hpp" @@ -13,7 +13,7 @@ #include "PinWidget.hpp" #include "BodyWidget.hpp" -using namespace Bloom::InsightTargetWidgets::Dip; +using namespace Bloom::Widgets::InsightTargetWidgets::Dip; using namespace Bloom::Exceptions; using Bloom::Targets::TargetVariant; @@ -25,7 +25,7 @@ DualInlinePackageWidget::DualInlinePackageWidget( ): TargetPackageWidget(targetVariant, insightWindowObj, parent) { auto stylesheetFile = QFile(QString::fromStdString( Paths::compiledResourcesPath() - + "/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss" + + "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss" ) ); stylesheetFile.open(QFile::ReadOnly); diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.hpp similarity index 94% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.hpp index 7203d9d3..34ca31a1 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/DualInlinePackageWidget.hpp @@ -10,7 +10,7 @@ #include "BodyWidget.hpp" #include "src/Targets/TargetVariant.hpp" -namespace Bloom::InsightTargetWidgets::Dip +namespace Bloom::Widgets::InsightTargetWidgets::Dip { /** * The DualInlinePackageWidget implements a custom Qt widget for the Dual-inline package target variants. diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.cpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.cpp index 8bd041bf..ba276790 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.cpp @@ -7,7 +7,7 @@ #include "PinBodyWidget.hpp" #include "src/Logger/Logger.hpp" -using namespace Bloom::InsightTargetWidgets::Dip; +using namespace Bloom::Widgets::InsightTargetWidgets::Dip; using namespace Bloom::Targets; void PinBodyWidget::paintEvent(QPaintEvent* event) { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.hpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.hpp index e2c8ce5a..a3f78689 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinBodyWidget.hpp @@ -6,7 +6,7 @@ #include "src/Targets/TargetPinDescriptor.hpp" -namespace Bloom::InsightTargetWidgets::Dip +namespace Bloom::Widgets::InsightTargetWidgets::Dip { class PinBodyWidget: public QWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.cpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.cpp index 1f8efa2d..755d23cc 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.cpp @@ -8,7 +8,7 @@ #include "PinBodyWidget.hpp" #include "src/Logger/Logger.hpp" -using namespace Bloom::InsightTargetWidgets::Dip; +using namespace Bloom::Widgets::InsightTargetWidgets::Dip; using namespace Bloom::Targets; PinWidget::PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant): diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp index c3cce749..93028b4a 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp @@ -7,7 +7,7 @@ #include "PinBodyWidget.hpp" #include "src/Targets/TargetVariant.hpp" -namespace Bloom::InsightTargetWidgets::Dip +namespace Bloom::Widgets::InsightTargetWidgets::Dip { class PinWidget: public TargetPinWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss similarity index 100% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp index f90f8c1c..915687b5 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.cpp @@ -3,7 +3,7 @@ #include "BodyWidget.hpp" #include "src/Logger/Logger.hpp" -using namespace Bloom::InsightTargetWidgets::Qfp; +using namespace Bloom::Widgets::InsightTargetWidgets::Qfp; void BodyWidget::paintEvent(QPaintEvent* event) { auto painter = QPainter(this); diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp index 6bb84109..47fb5f11 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/BodyWidget.hpp @@ -2,7 +2,7 @@ #include -namespace Bloom::InsightTargetWidgets::Qfp +namespace Bloom::Widgets::InsightTargetWidgets::Qfp { class BodyWidget: public QWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.cpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.cpp index 53942eb4..66f8846e 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.cpp @@ -7,7 +7,7 @@ #include "PinBodyWidget.hpp" #include "src/Logger/Logger.hpp" -using namespace Bloom::InsightTargetWidgets::Qfp; +using namespace Bloom::Widgets::InsightTargetWidgets::Qfp; using namespace Bloom::Targets; void PinBodyWidget::paintEvent(QPaintEvent* event) { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp index a6feda8d..92b2ff84 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinBodyWidget.hpp @@ -6,7 +6,7 @@ #include "src/Targets/TargetPinDescriptor.hpp" -namespace Bloom::InsightTargetWidgets::Qfp +namespace Bloom::Widgets::InsightTargetWidgets::Qfp { class PinBodyWidget: public QWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.cpp similarity index 98% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.cpp index 76d30b81..8dd99e94 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.cpp @@ -8,7 +8,7 @@ #include "PinBodyWidget.hpp" #include "src/Logger/Logger.hpp" -using namespace Bloom::InsightTargetWidgets::Qfp; +using namespace Bloom::Widgets::InsightTargetWidgets::Qfp; using namespace Bloom::Targets; PinWidget::PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant): diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp index 8e7e7be9..9c0173d4 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp @@ -7,7 +7,7 @@ #include "PinBodyWidget.hpp" #include "src/Targets/TargetVariant.hpp" -namespace Bloom::InsightTargetWidgets::Qfp +namespace Bloom::Widgets::InsightTargetWidgets::Qfp { class PinWidget: public TargetPinWidget { diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.cpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp index 73a9c8f9..f5c1d206 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp @@ -5,13 +5,13 @@ #include #include -#include "../../InsightWindow.hpp" +#include "../../../InsightWindow.hpp" #include "QuadFlatPackageWidget.hpp" #include "src/Helpers/Paths.hpp" #include "PinWidget.hpp" #include "BodyWidget.hpp" -using namespace Bloom::InsightTargetWidgets::Qfp; +using namespace Bloom::Widgets::InsightTargetWidgets::Qfp; using namespace Bloom::Targets; QuadFlatPackageWidget::QuadFlatPackageWidget( @@ -23,7 +23,7 @@ QuadFlatPackageWidget::QuadFlatPackageWidget( auto stylesheetFile = QFile(QString::fromStdString( Paths::compiledResourcesPath() - + "/src/Insight/UserInterfaces/InsightWindow/TargetWidgets//QFP/Stylesheets/QuadFlatPackage.qss" + + "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets//QFP/Stylesheets/QuadFlatPackage.qss" ) ); stylesheetFile.open(QFile::ReadOnly); @@ -118,7 +118,7 @@ void QuadFlatPackageWidget::drawWidget(QPainter& painter) { auto parentContainerHeight = parentWidget->height(); auto parentContainerWidth = parentWidget->width(); - + auto verticalPinWidgetHeight = PinWidget::MAXIMUM_VERTICAL_HEIGHT; auto verticalPinWidgetWidth = PinWidget::MAXIMUM_VERTICAL_WIDTH; auto horizontalPinWidgetHeight = PinWidget::MAXIMUM_HORIZONTAL_HEIGHT; diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.hpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.hpp index 3b655e6a..96ee18b0 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.hpp @@ -10,7 +10,7 @@ #include "BodyWidget.hpp" #include "src/Targets/TargetVariant.hpp" -namespace Bloom::InsightTargetWidgets::Qfp +namespace Bloom::Widgets::InsightTargetWidgets::Qfp { /** * QuadFlatPackageWidget implements a custom Qt widget for Quad-flat package variants. diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss similarity index 100% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPackageWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp similarity index 95% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPackageWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp index 106b2451..e9b86828 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPackageWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp @@ -9,7 +9,7 @@ #include "src/Targets/TargetVariant.hpp" #include "src/Targets/TargetDescriptor.hpp" -namespace Bloom::InsightTargetWidgets +namespace Bloom::Widgets::InsightTargetWidgets { /** * Each custom target package widget should be derived from this class. diff --git a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp similarity index 97% rename from src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPinWidget.hpp rename to src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp index 23b573ee..c2879930 100644 --- a/src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPinWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp @@ -6,7 +6,7 @@ #include "src/Targets/TargetVariant.hpp" #include "src/Targets/TargetPinDescriptor.hpp" -namespace Bloom::InsightTargetWidgets +namespace Bloom::Widgets::InsightTargetWidgets { class TargetPinWidget: public QWidget { diff --git a/src/resources.qrc b/src/resources.qrc index fe150c9d..18947cb7 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -23,8 +23,8 @@ ./Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss ./Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss - ./Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss - ./Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss + ./Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss + ./Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss ./Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg