GPU selection + saving working

Author: BC100Dev

CM_Config/LibraryHandler.cmake

@@ -5,4 +5,6 @@ find_package(Qt6 REQUIRED COMPONENTS Widgets Gui Core)
 
 pkg_check_modules(LIBPCI REQUIRED libpci)
 include_directories(${LIBPCI_INCLUDE_DIRS})
-link_directories(${LIBPCI_LIBRARY_DIRS})
+link_directories(${LIBPCI_LIBRARY_DIRS})
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

Sources/AppGUI/SharedData/UnitSelectorData.hpp

@@ -1,12 +1,13 @@
 #ifndef RUNASGPU_UNITSELECTORDATA_HPP
 #define RUNASGPU_UNITSELECTORDATA_HPP
 
+#include <vector>
+
 #include <RunAsGPU/Shared/GraphicalUnit.hpp>
 
 namespace UnitSelectorData {
 
     extern GraphicalUnit unitSelected;
-    extern GraphicalUnit defaultUnit;
 
 }
 

Sources/AppGUI/UI/MainWindow.cpp

@@ -12,10 +12,12 @@
 #include "Model/AppListModel.hpp"
 #include "Model/AppListDelegate.hpp"
 #include "RunAsGPU/Shared/Shared.hpp"
+#include "UnitSelectorData.hpp"
 
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <algorithm>
 
 namespace fs = std::filesystem;
 
@@ -105,9 +107,10 @@ int get_default_gpu(const std::vector<GraphicalUnit> &gpu_list) {
 }
 
 int gpuUnit;
+std::vector<GraphicalUnit> gpu_list;
 
 void Ui_MainWindow::performLogic(QMainWindow* window) const {
-    std::vector<GraphicalUnit> gpu_list = Runner::ListGraphicalUnits();
+    gpu_list = Runner::ListGraphicalUnits();
     if (gpu_list.empty()) {
         std::cerr << "GPU list empty, exiting..." << std::endl;
         std::abort();
@@ -191,9 +194,23 @@ void Ui_MainWindow::performLogic(QMainWindow* window) const {
         Ui_UnitSelector ui;
         ui.setupUi(&dialog);
 
-        std::vector<GraphicalUnit> gList = Runner::ListGraphicalUnits();
-        ui.gpuList = gList;
-
         int rc = dialog.exec();
+        if (rc == QDialog::Accepted) {
+            auto it = std::find_if(gpu_list.begin(), gpu_list.end(), [&](const GraphicalUnit &gpu) {
+                return gpu.vendor == UnitSelectorData::unitSelected.vendor && gpu.product == UnitSelectorData::unitSelected.product;
+            });
+
+            if (it != gpu_list.end()) {
+                gpuUnit = std::distance(gpu_list.begin(), it);
+
+                if (ui.choiceDefUnit->isChecked()) {
+                    std::cout << "Default GPU selected: " << std::hex << UnitSelectorData::unitSelected.product << std::endl;
+                    save_default_gpu(gpu_list, gpuUnit);
+                }
+
+                labelUnitSelected->setText("Selected GPU: " + QString::fromStdString(UnitSelectorData::unitSelected.fullName));
+            } else
+                QMessageBox::warning(nullptr, "GPU Find Error", "The selected GPU was not found from its list.");
+        }
     });
 }

Sources/AppGUI/UI/MainWindow.hpp

@@ -34,18 +34,18 @@ class Ui_MainWindow
         centralwidget->setObjectName("centralwidget");
         btnRun = new QPushButton(centralwidget);
         btnRun->setObjectName("btnRun");
-        btnRun->setGeometry(QRect(530, 310, 111, 34));
+        btnRun->setGeometry(QRect(540, 310, 111, 34));
         appList = new QListView(centralwidget);
         appList->setObjectName("appList");
         appList->setGeometry(QRect(10, 20, 641, 281));
         appList->setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
         appList->setWordWrap(true);
         btnApplicationAdd = new QPushButton(centralwidget);
         btnApplicationAdd->setObjectName("btnApplicationAdd");
-        btnApplicationAdd->setGeometry(QRect(0, 310, 121, 34));
+        btnApplicationAdd->setGeometry(QRect(10, 310, 121, 34));
         btnUnitSelector = new QPushButton(centralwidget);
         btnUnitSelector->setObjectName("btnUnitSelector");
-        btnUnitSelector->setGeometry(QRect(130, 310, 88, 34));
+        btnUnitSelector->setGeometry(QRect(140, 310, 88, 34));
         labelUnitSelected = new QLabel(centralwidget);
         labelUnitSelected->setObjectName("labelUnitSelected");
         labelUnitSelected->setGeometry(QRect(10, 350, 631, 71));

Sources/AppGUI/UI/MainWindow.ui

