From efd9a8935e720922f3b8351c5d169fdc6917d06c Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 2 Apr 2019 08:59:05 -0700 Subject: [PATCH 1/7] Clean-up. --- tools/nitpick/src/TestCreator.cpp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/tools/nitpick/src/TestCreator.cpp b/tools/nitpick/src/TestCreator.cpp index 1e5b15360f..4695ab50de 100644 --- a/tools/nitpick/src/TestCreator.cpp +++ b/tools/nitpick/src/TestCreator.cpp @@ -430,8 +430,9 @@ void TestCreator::createTests(const QString& clientProfile) { parent += "/"; } - _testsRootDirectory = QFileDialog::getExistingDirectory(nullptr, "Please select test root folder", parent, - QFileDialog::ShowDirsOnly); + if (!createAllFilesSetup()) { + return; + } // If user canceled then restore previous selection and return if (_testsRootDirectory == "") { @@ -881,23 +882,12 @@ void TestCreator::createRecursiveScript(const QString& directory, bool interacti } void TestCreator::createTestsOutline() { - QString previousSelection = _testDirectory; - QString parent = previousSelection.left(previousSelection.lastIndexOf('/')); - if (!parent.isNull() && parent.right(1) != "/") { - parent += "/"; - } - - _testDirectory = - QFileDialog::getExistingDirectory(nullptr, "Please select the tests root folder", parent, QFileDialog::ShowDirsOnly); - - // If user canceled then restore previous selection and return - if (_testDirectory == "") { - _testDirectory = previousSelection; + if (!createAllFilesSetup()) { return; } const QString testsOutlineFilename { "testsOutline.md" }; - QString mdFilename(_testDirectory + "/" + testsOutlineFilename); + QString mdFilename(_testsRootDirectory + "/" + testsOutlineFilename); QFile mdFile(mdFilename); if (!mdFile.open(QIODevice::WriteOnly)) { QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Failed to create file " + mdFilename); @@ -911,10 +901,10 @@ void TestCreator::createTestsOutline() { stream << "Directories with an appended (*) have an automatic test\n\n"; // We need to know our current depth, as this isn't given by QDirIterator - int rootDepth { _testDirectory.count('/') }; + int rootDepth { _testsRootDirectory.count('/') }; // Each test is shown as the folder name linking to the matching GitHub URL, and the path to the associated test.md file - QDirIterator it(_testDirectory, QDirIterator::Subdirectories); + QDirIterator it(_testsRootDirectory, QDirIterator::Subdirectories); while (it.hasNext()) { QString directory = it.next(); From 0e0714c3981b62ebf6bac5e6dbbfc085e45c92ae Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 2 Apr 2019 11:57:55 -0700 Subject: [PATCH 2/7] Can detect GPU and set combo default. --- tools/nitpick/src/Nitpick.cpp | 11 +++- tools/nitpick/src/Nitpick.h | 2 +- tools/nitpick/src/Platform.cpp | 115 +++++++++++++++++++++++++++++++++ tools/nitpick/src/Platform.h | 20 ++++++ tools/nitpick/src/common.h | 2 +- tools/nitpick/ui/Nitpick.ui | 45 +++++++------ 6 files changed, 171 insertions(+), 24 deletions(-) create mode 100644 tools/nitpick/src/Platform.cpp create mode 100644 tools/nitpick/src/Platform.h diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp index 02ed120350..a7ec76be8c 100644 --- a/tools/nitpick/src/Nitpick.cpp +++ b/tools/nitpick/src/Nitpick.cpp @@ -9,6 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // #include "Nitpick.h" +#include "Platform.h" #ifdef Q_OS_WIN #include @@ -40,9 +41,15 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) { setWindowTitle("Nitpick - " + nitpickVersion); - clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone"; - _ui.clientProfileComboBox->insertItems(0, clientProfiles); + _GPUVendors << "Nvidia" << "AMD"; + _ui.clientProfileComboBox->insertItems(0, _GPUVendors); + QString gpuVendor = Platform::getGraphicsCardType().toUpper(); + if (gpuVendor.contains("NVIDIA")) { + _ui.clientProfileComboBox->setCurrentIndex(0); + } else { + _ui.clientProfileComboBox->setCurrentIndex(1); + } } Nitpick::~Nitpick() { diff --git a/tools/nitpick/src/Nitpick.h b/tools/nitpick/src/Nitpick.h index 42f55ee8b2..046a07b8f5 100644 --- a/tools/nitpick/src/Nitpick.h +++ b/tools/nitpick/src/Nitpick.h @@ -111,7 +111,7 @@ private: bool _isRunningFromCommandline{ false }; - QStringList clientProfiles; + QStringList _GPUVendors; }; #endif // hifi_Nitpick_h \ No newline at end of file diff --git a/tools/nitpick/src/Platform.cpp b/tools/nitpick/src/Platform.cpp new file mode 100644 index 0000000000..5d1f6798df --- /dev/null +++ b/tools/nitpick/src/Platform.cpp @@ -0,0 +1,115 @@ +// +// Platform.h +// +// Created by Nissim Hadar on 2 Apr 2019. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +#include "Platform.h" + +#include + +#include +#pragma comment(lib, "dxgi.lib") + +QString Platform::getGraphicsCardType() { +#ifdef Q_OS_WIN + IDXGIFactory1* pFactory = nullptr; + HRESULT hr = CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)(&pFactory)); + if (hr != S_OK || pFactory == nullptr) { + return "Unable to create DXGI"; + } + std::vector validAdapterList; + + using AdapterEntry = std::pair, std::vector>; + std::vector adapterToOutputs; + // Enumerate adapters and outputs + { + UINT adapterNum = 0; + IDXGIAdapter1* pAdapter = nullptr; + while (pFactory->EnumAdapters1(adapterNum, &pAdapter) != DXGI_ERROR_NOT_FOUND) { + + // Found an adapter, get descriptor + DXGI_ADAPTER_DESC1 adapterDesc; + pAdapter->GetDesc1(&adapterDesc); + + LARGE_INTEGER version; + hr = pAdapter->CheckInterfaceSupport(__uuidof(IDXGIDevice), &version); + + std::wstring wDescription (adapterDesc.Description); + std::string description(wDescription.begin(), wDescription.end()); + + AdapterEntry adapterEntry; + adapterEntry.first.first = adapterDesc; + adapterEntry.first.second = version; + + + + UINT outputNum = 0; + IDXGIOutput * pOutput; + bool hasOutputConnectedToDesktop = false; + while (pAdapter->EnumOutputs(outputNum, &pOutput) != DXGI_ERROR_NOT_FOUND) { + + // FOund an output attached to the adapter, get descriptor + DXGI_OUTPUT_DESC outputDesc; + pOutput->GetDesc(&outputDesc); + + adapterEntry.second.push_back(outputDesc); + + std::wstring wDeviceName(outputDesc.DeviceName); + std::string deviceName(wDeviceName.begin(), wDeviceName.end()); + + hasOutputConnectedToDesktop |= (bool)outputDesc.AttachedToDesktop; + + pOutput->Release(); + outputNum++; + } + + adapterToOutputs.push_back(adapterEntry); + + // add this adapter to the valid list if has output + if (hasOutputConnectedToDesktop && !adapterEntry.second.empty()) { + validAdapterList.push_back(adapterNum); + } + + pAdapter->Release(); + adapterNum++; + } + } + pFactory->Release(); + + if (!validAdapterList.empty()) { + auto& adapterEntry = adapterToOutputs[validAdapterList.front()]; + + std::wstring wDescription(adapterEntry.first.first.Description); + std::string description(wDescription.begin(), wDescription.end()); + return QString(description.c_str()); + } + +#elif defined Q_OS_MAC + FILE* stream = popen("system_profiler SPDisplaysDataType | grep Chipset", "r"); + + std::ostringstream hostStream; + while (!feof(stream) && !ferror(stream)) { + char buf[128]; + int bytesRead = fread(buf, 1, 128, stream); + hostStream.write(buf, bytesRead); + } + + QString result = QString::fromStdString(hostStream.str()); + QStringList parts = result.split('\n'); + for (int i = 0; i < parts.size(); ++i) { + if (parts[i].toLower().contains("radeon") || parts[i].toLower().contains("nvidia")) { + return parts[i]; + } + } + + // unkown graphics card + return "UNKNOWN"; +#else + return QString("NO IMPLEMENTED"); +#endif + return ""; +} diff --git a/tools/nitpick/src/Platform.h b/tools/nitpick/src/Platform.h new file mode 100644 index 0000000000..da35580554 --- /dev/null +++ b/tools/nitpick/src/Platform.h @@ -0,0 +1,20 @@ +// +// Platform.h +// +// Created by Nissim Hadar on 2 Apr 2019. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +#ifndef hifi_Platform_h +#define hifi_Platform_h + +#include + +class Platform { +public: + static QString getGraphicsCardType(); +}; + +#endif \ No newline at end of file diff --git a/tools/nitpick/src/common.h b/tools/nitpick/src/common.h index 51f1f85113..dfeb557fab 100644 --- a/tools/nitpick/src/common.h +++ b/tools/nitpick/src/common.h @@ -60,5 +60,5 @@ const double R_Y = 0.212655f; const double G_Y = 0.715158f; const double B_Y = 0.072187f; -const QString nitpickVersion{ "v3.1.5" }; +const QString nitpickVersion{ "v3.1.6" }; #endif // hifi_common_h \ No newline at end of file diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui index e1d7699f22..4c98bd639e 100644 --- a/tools/nitpick/ui/Nitpick.ui +++ b/tools/nitpick/ui/Nitpick.ui @@ -56,7 +56,7 @@ 70 - 40 + 120 220 40 @@ -69,7 +69,7 @@ 70 - 180 + 200 220 40 @@ -82,7 +82,7 @@ 320 - 180 + 200 220 40 @@ -94,7 +94,7 @@ - 210 + 320 120 220 40 @@ -108,7 +108,7 @@ 70 - 300 + 360 220 40 @@ -121,7 +121,7 @@ 320 - 300 + 360 220 40 @@ -134,7 +134,7 @@ 70 - 240 + 280 220 40 @@ -147,7 +147,7 @@ 320 - 240 + 280 220 40 @@ -156,16 +156,6 @@ Create all testAuto scripts - - - - 320 - 40 - 120 - 40 - - - @@ -927,14 +917,29 @@ 330 190 - 181 - 51 + 180 + 50 Evaluate Test + + + + 330 + 110 + 180 + 40 + + + + + 16 + + + From 0ace57b3968f2d4a5be2a6633abd6c82337e071a Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 2 Apr 2019 13:04:14 -0700 Subject: [PATCH 3/7] Tested on Mac. --- tools/nitpick/src/Platform.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/nitpick/src/Platform.cpp b/tools/nitpick/src/Platform.cpp index 5d1f6798df..50beb543d4 100644 --- a/tools/nitpick/src/Platform.cpp +++ b/tools/nitpick/src/Platform.cpp @@ -11,8 +11,14 @@ #include +#ifdef Q_OS_WIN #include #pragma comment(lib, "dxgi.lib") +#elif defined Q_OS_MAC +#include +#include +#include +#endif QString Platform::getGraphicsCardType() { #ifdef Q_OS_WIN From a856d107989a24c680f00070d32980ea05ec7c1d Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Wed, 3 Apr 2019 07:39:59 -0700 Subject: [PATCH 4/7] Improved error message. --- tools/nitpick/src/AWSInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nitpick/src/AWSInterface.cpp b/tools/nitpick/src/AWSInterface.cpp index 19697d51dc..82b7dd4f7a 100644 --- a/tools/nitpick/src/AWSInterface.cpp +++ b/tools/nitpick/src/AWSInterface.cpp @@ -480,7 +480,7 @@ void AWSInterface::createEntry(const int index, const QString& testResult, QText if (differenceFileFound) { stream << "\t\t\t\t\n"; } else { - stream << "\t\t\t\t

