From 46c79e6e929ab784eb12417028dd43740b1a561e Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 24 Mar 2025 12:17:41 -0400 Subject: Added gui folder with its own CMake to house GUI+main.cc --- src/gui/gui.cc | 39 -------------------- src/gui/gui.ui | 55 ---------------------------- src/gui/resources.qrc | 6 ---- src/gui/resources/input.txt | 1 - src/logger/logger.cc | 20 +---------- src/main.cc | 88 --------------------------------------------- 6 files changed, 1 insertion(+), 208 deletions(-) delete mode 100644 src/gui/gui.cc delete mode 100644 src/gui/gui.ui delete mode 100644 src/gui/resources.qrc delete mode 100644 src/gui/resources/input.txt delete mode 100644 src/main.cc (limited to 'src') diff --git a/src/gui/gui.cc b/src/gui/gui.cc deleted file mode 100644 index 9f2405d..0000000 --- a/src/gui/gui.cc +++ /dev/null @@ -1,39 +0,0 @@ -#include "gui.h" -#include "ui_gui.h" -#include -#include - -Gui::Gui(QWidget *parent) - : QWidget(parent) - , ui(new Ui::gui) -{ - ui->setupUi(this); - loadTxtFile(); -} - -Gui::~Gui() -{ - delete ui; -} - -void Gui::loadTxtFile(){ - QFile inputFile(":/resources/input.txt"); - inputFile.open(QIODevice::ReadOnly); - - QTextStream in(&inputFile); - QString line = in.readAll(); - inputFile.close(); - - ui->textEdit->setPlainText(line); - QTextCursor cursor = ui->textEdit->textCursor(); - cursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor, 1); -} - -void Gui::on_pushButton_clicked() -{ - QString searchString = ui->lineEdit->text(); - ui->textEdit->find(searchString, QTextDocument::FindWholeWords); -} - - - diff --git a/src/gui/gui.ui b/src/gui/gui.ui deleted file mode 100644 index 5f71c91..0000000 --- a/src/gui/gui.ui +++ /dev/null @@ -1,55 +0,0 @@ - - - gui - - - - 0 - 0 - 800 - 600 - - - - gui - - - - - 60 - 30 - 317 - 232 - - - - - - - - - keyword - - - - - - - - - - find - - - - - - - - - - - - - - diff --git a/src/gui/resources.qrc b/src/gui/resources.qrc deleted file mode 100644 index 8bfd4e7..0000000 --- a/src/gui/resources.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - - resources/input.txt - - diff --git a/src/gui/resources/input.txt b/src/gui/resources/input.txt deleted file mode 100644 index fc1c3cf..0000000 --- a/src/gui/resources/input.txt +++ /dev/null @@ -1 +0,0 @@ -Lorem Ipsum \ No newline at end of file diff --git a/src/logger/logger.cc b/src/logger/logger.cc index 55d7a15..6dfaef1 100644 --- a/src/logger/logger.cc +++ b/src/logger/logger.cc @@ -6,21 +6,8 @@ using namespace std; LogLevel Logger::level = INFO; -ofstream Logger::logFile; Logger *Logger::logger_instance; -Logger::Logger(const string &filename) -{ - if (!filename.empty()) { - logFile.open(filename, ios::app); - if (!logFile.is_open()) { - cerr << "Error opening log file." << endl; - } - } -} - -Logger::~Logger() { logFile.close(); } - void Logger::setLevel(LogLevel level) { level = level; } void Logger::log(LogLevel level, const string &message) @@ -39,17 +26,12 @@ void Logger::log(LogLevel level, const string &message) << message << endl; cout << logEntry.str(); - - if (logFile.is_open()) { - logFile << logEntry.str(); - logFile.flush(); - } } Logger *Logger::getInstance() { if (logger_instance == nullptr) { - logger_instance = new Logger("vector.log"); + logger_instance = new Logger(); } return logger_instance; } diff --git a/src/main.cc b/src/main.cc deleted file mode 100644 index be0a6f0..0000000 --- a/src/main.cc +++ /dev/null @@ -1,88 +0,0 @@ -#include "cli.h" -#include "definitions.h" -#include "gui.h" -#include "logger.h" -#include -#include -#include - -static Logger *global_log = Logger::getInstance(); - -static std::string version_number = "v0.1"; -static std::string banner = - " _/_/_/ _/_/_/ _/_/_/ _/_/_/ \n" - " _/ _/ _/ _/ _/ \n" - " _/_/_/ _/ _/_/ _/ \n" - " _/ _/ _/ _/ _/ \n" - "_/ _/ _/_/_/ _/_/_/ _/_/_/ \n" - " \n" - " \n" - " _/_/ _/_/ \n" - " _/ _/ _/ _/_/_/_/ _/_/_/ _/_/_/_/_/ _/_/ _/_/_/ _/ \n" - " _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ \n" - "_/ _/ _/ _/_/_/ _/ _/ _/ _/ _/_/_/ _/ \n" - " _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ \n" - " _/ _/ _/_/_/_/ _/_/_/ _/ _/_/ _/ _/ _/ \n" - " _/_/ _/_/ "; -static void print_version_number() -{ - std::cout << banner << version_number << '\n'; -} - -static void err() -{ - std::cerr << "Usage:\n\trisc_vector [OPTIONS]\nOptions:\n\t--debug,\t-d: " - "turn on verbose output\n\t--memory-only,\t-m: run the memory " - "simulator only, without a GUI.\n\t--version,\t-v: print the " - "version information and exit\n" - << std::endl; -} - -static void parseArguments(int argc, char **argv, bool &memory_only) -{ - struct option long_options[] = { - {"debug", no_argument, 0, 'd'}, - {"memory-only", no_argument, 0, 'm'}, - {0, 0, 0, 0}}; - - int opt; - - while ((opt = getopt_long(argc, argv, "d:m", long_options, NULL)) != -1) { - switch (opt) { - case 'd': - global_log->setLevel(DEBUG); - global_log->log(DEBUG, "DEBUG output enabled."); - break; - case 'm': - global_log->log(INFO, "Starting the storage CLI interface..."); - memory_only = true; - break; - default: - err(); - exit(EXIT_FAILURE); - } - } -} - -int main(int argc, char **argv) -{ - print_version_number(); - global_log->log(INFO, "Initializing..."); - - bool memory_only = false; - parseArguments(argc, argv, memory_only); - - if (memory_only) { - Cli cli; - cli.run(); - } else { - QApplication a(argc, argv); - Gui w; - w.show(); - return a.exec(); - } - - global_log->log(INFO, "Cleaning up..."); - global_log->log(INFO, "Goodbye!"); - return EXIT_SUCCESS; -} -- cgit v1.2.3