sani7/remote-ui
1
0
Fork 0
mirror of https://github.com/Sani7/remote-ui.git synced 2026-10-27 06:01:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

factory idea for wasm

Browse Source 
cleanup
remove unused defines
This commit is contained in:
sani7
2026-04-12 13:42:02 +02:00
parent 59f7680f94
commit 8ce89a3076
16 changed files with 113 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/mainwindow.cpp
+13 -27
View File
@@ -1,4 +1,5 @@
#include "mainwindow.hpp"
#include "factory.hpp"
#include "ui_base.hpp"
#include "ui_mainwindow.h"
#include "web_socket_wrapper.hpp"
@@ -9,8 +10,6 @@
#include <magic_enum/magic_enum.hpp>
#include <spdlog/spdlog.h>
typedef UI_base *(*Get_UI)(Web_socket_wrapper *, QWidget *);
MainWindow::MainWindow(QUrl ws_url, QString sim, QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow), m_error(new QMessageBox()),
m_web_socket(new Web_socket_wrapper(ws_url))
@@ -23,33 +22,19 @@ MainWindow::MainWindow(QUrl ws_url, QString sim, QWidget *parent)
(spdlog::level::level_enum)level, msg.toStdString());
});
QDirIterator it(QCoreApplication::applicationDirPath(), QStringList() << "*libui_*.so" << "*libui_*.dll",
QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext())
for (const QString &name : UIFactory::instance().keys())
{
QLibrary lib;
lib.setFileName(it.next());
lib.load();
auto loaded_ui = Get_UI(lib.resolve("get_ui"));
if (loaded_ui == nullptr)
if (auto *w = UIFactory::instance().create(name, m_web_socket.get(), this))
{
SPDLOG_INFO("{} NOT FOUND", lib.fileName().toStdString());
lib.unload();
continue;
w->set_name(name);
m_sims.insert(std::make_pair(name, w));
connect(w, &UI_base::log_signal, this,
[](const char *filename_in, int line_in, const char *funcname_in, int level, QString msg) {
if (spdlog::default_logger_raw()->should_log((spdlog::level::level_enum)level))
spdlog::default_logger_raw()->log(spdlog::source_loc{filename_in, line_in, funcname_in},
(spdlog::level::level_enum)level, msg.toStdString());
});
}
auto widget = loaded_ui(m_web_socket.get(), this);
if (widget == nullptr)
{
lib.unload();
continue;
}
m_sims.insert(std::make_pair(widget->name(), widget));
connect(widget, &UI_base::log_signal, this,
[](const char *filename_in, int line_in, const char *funcname_in, int level, QString msg) {
if (spdlog::default_logger_raw()->should_log((spdlog::level::level_enum)level))
spdlog::default_logger_raw()->log(spdlog::source_loc{filename_in, line_in, funcname_in},
(spdlog::level::level_enum)level, msg.toStdString());
});
}
// Insert debug sims here
@@ -103,7 +88,8 @@ void MainWindow::pase_sim_names(json &sims)
{
for (json &item : sims)
{
ui->comboBox->addItem(QString::fromStdString(item));
if (m_sims.contains(QString::fromStdString(item)))
ui->comboBox->addItem(QString::fromStdString(item));
}
QThread::msleep(30);