No Image Found

\n"; + stream << "\t\t\t\t

Image size mismatch

\n"; } stream << "\t\t\t\n"; From 863fce632185b2eb152934021373af84af87e4a2 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Wed, 3 Apr 2019 07:42:00 -0700 Subject: [PATCH 5/7] Change version number. --- tools/nitpick/src/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nitpick/src/common.h b/tools/nitpick/src/common.h index dfeb557fab..dc1ca17d08 100644 --- a/tools/nitpick/src/common.h +++ b/tools/nitpick/src/common.h @@ -60,5 +60,5 @@ const double R_Y = 0.212655f; const double G_Y = 0.715158f; const double B_Y = 0.072187f; -const QString nitpickVersion{ "v3.1.6" }; +const QString nitpickVersion{ "v3.2.0" }; #endif // hifi_common_h \ No newline at end of file From 813d467f4931c03402fab2db2b5b8984bb32cbc1 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Wed, 3 Apr 2019 07:43:07 -0700 Subject: [PATCH 6/7] Ready. --- tools/nitpick/src/Nitpick.cpp | 15 ++++++++------- tools/nitpick/src/Nitpick.h | 12 +++++++----- tools/nitpick/src/TestCreator.cpp | 32 ++++++++++++++++++++----------- tools/nitpick/src/TestCreator.h | 20 +++++++++---------- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp index a7ec76be8c..689200355e 100644 --- a/tools/nitpick/src/Nitpick.cpp +++ b/tools/nitpick/src/Nitpick.cpp @@ -133,13 +133,14 @@ void Nitpick::setup() { ); } -void Nitpick::startTestsEvaluation(const bool isRunningFromCommandLine, - const bool isRunningInAutomaticTestRun, - const QString& snapshotDirectory, - const QString& branch, - const QString& user +void Nitpick::startTestsEvaluation( + const bool isRunningFromCommandLine, + const bool isRunningInAutomaticTestRun, + const QString& snapshotDirectory, + const QString& branch, + const QString& user ) { - _testCreator->startTestsEvaluation(isRunningFromCommandLine, isRunningInAutomaticTestRun, snapshotDirectory, branch, user); + _testCreator->startTestsEvaluation(_ui.clientProfileComboBox, isRunningFromCommandLine, isRunningInAutomaticTestRun, snapshotDirectory, branch, user); } void Nitpick::on_tabWidget_currentChanged(int index) { @@ -257,7 +258,7 @@ void Nitpick::on_showTaskbarPushbutton_clicked() { } void Nitpick::on_evaluateTestsPushbutton_clicked() { - _testCreator->startTestsEvaluation(false, false); + _testCreator->startTestsEvaluation(_ui.clientProfileComboBox, false, false); } void Nitpick::on_closePushbutton_clicked() { diff --git a/tools/nitpick/src/Nitpick.h b/tools/nitpick/src/Nitpick.h index 046a07b8f5..9aa0ea00ba 100644 --- a/tools/nitpick/src/Nitpick.h +++ b/tools/nitpick/src/Nitpick.h @@ -28,11 +28,13 @@ public: void setup(); - void startTestsEvaluation(const bool isRunningFromCommandLine, - const bool isRunningInAutomaticTestRun, - const QString& snapshotDirectory, - const QString& branch, - const QString& user); + void startTestsEvaluation( + const bool isRunningFromCommandLine, + const bool isRunningInAutomaticTestRun, + const QString& snapshotDirectory, + const QString& branch, + const QString& user + ); void automaticTestRunEvaluationComplete(QString zippedFolderName, int numberOfFailures); diff --git a/tools/nitpick/src/TestCreator.cpp b/tools/nitpick/src/TestCreator.cpp index 4695ab50de..693f6085d2 100644 --- a/tools/nitpick/src/TestCreator.cpp +++ b/tools/nitpick/src/TestCreator.cpp @@ -67,7 +67,7 @@ QString TestCreator::zipAndDeleteTestResultsFolder() { return zippedResultsFileName; } -int TestCreator::compareImageLists() { +int TestCreator::compareImageLists(const QString& gpuVendor) { _progressBar->setMinimum(0); _progressBar->setMaximum(_expectedImagesFullFilenames.length() - 1); _progressBar->setValue(0); @@ -108,8 +108,16 @@ int TestCreator::compareImageLists() { }; _mismatchWindow.setTestResult(testResult); - - if (similarityIndex < THRESHOLD_GLOBAL || worstTileValue < THRESHOLD_LOCAL) { + + // Lower threshold for non-Nvidia GPUs + double thresholdGlobal{ 0.9995 }; + double thresholdLocal{ 0.6 }; + if (gpuVendor != "Nvidia") { + thresholdGlobal = 0.97; + thresholdLocal = 0.2; + } + + if (similarityIndex < thresholdGlobal || worstTileValue < thresholdLocal) { if (!isInteractiveMode) { ++numberOfFailures; appendTestResultsToFile(testResult, _mismatchWindow.getComparisonImage(), _mismatchWindow.getSSIMResultsImage(testResult._ssimResults), true); @@ -258,11 +266,13 @@ void::TestCreator::appendTestResultsToFile(QString testResultFilename, bool hasF } } -void TestCreator::startTestsEvaluation(const bool isRunningFromCommandLine, - const bool isRunningInAutomaticTestRun, - const QString& snapshotDirectory, - const QString& branchFromCommandLine, - const QString& userFromCommandLine +void TestCreator::startTestsEvaluation( + QComboBox *gpuVendor, + const bool isRunningFromCommandLine, + const bool isRunningInAutomaticTestRun, + const QString& snapshotDirectory, + const QString& branchFromCommandLine, + const QString& userFromCommandLine ) { _isRunningFromCommandLine = isRunningFromCommandLine; _isRunningInAutomaticTestRun = isRunningInAutomaticTestRun; @@ -332,12 +342,12 @@ void TestCreator::startTestsEvaluation(const bool isRunningFromCommandLine, } _downloader->downloadFiles(expectedImagesURLs, _snapshotDirectory, _expectedImagesFilenames, (void *)this); - finishTestsEvaluation(); + finishTestsEvaluation(gpuVendor->currentText()); } -void TestCreator::finishTestsEvaluation() { +void TestCreator::finishTestsEvaluation(const QString& gpuVendor) { // First - compare the pairs of images - int numberOfFailures = compareImageLists(); + int numberOfFailures = compareImageLists(gpuVendor); // Next - check text results numberOfFailures += checkTextResults(); diff --git a/tools/nitpick/src/TestCreator.h b/tools/nitpick/src/TestCreator.h index e708529ba4..f995c06c94 100644 --- a/tools/nitpick/src/TestCreator.h +++ b/tools/nitpick/src/TestCreator.h @@ -45,13 +45,16 @@ class TestCreator { public: TestCreator(QProgressBar* progressBar, QCheckBox* checkBoxInteractiveMode); - void startTestsEvaluation(const bool isRunningFromCommandLine, - const bool isRunningInAutomaticTestRun, - const QString& snapshotDirectory = QString(), - const QString& branchFromCommandLine = QString(), - const QString& userFromCommandLine = QString()); + void startTestsEvaluation( + QComboBox *gpuVendor, + const bool isRunningFromCommandLine, + const bool isRunningInAutomaticTestRun, + const QString& snapshotDirectory = QString(), + const QString& branchFromCommandLine = QString(), + const QString& userFromCommandLine = QString() + ); - void finishTestsEvaluation(); + void finishTestsEvaluation(const QString& gpuVendor); void createTests(const QString& clientProfile); @@ -79,7 +82,7 @@ public: void createRecursiveScript(); void createRecursiveScript(const QString& directory, bool interactiveMode); - int compareImageLists(); + int compareImageLists(const QString& gpuVendor); int checkTextResults(); QStringList createListOfAll_imagesInDirectory(const QString& imageFormat, const QString& pathToImageDirectory); @@ -124,9 +127,6 @@ private: const QString TEST_RESULTS_FOLDER { "TestResults" }; const QString TEST_RESULTS_FILENAME { "TestResults.txt" }; - const double THRESHOLD_GLOBAL{ 0.9995 }; - const double THRESHOLD_LOCAL { 0.6 }; - QDir _imageDirectory; MismatchWindow _mismatchWindow; From 4f97899045bc12eb3a6d0adf8907f0eb2b85b5bc Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Thu, 4 Apr 2019 11:31:06 -0700 Subject: [PATCH 7/7] Moved position of GPU vendor combo. --- tools/nitpick/src/Nitpick.cpp | 14 +++++----- tools/nitpick/ui/Nitpick.ui | 48 ++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp index 689200355e..16cad8726c 100644 --- a/tools/nitpick/src/Nitpick.cpp +++ b/tools/nitpick/src/Nitpick.cpp @@ -42,13 +42,13 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) { setWindowTitle("Nitpick - " + nitpickVersion); _GPUVendors << "Nvidia" << "AMD"; - _ui.clientProfileComboBox->insertItems(0, _GPUVendors); + _ui.gpuVendorComboBox->insertItems(0, _GPUVendors); QString gpuVendor = Platform::getGraphicsCardType().toUpper(); if (gpuVendor.contains("NVIDIA")) { - _ui.clientProfileComboBox->setCurrentIndex(0); + _ui.gpuVendorComboBox->setCurrentIndex(0); } else { - _ui.clientProfileComboBox->setCurrentIndex(1); + _ui.gpuVendorComboBox->setCurrentIndex(1); } } @@ -140,7 +140,7 @@ void Nitpick::startTestsEvaluation( const QString& branch, const QString& user ) { - _testCreator->startTestsEvaluation(_ui.clientProfileComboBox, isRunningFromCommandLine, isRunningInAutomaticTestRun, snapshotDirectory, branch, user); + _testCreator->startTestsEvaluation(_ui.gpuVendorComboBox, isRunningFromCommandLine, isRunningInAutomaticTestRun, snapshotDirectory, branch, user); } void Nitpick::on_tabWidget_currentChanged(int index) { @@ -152,9 +152,11 @@ void Nitpick::on_tabWidget_currentChanged(int index) { #endif _ui.userLineEdit->setDisabled(false); _ui.branchLineEdit->setDisabled(false); + _ui.gpuVendorComboBox->setDisabled(false); } else { _ui.userLineEdit->setDisabled(true); _ui.branchLineEdit->setDisabled(true); + _ui.gpuVendorComboBox->setDisabled(true); } } @@ -167,7 +169,7 @@ void Nitpick::on_createAllRecursiveScriptsPushbutton_clicked() { } void Nitpick::on_createTestsPushbutton_clicked() { - _testCreator->createTests(_ui.clientProfileComboBox->currentText()); + _testCreator->createTests(_ui.gpuVendorComboBox->currentText()); } void Nitpick::on_createMDFilePushbutton_clicked() { @@ -258,7 +260,7 @@ void Nitpick::on_showTaskbarPushbutton_clicked() { } void Nitpick::on_evaluateTestsPushbutton_clicked() { - _testCreator->startTestsEvaluation(_ui.clientProfileComboBox, false, false); + _testCreator->startTestsEvaluation(_ui.gpuVendorComboBox, false, false); } void Nitpick::on_closePushbutton_clicked() { diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui index 4c98bd639e..bcd0101a4b 100644 --- a/tools/nitpick/ui/Nitpick.ui +++ b/tools/nitpick/ui/Nitpick.ui @@ -925,21 +925,6 @@ Evaluate Test - - - - 330 - 110 - 180 - 40 - - - - - 16 - - - @@ -1191,6 +1176,39 @@ + + + + 450 + 60 + 180 + 40 + + + + + 14 + + + + + + + 505 + 40 + 81 + 16 + + + + + 10 + + + + GPU Vendor + +