re enabled gui

CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 add_subdirectory(libnfc_cpptools)
 add_subdirectory(cli)
-#add_subdirectory(gui)
+add_subdirectory(gui)
 
 find_package(GTest)
 if (GTEST_FOUND)

gui/CMakeLists.txt

@@ -1,5 +1,6 @@
-include_directories(.)
-include_directories(. ../libnfc_cpptools)
+include_directories(
+        ${LIBNFC_CPPTOOLS_INCLUDE_PATH}
+)
 
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

gui/Core/LibNfcOperation.cpp

@@ -4,8 +4,8 @@
 
 #include "LibNfcOperation.h"
 
-LibNfcOperation::LibNfcOperation(QSharedPointer<LibNfcBusiness>& libNfc,
-                                 std::function<void(QSharedPointer<LibNfcBusiness>)> operation)
+LibNfcOperation::LibNfcOperation(QSharedPointer<LibNfc::Core::LibNfcContext>& libNfc,
+                                 std::function<void(QSharedPointer<LibNfc::Core::LibNfcContext>)> operation)
         : m_pLibNfc(libNfc)
         , m_operation(operation)
 {

gui/Core/LibNfcOperation.h

@@ -9,16 +9,16 @@
 #include <QtCore/QThread>
 #include <QtCore/QSharedPointer>
 
-#include <Business/LibNfcBusiness.h>
+#include <libnfc_cpptools/LibNfcContext.h>
 
 class LibNfcOperation : public QThread
 {
     Q_OBJECT
 public:
     template<typename T>
-    static void runOperation(QSharedPointer<LibNfcBusiness> libNfc,
-                    std::function<Result<T>(QSharedPointer<LibNfcBusiness>)> operation,
-                    std::function<void(Result<T>)> callback);
+    static void runOperation(QSharedPointer<LibNfc::Core::LibNfcContext> libNfc,
+                    std::function<LibNfc::Utils::Result<T>(QSharedPointer<LibNfc::Core::LibNfcContext>)> operation,
+                    std::function<void(LibNfc::Utils::Result<T>)> callback);
 
 protected:
     void run() override;
@@ -27,12 +27,12 @@ protected:
 //    void operationFinished(Result<T> result);
 
 private:
-    explicit LibNfcOperation(QSharedPointer<LibNfcBusiness>& libNfc,
-                             std::function<void(QSharedPointer<LibNfcBusiness>)> operation);
+    explicit LibNfcOperation(QSharedPointer<LibNfc::Core::LibNfcContext>& libNfc,
+                             std::function<void(QSharedPointer<LibNfc::Core::LibNfcContext>)> operation);
 
-    QSharedPointer<LibNfcBusiness> m_pLibNfc;
+    QSharedPointer<LibNfc::Core::LibNfcContext> m_pLibNfc;
 
-    std::function<void(QSharedPointer<LibNfcBusiness>)> m_operation;
+    std::function<void(QSharedPointer<LibNfc::Core::LibNfcContext>)> m_operation;
 };
 
 #endif //MIFARE_TOOLS_LIBNFCOPERATION_H

gui/Core/LibNfcOperation.hxx

@@ -8,17 +8,17 @@
 #include "LibNfcOperation.h"
 
 template<typename T>
-void LibNfcOperation::runOperation(QSharedPointer<LibNfcBusiness> libNfc,
-                          std::function<Result<T>(QSharedPointer<LibNfcBusiness>)> operation,
-                          std::function<void(Result<T>)> callback)
+void LibNfcOperation::runOperation(QSharedPointer<LibNfc::Core::LibNfcContext> libNfc,
+                          std::function<LibNfc::Utils::Result<T>(QSharedPointer<LibNfc::Core::LibNfcContext>)> operation,
+                          std::function<void(LibNfc::Utils::Result<T>)> callback)
 {
-    Result<T>* result = new Result<T>();
-    auto nfcOperation = new LibNfcOperation(libNfc, [result, operation](QSharedPointer<LibNfcBusiness> libNfc)
+    LibNfc::Utils::Result<T>* result = nullptr;
+    auto nfcOperation = new LibNfcOperation(libNfc, [&result, operation](QSharedPointer<LibNfc::Core::LibNfcContext> libNfc)
     {
         auto res = operation(libNfc);
-        *result = res;
+        result = new LibNfc::Utils::Result<T>(res);
     });
-    connect(nfcOperation, &LibNfcOperation::finished, [result, nfcOperation, callback]()
+    connect(nfcOperation, &LibNfcOperation::finished, [&result, nfcOperation, callback]()
     {
         nfcOperation->deleteLater();
         callback(*result);

gui/UI/MainWindow.cpp

@@ -18,7 +18,7 @@ MainWindow::MainWindow(QWidget *parent)
 bool MainWindow::initLibNfc()
 {
     if (!m_pLibNfc) {
-        m_pLibNfc.reset(new LibNfcBusiness());
+        m_pLibNfc.reset(new LibNfc::Core::LibNfcContext());
         auto initResult = m_pLibNfc->init();
         if (!initResult) {
             showError(initResult);
@@ -35,10 +35,10 @@ void MainWindow::refreshReaders()
     }
     m_pUi->pComboReaders->clear();
 
-    LibNfcOperation::runOperation<std::vector<std::shared_ptr<NfcDeviceBusiness>>>(m_pLibNfc, [](QSharedPointer<LibNfcBusiness> libNfc)
+    LibNfcOperation::runOperation<std::vector<std::shared_ptr<LibNfc::Core::NfcDevice>>>(m_pLibNfc, [](QSharedPointer<LibNfc::Core::LibNfcContext> libNfc)
                          {
-                             return (Result<std::vector<std::shared_ptr<NfcDeviceBusiness>>>) libNfc->getDevices();
-                         }, [this](Result<std::vector<std::shared_ptr<NfcDeviceBusiness>>> devicesResult)
+                             return (LibNfc::Utils::Result<std::vector<std::shared_ptr<LibNfc::Core::NfcDevice>>>) libNfc->getDevices();
+                         }, [this](LibNfc::Utils::Result<std::vector<std::shared_ptr<LibNfc::Core::NfcDevice>>> devicesResult)
     {
         m_devices = devicesResult.getData();
         for (auto& device : m_devices) {
@@ -59,7 +59,7 @@ void MainWindow::refreshReaders()
 }
 
 template<typename T>
-void MainWindow::showError(Result<T> result)
+void MainWindow::showError(LibNfc::Utils::Result<T> result)
 {
     result.print();
     QMessageBox::critical(this, "LibNfc Error", QString("LibNfc error: %1").arg(result.getError().c_str()));

gui/UI/MainWindow.h

@@ -7,7 +7,7 @@
 
 
 #include <QtWidgets/QMainWindow>
-#include <Business/LibNfcBusiness.h>
+#include <libnfc_cpptools/LibNfcContext.h>
 
 #include "ui_MainWindow.h"
 
@@ -22,14 +22,14 @@ public:
 
     void refreshReaders();
 
-    template<typename T> void showError(Result<T> result);
+    template<typename T> void showError(LibNfc::Utils::Result<T> result);
 
 private:
     QScopedPointer<Ui_MainWindow> m_pUi;
 
-    QSharedPointer<LibNfcBusiness> m_pLibNfc;
+    QSharedPointer<LibNfc::Core::LibNfcContext> m_pLibNfc;
 
-    std::vector<std::shared_ptr<NfcDeviceBusiness>> m_devices;
+    std::vector<std::shared_ptr<LibNfc::Core::NfcDevice>> m_devices;
 };
 
 

gui/UI/MainWindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>LibNFC_cppTools</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -39,6 +39,9 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
         </widget>
        </item>
        <item>