@@ -33,13 +33,13 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>RunAsGPU_Icon.png</normaloff>RunAsGPU_Icon.png</iconset>
+    <normaloff>../../../../../.designer/backup/RunAsGPU_Icon.png</normaloff>../../../../../.designer/backup/RunAsGPU_Icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <widget class="QPushButton" name="btnRun">
     <property name="geometry">
      <rect>
-      <x>530</x>
+      <x>540</x>
       <y>310</y>
       <width>111</width>
       <height>34</height>
@@ -68,7 +68,7 @@
    <widget class="QPushButton" name="btnApplicationAdd">
     <property name="geometry">
      <rect>
-      <x>0</x>
+      <x>10</x>
       <y>310</y>
       <width>121</width>
       <height>34</height>
@@ -81,7 +81,7 @@
    <widget class="QPushButton" name="btnUnitSelector">
     <property name="geometry">
      <rect>
-      <x>130</x>
+      <x>140</x>
       <y>310</y>
       <width>88</width>
       <height>34</height>
@@ -103,9 +103,6 @@
     <property name="text">
      <string>Selected GPU: {{UNIT}}</string>
     </property>
-    <property name="wordWrap">
-     <bool>true</bool>
-    </property>
    </widget>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>

Sources/AppGUI/UI/UnitSelector.cpp

@@ -1,7 +1,38 @@
+#include <QStandardItemModel>
+
 #include "UnitSelector.hpp"
+#include "RunAsGPU/Shared/Runner.hpp"
+
+#include <UnitSelectorData.hpp>
+
+std::vector<GraphicalUnit> gpuList;
 
 void Ui_UnitSelector::performLogic() const {
-}
+    self->setFixedSize(self->size());
+
+    gpuList = Runner::ListGraphicalUnits();
+    QStandardItemModel *model = new QStandardItemModel(unit_list);
+
+    for (const auto &gpu : gpuList) {
+        QStandardItem *item = new QStandardItem(QString::fromStdString(gpu.fullName));
+        model->appendRow(item);
+    }
+
+    unit_list->setModel(model);
+    unit_list->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    QObject::connect(choiceSelect, &QDialogButtonBox::accepted, self, [&]() {
+        QModelIndex index = unit_list->currentIndex();
+
+        if (index.isValid()) {
+            int gpuIndex = index.row();
+            UnitSelectorData::unitSelected = gpuList[gpuIndex];
+        } else
+            QMessageBox::warning(self, "GPU Selection", "No GPU selected.");
 
-void Ui_UnitSelector::onItemSelect(bool accept) const {
+        self->accept();
+    });
+    QObject::connect(choiceSelect, &QDialogButtonBox::rejected, self, [&]() {
+        self->reject();
+    });
 }

Sources/AppGUI/UI/UnitSelector.hpp

@@ -16,16 +16,16 @@ QT_BEGIN_NAMESPACE
 
 class Ui_UnitSelector {
 public:
+    QDialog *self;
     QDialogButtonBox *choiceSelect{};
     QListView *unit_list{};
     QCheckBox *choiceDefUnit;
 
-    std::vector<GraphicalUnit> gpuList;
-
     void setupUi(QDialog *UnitSelector) {
         if (UnitSelector->objectName().isEmpty())
             UnitSelector->setObjectName("UnitSelector");
         UnitSelector->resize(400, 300);
+        self = UnitSelector;
         choiceSelect = new QDialogButtonBox(UnitSelector);
         choiceSelect->setObjectName("choiceSelect");
         choiceSelect->setGeometry(QRect(50, 250, 341, 32));
@@ -40,22 +40,6 @@ class Ui_UnitSelector {
         choiceDefUnit->setGeometry(QRect(0, 240, 161, 22));
 
         retranslateUi(UnitSelector);
-        QObject::connect(choiceSelect, &QDialogButtonBox::accepted, UnitSelector, [&]() {
-            QModelIndex index = unit_list->currentIndex();
-
-            if (index.isValid()) {
-                int gpuIndex = index.row();
-                GraphicalUnit unit = gpuList.at(gpuIndex);
-            } else
-                QMessageBox::warning(UnitSelector, "GPU Selection", "No valid GPU selected.");
-
-            onItemSelect(true);
-            UnitSelector->accept();
-        });
-        QObject::connect(choiceSelect, &QDialogButtonBox::rejected, UnitSelector, [&]() {
-            onItemSelect(false);
-            UnitSelector->reject();
-        });
 
         QMetaObject::connectSlotsByName(UnitSelector);
 
@@ -69,8 +53,6 @@ class Ui_UnitSelector {
 
     void performLogic() const;
 
-    void onItemSelect(bool accept) const;
-
 };
 
 namespace Ui {

Sources/AppGUI/UnitSelectorData.cpp

@@ -3,6 +3,5 @@
 namespace UnitSelectorData {
 
     GraphicalUnit unitSelected;
-    GraphicalUnit defaultUnit;
 
 }