diff options
author | bd <bdunahu@operationnull.com> | 2025-04-21 14:32:41 -0400 |
---|---|---|
committer | bd <bdunahu@operationnull.com> | 2025-04-21 14:32:41 -0400 |
commit | 89763e6f696a96ad310f031c66960bcaaba3ffdb (patch) | |
tree | 096900955e9c82daf5a069f5a2f1603b3a492e0b | |
parent | 7528ad6291e6521127cf0e2a503be97095246bb0 (diff) |
Restructure GUI layout
-rw-r--r-- | gui/gui.ui | 936 |
1 files changed, 414 insertions, 522 deletions
@@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>1359</width> + <width>1499</width> <height>621</height> </rect> </property> @@ -16,125 +16,313 @@ <widget class="QWidget" name="centralwidget"> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="0,0,0,0,0"> - <item row="0" column="1"> - <layout class="QVBoxLayout" name="verticalLayout_19" stretch="1,0,3"> + <layout class="QGridLayout" name="gridLayout_2" rowstretch="0" columnstretch="0"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="control_separator"> <item> - <layout class="QVBoxLayout" name="verticalLayout_20"> + <layout class="QVBoxLayout" name="storage_pipe_separator"> <item> - <widget class="QLabel" name="label_5"> - <property name="font"> - <font> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Registers</string> - </property> - </widget> - </item> - <item> - <widget class="Line" name="line_25"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - </widget> - </item> - <item> - <widget class="QTextEdit" name="register_table"/> + <layout class="QHBoxLayout" name="storage_view"> + <item> + <layout class="QVBoxLayout" name="registers"> + <item> + <widget class="QLabel" name="label_5"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Registers</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="register_table"/> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="dram"> + <item> + <widget class="QLabel" name="label_10"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>DRAM</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="dram_table"> + <property name="minimumSize"> + <size> + <width>500</width> + <height>0</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="cache"> + <item> + <widget class="QLabel" name="label_6"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Cache</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="cache_table"> + <property name="minimumSize"> + <size> + <width>500</width> + <height>0</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + </layout> </item> - </layout> - </item> - <item> - <widget class="Line" name="line_26"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> <item> - <layout class="QVBoxLayout" name="verticalLayout_21"> + <layout class="QHBoxLayout" name="pipe_view"> <item> - <widget class="QLabel" name="label_6"> - <property name="font"> - <font> - <bold>true</bold> - </font> + <widget class="QGroupBox" name="Fetch"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> </property> - <property name="text"> - <string>Cache</string> + <property name="title"> + <string>Fetch</string> </property> - </widget> - </item> - <item> - <widget class="Line" name="line_27"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="DigitLabel" name="fetch_bits"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="fetch_squashed"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QTextEdit" name="cache_table"> + <widget class="QGroupBox" name="Decode"> <property name="minimumSize"> <size> - <width>500</width> + <width>200</width> <height>0</height> </size> </property> + <property name="title"> + <string>Decode</string> + </property> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="DigitLabel" name="decode_bits"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="decode_squashed"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> - </layout> - </item> - <item> - <widget class="Line" name="line_28"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_22"> <item> - <widget class="QLabel" name="label_10"> - <property name="font"> - <font> - <bold>true</bold> - </font> + <widget class="QGroupBox" name="Execute"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="title"> + <string>Execute</string> </property> - <property name="text"> - <string>DRAM</string> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="DigitLabel" name="execute_s1"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="execute_s2"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="execute_s3"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="execute_mnemonic"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="execute_squashed"> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::TextFormat::MarkdownText</enum> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="Line" name="line_29"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> + <widget class="QGroupBox" name="Memory"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="title"> + <string>Memory</string> + </property> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="DigitLabel" name="memory_s1"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="memory_s2"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="memory_s3"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="memory_mnemonic"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="memory_squashed"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QTextEdit" name="dram_table"> + <widget class="QGroupBox" name="WriteBack"> <property name="minimumSize"> <size> - <width>500</width> + <width>200</width> <height>0</height> </size> </property> + <property name="title"> + <string>Write Back</string> + </property> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="DigitLabel" name="write_s1"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="write_s2"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="DigitLabel" name="write_s3"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="write_mnemonic"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> </item> </layout> </item> - </layout> - </item> - <item row="0" column="3"> - <layout class="QVBoxLayout" name="verticalLayout_23"> <item> - <layout class="QVBoxLayout" name="verticalLayout_26"> + <layout class="QVBoxLayout" name="control_view"> <item> <widget class="QLabel" name="label_13"> <property name="font"> @@ -148,7 +336,7 @@ </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> + <layout class="QHBoxLayout" name="cache_controls"> <property name="sizeConstraint"> <enum>QLayout::SizeConstraint::SetMinimumSize</enum> </property> @@ -160,7 +348,7 @@ </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_9"> + <layout class="QVBoxLayout" name="cache_way_text"> <property name="sizeConstraint"> <enum>QLayout::SizeConstraint::SetMinimumSize</enum> </property> @@ -237,117 +425,194 @@ </layout> </item> <item> - <widget class="Line" name="line_35"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> + <widget class="QCheckBox" name="enable_pipeline_checkbox"> + <property name="text"> + <string>Enable Pipeline</string> </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_27"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <item> - <widget class="QCheckBox" name="enable_pipeline_checkbox"> - <property name="text"> - <string>Enable Pipeline</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </item> - </layout> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_28"> - <item> - <widget class="Line" name="line_36"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> <item> - <widget class="Line" name="line_37"> + <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_29"> + <layout class="QVBoxLayout" name="file_controls"> <item> - <layout class="QVBoxLayout" name="verticalLayout_24"> + <layout class="QVBoxLayout" name="verticalLayout_29"> <item> - <widget class="QLabel" name="label_12"> - <property name="font"> - <font> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Upload Files</string> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout_24"> + <item> + <widget class="QLabel" name="label_12"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Upload Files</string> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_25"> + <item> + <widget class="QPushButton" name="upload_intructions_btn"> + <property name="text"> + <string>Load Instructions</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="upload_program_state_btn"> + <property name="text"> + <string>Upload Program State</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="save_program_state_btn"> + <property name="text"> + <string>Save Program State</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_8"/> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Orientation::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QPushButton" name="config"> + <property name="text"> + <string>Initialize!</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Orientation::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="simulation_controls"> <item> - <widget class="Line" name="line_33"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_13"> + <item> + <widget class="QLabel" name="state_header"> + <property name="font"> + <font> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>State</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="checkBox"> + <property name="text"> + <string>Decimal</string> + </property> + </widget> + </item> + </layout> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_25"> + <layout class="QHBoxLayout" name="horizontalLayout_11"> <item> - <widget class="QPushButton" name="upload_intructions_btn"> + <widget class="QLabel" name="pc"> <property name="text"> - <string>Load Instructions</string> + <string>PC</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="upload_program_state_btn"> + <widget class="DigitLabel" name="p_counter"> <property name="text"> - <string>Upload Program State</string> + <string/> </property> </widget> </item> <item> - <widget class="QPushButton" name="save_program_state_btn"> + <widget class="QLabel" name="cycles"> <property name="text"> - <string>Save Program State</string> + <string>Cycle</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"/> + <widget class="DigitLabel" name="cycle_counter"> + <property name="text"> + <string/> + </property> + </widget> </item> </layout> </item> <item> - <widget class="Line" name="line_7"> + <widget class="QSlider" name="step_slider"> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>6</number> + </property> + <property name="pageStep"> + <number>1</number> + </property> <property name="orientation"> <enum>Qt::Orientation::Horizontal</enum> </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="config"> - <property name="text"> - <string>Initialize!</string> + <property name="tickPosition"> + <enum>QSlider::TickPosition::NoTicks</enum> + </property> + <property name="tickInterval"> + <number>1</number> </property> </widget> </item> <item> - <widget class="Line" name="line_34"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> + <widget class="QPushButton" name="step_btn"> + <property name="minimumSize"> + <size> + <width>400</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>Step 1</string> </property> </widget> </item> @@ -357,381 +622,8 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_38"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - </widget> - </item> </layout> </item> - <item row="1" column="0" colspan="5"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QGroupBox" name="Fetch"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Fetch</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="DigitLabel" name="fetch_bits"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="fetch_squashed"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="Decode"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Decode</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="DigitLabel" name="decode_bits"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="decode_squashed"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="Execute"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Execute</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> - </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <widget class="DigitLabel" name="execute_s1"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="execute_s2"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="execute_s3"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="execute_mnemonic"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="execute_squashed"> - <property name="text"> - <string/> - </property> - <property name="textFormat"> - <enum>Qt::TextFormat::MarkdownText</enum> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="Memory"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Memory</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <widget class="DigitLabel" name="memory_s1"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="memory_s2"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="memory_s3"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="memory_mnemonic"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="memory_squashed"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="Line" name="line_4"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="WriteBack"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Write Back</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> - </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="DigitLabel" name="write_s1"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="write_s2"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="write_s3"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="write_mnemonic"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_13"> - <item> - <widget class="QLabel" name="state_header"> - <property name="font"> - <font> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>State</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBox"> - <property name="text"> - <string>Decimal</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_11"> - <item> - <widget class="QLabel" name="pc"> - <property name="text"> - <string>PC</string> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="p_counter"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="cycles"> - <property name="text"> - <string>Cycle</string> - </property> - </widget> - </item> - <item> - <widget class="DigitLabel" name="cycle_counter"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="Line" name="line_10"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - </widget> - </item> - <item> - <widget class="QSlider" name="step_slider"> - <property name="minimum"> - <number>0</number> - </property> - <property name="maximum"> - <number>6</number> - </property> - <property name="pageStep"> - <number>1</number> - </property> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="tickPosition"> - <enum>QSlider::TickPosition::NoTicks</enum> - </property> - <property name="tickInterval"> - <number>1</number> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="step_btn"> - <property name="minimumSize"> - <size> - <width>400</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string>Step 1</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="Line" name="line_6"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> - </layout> - </item> - <item row="0" column="2"> - <widget class="Line" name="line_5"> - <property name="orientation"> - <enum>Qt::Orientation::Vertical</enum> - </property> - </widget> - </item> </layout> </item> </layout> |