Cleaned up default target variant selection code and some tidying

src/DebugToolDrivers/USB/HID/hidapi.hpp

@@ -4,34 +4,34 @@
 #include <hidapi/hidapi.h>
 
 struct hid_device_ {
-    /* Handle to the actual device. */
+    // Handle to the actual device.
     libusb_device_handle* device_handle;
 
-    /* Endpoint information */
+    // Endpoint information
     int input_endpoint;
     int output_endpoint;
     int input_ep_max_packet_size;
 
-    /* The interface number of the HID */
+    // The interface number of the HID
     int interface;
 
-    /* Indexes of Strings */
+    // Indexes of Strings
     int manufacturer_index;
     int product_index;
     int serial_index;
 
-    /* Whether blocking reads are used */
+    // Whether blocking reads are used
-    int blocking; /* boolean */
+    int blocking; // boolean
 
-    /* Read thread objects */
+    // Read thread objects
     pthread_t thread;
-    pthread_mutex_t mutex; /* Protects input_reports */
+    pthread_mutex_t mutex; // Protects input_reports
     pthread_cond_t condition;
-    pthread_barrier_t barrier; /* Ensures correct startup sequence */
+    pthread_barrier_t barrier; // Ensures correct startup sequence
     int shutdown_thread;
     int cancelled;
     struct libusb_transfer* transfer;
 
-    /* List of received input reports. */
+    // List of received input reports.
     struct input_report* input_reports;
 };

src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp

@@ -82,6 +82,10 @@ void InsightWindow::init(
         );
 
         if (this->isVariantSupported(targetVariant)) {
+            this->supportedVariantsByName.insert(
+                std::pair(QString::fromStdString(targetVariant.name).toLower().toStdString(), targetVariant)
+            );
+
             connect(
                 variantAction,
                 &QAction::triggered,
@@ -100,33 +104,21 @@ void InsightWindow::init(
         this->variantMenu->addAction(variantAction);
     }
 
-    std::copy_if(
+    Logger::debug("Number of target variants supported by Insight: " + std::to_string(supportedVariantsByName.size()));
-        this->targetDescriptor.variants.begin(),
+
-        this->targetDescriptor.variants.end(),
+    if (!this->supportedVariantsByName.empty()) {
-        std::back_inserter(this->supportedVariants),
+        if (!targetConfig.variantName.empty() && this->supportedVariantsByName.contains(targetConfig.variantName)) {
-        [this](auto variant) {
+            // The user has specified a valid variant name in their config file, so use that as the default
-            return this->isVariantSupported(variant);
+            this->selectVariant(&(this->supportedVariantsByName.at(targetConfig.variantName)));
+
+        } else {
+            if (!targetConfig.variantName.empty()) {
+                Logger::error("Invalid target variant name \"" + targetConfig.variantName
+                    + "\" - no such variant with the given name was found.");
             }
-    );
 
-    Logger::debug("Number of target variants supported by Insight: " + std::to_string(supportedVariants.size()));
+            this->selectVariant(&(this->supportedVariantsByName.begin()->second));
-
-    if (!supportedVariants.empty()) {
-        auto selectedVariant = std::find_if(
-            supportedVariants.begin(),
-            supportedVariants.end(),
-            [&targetConfig](const TargetVariant& variant) {
-                auto variantName = QString::fromStdString(variant.name).toLower().toStdString();
-                return !targetConfig.variantName.empty() && targetConfig.variantName == variantName;
         }
-        );
-
-        /*
-         * If ths user specified a valid variant name in their config file, use that as the default, otherwise just
-         * use the first supported variant.
-         */
-        this->selectVariant((selectedVariant != supportedVariants.end()) ? &(*selectedVariant)
-            : &supportedVariants.front());
 
     } else {
         if (this->targetDescriptor.variants.empty()) {

src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp

@@ -47,7 +47,7 @@ namespace Bloom
         QLabel* targetStatusLabel = nullptr;
         QLabel* programCounterValueLabel = nullptr;
 
-        std::vector<TargetVariant> supportedVariants;
+        std::map<std::string, TargetVariant> supportedVariantsByName;
         const TargetVariant* selectedVariant = nullptr;
         bool uiDisabled = false;
 

src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.cpp

@@ -23,7 +23,6 @@ void BodyWidget::drawWidget(QPainter& painter) {
     painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform, true);
 
     // Draw target body
-//    auto targetBodyColor = QColor("#AFB1B3");
     auto targetBodyColor = this->getBodyColor();
     auto backgroundColor = QColor("#3C3F41");
 

src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/BodyWidget.hpp

@@ -11,6 +11,7 @@ namespace Bloom::InsightTargetWidgets::Dip
     Q_PROPERTY(int disableAlphaLevel READ getDisableAlphaLevel WRITE setDisableAlphaLevel DESIGNABLE true)
 
     private:
+        // These properties can be modified via Qt style sheets (see Stylesheets/DualInlinePackage.qss)
         QColor bodyColor = QColor("#AFB1B3");
         int disableAlphaLevel = 100;
 

src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/BodyWidget.hpp

@@ -11,6 +11,7 @@ namespace Bloom::InsightTargetWidgets::Qfp
     Q_PROPERTY(int disableAlphaLevel READ getDisableAlphaLevel WRITE setDisableAlphaLevel DESIGNABLE true)
 
     private:
+        // These properties can be modified via Qt style sheets (see Stylesheets/QuadFlatPackage.qss)
         QColor bodyColor = QColor("#AFB1B3");
         int disableAlphaLevel = 100;
 

src/TargetController/TargetController.hpp

@@ -193,6 +193,7 @@ namespace Bloom
          * @param correlationId
          */
         void emitErrorEvent(int correlationId);
+
     public:
         TargetController(EventManager& eventManager): eventManager(eventManager) {};