From 98a7757e85eb87d48ece6a8bcfd12f3b77e72451 Mon Sep 17 00:00:00 2001 From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> Date: Sat, 29 Mar 2025 13:29:33 -0400 Subject: Layout changes --- gui/gui.cc | 35 +---- gui/gui.h | 27 ++-- gui/gui.ui | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- gui/main.cc | 6 +- 4 files changed, 442 insertions(+), 84 deletions(-) (limited to 'gui') diff --git a/gui/gui.cc b/gui/gui.cc index 9f2405d..5a4c779 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -1,39 +1,14 @@ #include "gui.h" -#include "ui_gui.h" -#include -#include +#include "./ui_gui.h" -Gui::Gui(QWidget *parent) - : QWidget(parent) - , ui(new Ui::gui) +GUI::GUI(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::GUI) { ui->setupUi(this); - loadTxtFile(); } -Gui::~Gui() +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/gui/gui.h b/gui/gui.h index 668fafa..1b700cc 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -1,26 +1,23 @@ #ifndef GUI_H #define GUI_H -#include -namespace Ui -{ -class gui; +#include + +QT_BEGIN_NAMESPACE +namespace Ui { +class GUI; } QT_END_NAMESPACE -class Gui : public QWidget +class GUI : public QMainWindow { - Q_OBJECT - - public: - Gui(QWidget *parent = nullptr); - ~Gui(); + Q_OBJECT - private slots: - void on_pushButton_clicked(); +public: + GUI(QWidget *parent = nullptr); + ~GUI(); - private: - Ui::gui *ui; - void loadTxtFile(); +private: + Ui::GUI *ui; }; #endif // GUI_H diff --git a/gui/gui.ui b/gui/gui.ui index 5f71c91..e32cf48 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -1,54 +1,440 @@ - gui - + GUI + 0 0 - 800 - 600 + 1359 + 606 - gui + RISC V[ECTOR] - + + + + + 50 + 10 + 1202 + 491 + + + + + + + Qt::Vertical + + + + + + + + + + true + + + + Instructions + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + + + + true + + + + Registers + + + + + + + Qt::Horizontal + + + + + + + + + + + + Qt::Horizontal + + + + + + + + + + + + true + + + + Cache + + + + + + + Qt::Horizontal + + + + + + + + + + + + Qt::Vertical + + + + + + + + + + true + + + + DRAM + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + + + Qt::Vertical + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + + + + + true + + + + Upload Files + + + + + + + Qt::Horizontal + + + + + + + + + Upload Instruction File + + + + + + + + + Upload Program State File + + + + + + + + + + + Qt::Horizontal + + + + + + + + + + + + true + + + + Controls + + + + + + + Qt::Horizontal + + + + + + + + + + + Refresh DRAM + + + + + + + Refresh Cache + + + + + + + Refresh Registers + + + + + + + + + + + Enable Pipeline + + + + + + + Enable Cache + + + + + + + + + + + + + + + Qt::Horizontal + + + + + + + + true + + + + Run + + + + + + + Qt::Horizontal + + + + + + + + + + + # Steps + + + + + + + Run Steps + + + + + + + + + Step + + + + + + + + + + + Qt::Horizontal + + + + + + + + + + true + + + + Program State + + + + + + + Qt::Horizontal + + + + + + + Clock Cycles + + + + + + + Save Current Program State + + + + + + + + + + + Qt::Vertical + + + + + + + Qt::Vertical + + + + + + + - 60 - 30 - 317 - 232 + 0 + 0 + 1359 + 26 - - - - - - - keyword - - - - - - - - - - find - - - - - - - - - + diff --git a/gui/main.cc b/gui/main.cc index 4c14fbe..e08eab7 100644 --- a/gui/main.cc +++ b/gui/main.cc @@ -78,9 +78,9 @@ int main(int argc, char **argv) } else { global_log->log(INFO, "Starting QT..."); QApplication a(argc, argv); - Gui w; - w.show(); - a.exec(); + GUI w; + w.show(); + return a.exec(); } global_log->log(INFO, "Cleaning up..."); -- cgit v1.2.3