diff --git a/ass2/simulator/.qtcreator/CMakeLists.txt.user b/ass2/simulator/.qtcreator/CMakeLists.txt.user index a58cafe..6edc9fe 100644 --- a/ass2/simulator/.qtcreator/CMakeLists.txt.user +++ b/ass2/simulator/.qtcreator/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -105,16 +105,16 @@ 2 false - -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON --DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} --DCMAKE_GENERATOR:STRING=Ninja --DQT_MAINTENANCE_TOOL:FILEPATH=/home/aljaz/Qt/MaintenanceTool --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} + -DQT_MAINTENANCE_TOOL:FILEPATH=/home/aljaz/Qt/MaintenanceTool -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} +-DCMAKE_BUILD_TYPE:STRING=Debug +-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} +-DCMAKE_GENERATOR:STRING=Ninja +-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON +-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} +-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake +-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} +-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} 0 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug diff --git a/ass2/simulator/CMakeLists.txt b/ass2/simulator/CMakeLists.txt index 6359cf8..cfaed83 100644 --- a/ass2/simulator/CMakeLists.txt +++ b/ass2/simulator/CMakeLists.txt @@ -18,6 +18,7 @@ qt_add_executable(simulator opcode.h opcode.cpp executor.h executor.cpp loader.h loader.cpp + resources.qrc ) diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/index-2025-12-07T10-47-00-0942.json b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply.prev/index-2025-12-07T10-47-00-0942.json similarity index 100% rename from ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/index-2025-12-07T10-47-00-0942.json rename to ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply.prev/index-2025-12-07T10-47-00-0942.json diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-9908d093f7d320a6f887.json b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-aa358c96496ecc5aad2d.json similarity index 91% rename from ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-9908d093f7d320a6f887.json rename to ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-aa358c96496ecc5aad2d.json index 314b4d9..bdf8b0c 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-9908d093f7d320a6f887.json +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/codemodel-v2-aa358c96496ecc5aad2d.json @@ -7,7 +7,7 @@ { "build" : ".", "hasInstallRule" : true, - "jsonFile" : "directory-.-Debug-b087ac99b4952b24d922.json", + "jsonFile" : "directory-.-Debug-d64610240af6ce1dd3c4.json", "minimumCMakeVersion" : { "string" : "3.16" @@ -44,7 +44,7 @@ { "directoryIndex" : 0, "id" : "simulator::@6890427a1f51a3e7e1df", - "jsonFile" : "target-simulator-Debug-edef6bab040a42101471.json", + "jsonFile" : "target-simulator-Debug-5e6084453823b96cc558.json", "name" : "simulator", "projectIndex" : 0 }, diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-b087ac99b4952b24d922.json b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-d64610240af6ce1dd3c4.json similarity index 95% rename from ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-b087ac99b4952b24d922.json rename to ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-d64610240af6ce1dd3c4.json index d92f347..f9257f3 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-b087ac99b4952b24d922.json +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/directory-.-Debug-d64610240af6ce1dd3c4.json @@ -17,13 +17,13 @@ { "command" : 0, "file" : 0, - "line" : 32, + "line" : 33, "parent" : 0 }, { "command" : 0, "file" : 0, - "line" : 43, + "line" : 44, "parent" : 0 } ] diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply.prev/index-2025-12-07T08-37-15-0594.json b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/index-2025-12-10T18-32-37-0499.json similarity index 92% rename from ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply.prev/index-2025-12-07T08-37-15-0594.json rename to ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/index-2025-12-10T18-32-37-0499.json index 73bf779..f1a102c 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply.prev/index-2025-12-07T08-37-15-0594.json +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/index-2025-12-10T18-32-37-0499.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-9908d093f7d320a6f887.json", + "jsonFile" : "codemodel-v2-aa358c96496ecc5aad2d.json", "kind" : "codemodel", "version" : { @@ -77,7 +77,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-9908d093f7d320a6f887.json", + "jsonFile" : "codemodel-v2-aa358c96496ecc5aad2d.json", "kind" : "codemodel", "version" : { diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-edef6bab040a42101471.json b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-5e6084453823b96cc558.json similarity index 97% rename from ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-edef6bab040a42101471.json rename to ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-5e6084453823b96cc558.json index 1874530..288fc37 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-edef6bab040a42101471.json +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.cmake/api/v1/reply/target-simulator-Debug-5e6084453823b96cc558.json @@ -71,13 +71,13 @@ { "command" : 4, "file" : 1, - "line" : 32, + "line" : 33, "parent" : 0 }, { "command" : 5, "file" : 1, - "line" : 24, + "line" : 25, "parent" : 0 }, { @@ -385,8 +385,8 @@ "sourceIndexes" : [ 0, - 15, - 16 + 16, + 17 ] }, { @@ -421,11 +421,18 @@ 4 ] }, + { + "name" : "Resources", + "sourceIndexes" : + [ + 15 + ] + }, { "name" : "CMake Rules", "sourceIndexes" : [ - 17 + 18 ] } ], @@ -515,6 +522,11 @@ "path" : "loader.cpp", "sourceGroupIndex" : 1 }, + { + "backtrace" : 4, + "path" : "resources.qrc", + "sourceGroupIndex" : 4 + }, { "backtrace" : 0, "isGenerated" : true, @@ -531,7 +543,7 @@ "backtrace" : 0, "isGenerated" : true, "path" : "build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp.rule", - "sourceGroupIndex" : 4 + "sourceGroupIndex" : 5 } ], "type" : "EXECUTABLE" diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_deps b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_deps index 0715526..2f28a12 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_deps and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_deps differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_log b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_log index afc2326..3504a88 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_log +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.ninja_log @@ -1,35 +1,60 @@ # ninja log v6 -2 12 1765361495346725311 simulator_autogen/timestamp c193a23cfe79571d -201 1749 1765361130091904622 CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o 5301f473905a545f -13 774 1765361495357725305 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa -2 12 1765361495346725311 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d -1679 1911 1765361497023724460 simulator 53725ab159343a13 +2309 2585 1765391447352614831 simulator 53725ab159343a13 17 296 1765301640842310980 CMakeFiles/simulator.dir/device.cpp.o 36fc5c8cf014f45b -201 1400 1765361130091904622 CMakeFiles/simulator.dir/main.cpp.o 9ebba9b7abc4cbf1 -2 12 1765361495346725311 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 15 1765391445045619892 simulator_autogen/timestamp c193a23cfe79571d +13 775 1765391004094460465 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa +206 1341 1765388632939713585 CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o 5301f473905a545f +3 15 1765391445045619892 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +206 1793 1765388632939713585 CMakeFiles/simulator.dir/main.cpp.o 9ebba9b7abc4cbf1 12 22 1765010490368890036 CMakeFiles/simulator.dir/opcode.cpp.o da65f589ec5e1f76 +3 15 1765391445045619892 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d 298 641 1765351736928284389 CMakeFiles/simulator.dir/loader.cpp.o 8371bb969cd708a5 -13 202 1765352834796852714 CMakeFiles/simulator.dir/machine.cpp.o 7030a03f8cbf1ad0 -13 1679 1765361495357725305 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 -2 12 1765361495346725311 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -3 13 1765361566371689115 simulator_autogen/timestamp c193a23cfe79571d -3 13 1765361566371689115 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -3 13 1765361566371689115 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d -3 13 1765361566371689115 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -13 788 1765361566381689110 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa -13 1669 1765361566381689110 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 -1669 1914 1765361568037688263 simulator 53725ab159343a13 -4 15 1765361868707411424 simulator_autogen/timestamp c193a23cfe79571d -4 15 1765361868707411424 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -4 15 1765361868707411424 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d -4 15 1765361868707411424 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -16 1053 1765361868719411410 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa -15 1979 1765361868718411411 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 -1979 2215 1765361870682409023 simulator 53725ab159343a13 -4 14 1765361903697369524 simulator_autogen/timestamp c193a23cfe79571d -4 14 1765361903697369524 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -4 14 1765361903697369524 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d -4 14 1765361903697369524 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d -14 786 1765361903706369513 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa -14 1768 1765361903706369513 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 -1768 2018 1765361905461367446 simulator 53725ab159343a13 +14 290 1765388413560525375 CMakeFiles/simulator.dir/machine.cpp.o 7030a03f8cbf1ad0 +15 2309 1765391445058619863 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +3 15 1765391445045619892 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 244 1765391661065278121 simulator_autogen/timestamp c193a23cfe79571d +3 244 1765391661065278121 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 244 1765391661065278121 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +3 244 1765391661065278121 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +244 1878 1765391661070278116 CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o 5301f473905a545f +244 2352 1765391661070278116 CMakeFiles/simulator.dir/main.cpp.o 9ebba9b7abc4cbf1 +244 2999 1765391661070278116 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +2999 3246 1765391663825275257 simulator 53725ab159343a13 +2 13 1765391675220263773 simulator_autogen/timestamp c193a23cfe79571d +2 13 1765391675220263773 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +2 13 1765391675220263773 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +2 13 1765391675220263773 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +13 1850 1765391675231263762 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1850 2084 1765391677068261961 simulator 53725ab159343a13 +2 13 1765391743406206014 simulator_autogen/timestamp c193a23cfe79571d +2 13 1765391743406206014 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +2 13 1765391743406206014 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +2 13 1765391743406206014 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +13 1956 1765391743417206006 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1956 2190 1765391745360204622 simulator 53725ab159343a13 +3 19 1765391803656169255 simulator_autogen/timestamp c193a23cfe79571d +3 19 1765391803656169255 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 19 1765391803656169255 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +3 19 1765391803656169255 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +19 1599 1765391803672169247 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1599 1838 1765391805252168448 simulator 53725ab159343a13 +3 14 1765392232130182156 simulator_autogen/timestamp c193a23cfe79571d +3 14 1765392232130182156 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 14 1765392232130182156 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +3 14 1765392232130182156 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +14 1687 1765392232141182161 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1687 1928 1765392233814182895 simulator 53725ab159343a13 +2 12 1765392380808261413 simulator_autogen/timestamp c193a23cfe79571d +2 12 1765392380808261413 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +2 12 1765392380808261413 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +2 12 1765392380808261413 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +12 801 1765392380818261419 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa +12 1711 1765392380818261419 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1711 1966 1765392382517262473 simulator 53725ab159343a13 +3 13 1765392399220272998 simulator_autogen/timestamp c193a23cfe79571d +3 13 1765392399220272998 simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +3 13 1765392399220272998 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/timestamp c193a23cfe79571d +3 13 1765392399220272998 /home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/mocs_compilation.cpp c193a23cfe79571d +14 843 1765392399231273005 CMakeFiles/simulator.dir/executor.cpp.o 8cd2a28f3c211eaa +13 1798 1765392399230273005 CMakeFiles/simulator.dir/mainwindow.cpp.o e3901bb2e4f9b516 +1798 2041 1765392401015274146 simulator 53725ab159343a13 diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/executor.cpp.49C8014B8C305999.idx b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/executor.cpp.49C8014B8C305999.idx index 4bb6a34..1b2b1c8 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/executor.cpp.49C8014B8C305999.idx and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/executor.cpp.49C8014B8C305999.idx differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/machine.cpp.FD5DF53B10242751.idx b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/machine.cpp.FD5DF53B10242751.idx index 487c81b..05b4f66 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/machine.cpp.FD5DF53B10242751.idx and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/machine.cpp.FD5DF53B10242751.idx differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.FDDFA08D245238F2.idx b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.FDDFA08D245238F2.idx index b640de0..2a133b9 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.FDDFA08D245238F2.idx and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.FDDFA08D245238F2.idx differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.D9F0255162152630.idx b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.D9F0255162152630.idx index b1deb17..4a73242 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.D9F0255162152630.idx and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.D9F0255162152630.idx differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.F0588D34DB904819.idx b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.F0588D34DB904819.idx index dcc0756..a7cb150 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.F0588D34DB904819.idx and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.F0588D34DB904819.idx differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/executor.cpp.o b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/executor.cpp.o index 4e97604..df08a38 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/executor.cpp.o and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/executor.cpp.o differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/machine.cpp.o b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/machine.cpp.o index 9626e69..dc40cd4 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/machine.cpp.o and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/machine.cpp.o differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/main.cpp.o b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/main.cpp.o index 1e06c94..50857ba 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/main.cpp.o and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/main.cpp.o differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/mainwindow.cpp.o b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/mainwindow.cpp.o index 0cf6d62..ef48a53 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/mainwindow.cpp.o and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/mainwindow.cpp.o differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o index 20768bf..035711e 100644 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator.dir/simulator_autogen/mocs_compilation.cpp.o differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator_autogen.dir/ParseCache.txt b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator_autogen.dir/ParseCache.txt index a459472..b29bfb2 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator_autogen.dir/ParseCache.txt +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/CMakeFiles/simulator_autogen.dir/ParseCache.txt @@ -1,8 +1,6 @@ # Generated by CMake. Changes will be overwritten. -/home/aljaz/Desktop/spo/ass2/simulator/opcode.cpp -/home/aljaz/Desktop/spo/ass2/simulator/device.cpp -/home/aljaz/Desktop/spo/ass2/simulator/mainwindow.cpp - uic:ui_mainwindow.h +/home/aljaz/Desktop/spo/ass2/simulator/executor.cpp +/home/aljaz/Desktop/spo/ass2/simulator/loader.h /home/aljaz/Desktop/spo/ass2/simulator/executor.h mmc:Q_OBJECT mdp:/home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/moc_predefs.h @@ -366,11 +364,14 @@ mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stdarg.h mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stdbool.h mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stddef.h -/home/aljaz/Desktop/spo/ass2/simulator/loader.h -/home/aljaz/Desktop/spo/ass2/simulator/executor.cpp +/home/aljaz/Desktop/spo/ass2/simulator/mainwindow.cpp + uic:ui_mainwindow.h +/home/aljaz/Desktop/spo/ass2/simulator/device.cpp +/home/aljaz/Desktop/spo/ass2/simulator/opcode.cpp /home/aljaz/Desktop/spo/ass2/simulator/main.cpp -/home/aljaz/Desktop/spo/ass2/simulator/opcode.h -/home/aljaz/Desktop/spo/ass2/simulator/machine.cpp +/home/aljaz/Desktop/spo/ass2/simulator/device.h +/home/aljaz/Desktop/spo/ass2/simulator/loader.cpp +/home/aljaz/Desktop/spo/ass2/simulator/machine.h /home/aljaz/Desktop/spo/ass2/simulator/mainwindow.h mmc:Q_OBJECT mdp:/home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/moc_predefs.h @@ -844,6 +845,5 @@ mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stdarg.h mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stdbool.h mdp:/usr/lib/gcc/x86_64-linux-gnu/13/include/stddef.h -/home/aljaz/Desktop/spo/ass2/simulator/machine.h -/home/aljaz/Desktop/spo/ass2/simulator/loader.cpp -/home/aljaz/Desktop/spo/ass2/simulator/device.h +/home/aljaz/Desktop/spo/ass2/simulator/machine.cpp +/home/aljaz/Desktop/spo/ass2/simulator/opcode.h diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/Testing/Temporary/LastTest.log b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/Testing/Temporary/LastTest.log index ee8d16d..ef934b2 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/Testing/Temporary/LastTest.log +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 10 17:54 CET +Start testing: Dec 10 19:32 CET ---------------------------------------------------------- -End testing: Dec 10 17:54 CET +End testing: Dec 10 19:32 CET diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator index d97c872..cc66c1e 100755 Binary files a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator and b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator differ diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/EWIEGA46WW/moc_mainwindow.cpp b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/EWIEGA46WW/moc_mainwindow.cpp index 86d6790..e2b07e0 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/EWIEGA46WW/moc_mainwindow.cpp +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/EWIEGA46WW/moc_mainwindow.cpp @@ -52,7 +52,8 @@ template <> constexpr inline auto MainWindow::qt_create_metaobjectdata constexpr inline auto MainWindow::qt_create_metaobjectdata(13, 2, QMC::AccessPrivate, QMetaType::Void), // Slot 'setStatusLightEnded' QtMocHelpers::SlotData(14, 2, QMC::AccessPrivate, QMetaType::Void), + // Slot 'on_menuVizitka_triggered' + QtMocHelpers::SlotData(15, 2, QMC::AccessPrivate, QMetaType::Void), }; QtMocHelpers::UintData qt_properties { }; @@ -118,6 +121,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 10: _t->setStatusLightRunning(); break; case 11: _t->setStatusLightStopped(); break; case 12: _t->setStatusLightEnded(); break; + case 13: _t->on_menuVizitka_triggered(); break; default: ; } } @@ -150,14 +154,14 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) + if (_id < 14) qt_static_metacall(this, _c, _id, _a); - _id -= 13; + _id -= 14; } if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 13) + if (_id < 14) *reinterpret_cast(_a[0]) = QMetaType(); - _id -= 13; + _id -= 14; } return _id; } diff --git a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/include/ui_mainwindow.h b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/include/ui_mainwindow.h index 5ab696b..e01a744 100644 --- a/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/include/ui_mainwindow.h +++ b/ass2/simulator/build/Desktop_Qt_6_10_1-Debug/simulator_autogen/include/ui_mainwindow.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -51,8 +52,10 @@ public: QLabel *label_8; QGroupBox *groupBox_2; QLabel *labelX; + QLabel *label_10; QGroupBox *groupBox_3; QLabel *labelSW; + QLabel *label_11; QWidget *layoutWidget; QVBoxLayout *verticalLayout; QLabel *label; @@ -81,6 +84,9 @@ public: if (MainWindow->objectName().isEmpty()) MainWindow->setObjectName("MainWindow"); MainWindow->resize(902, 757); + QIcon icon; + icon.addFile(QString::fromUtf8("logo.png"), QSize(), QIcon::Mode::Normal, QIcon::State::Off); + MainWindow->setWindowIcon(icon); actionExit = new QAction(MainWindow); actionExit->setObjectName("actionExit"); centralwidget = new QWidget(MainWindow); @@ -135,13 +141,19 @@ public: groupBox_2->setGeometry(QRect(10, 330, 161, 80)); labelX = new QLabel(groupBox_2); labelX->setObjectName("labelX"); - labelX->setGeometry(QRect(30, 30, 58, 15)); + labelX->setGeometry(QRect(20, 50, 58, 15)); + label_10 = new QLabel(groupBox_2); + label_10->setObjectName("label_10"); + label_10->setGeometry(QRect(20, 30, 58, 15)); groupBox_3 = new QGroupBox(centralwidget); groupBox_3->setObjectName("groupBox_3"); groupBox_3->setGeometry(QRect(20, 460, 161, 80)); labelSW = new QLabel(groupBox_3); labelSW->setObjectName("labelSW"); - labelSW->setGeometry(QRect(30, 30, 58, 15)); + labelSW->setGeometry(QRect(10, 50, 58, 15)); + label_11 = new QLabel(groupBox_3); + label_11->setObjectName("label_11"); + label_11->setGeometry(QRect(10, 30, 58, 15)); layoutWidget = new QWidget(centralwidget); layoutWidget->setObjectName("layoutWidget"); layoutWidget->setGeometry(QRect(240, 20, 541, 641)); @@ -268,8 +280,10 @@ public: label_8->setText(QCoreApplication::translate("MainWindow", "F", nullptr)); groupBox_2->setTitle(QCoreApplication::translate("MainWindow", "Indeksni register", nullptr)); labelX->setText(QCoreApplication::translate("MainWindow", "labelX", nullptr)); + label_10->setText(QCoreApplication::translate("MainWindow", "X", nullptr)); groupBox_3->setTitle(QCoreApplication::translate("MainWindow", "Statusni register", nullptr)); labelSW->setText(QCoreApplication::translate("MainWindow", "labelSW", nullptr)); + label_11->setText(QCoreApplication::translate("MainWindow", "SW", nullptr)); label->setText(QCoreApplication::translate("MainWindow", "Pomnilnik", nullptr)); addressLineEdit->setText(QString()); addressLineEdit->setPlaceholderText(QCoreApplication::translate("MainWindow", "Pomnilniski naslov", nullptr)); diff --git a/ass2/simulator/executor.cpp b/ass2/simulator/executor.cpp index d930f6c..fbeedb9 100644 --- a/ass2/simulator/executor.cpp +++ b/ass2/simulator/executor.cpp @@ -26,7 +26,7 @@ void Executor::start() { emit signalEnded(); break; } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); } } @@ -55,21 +55,21 @@ void Executor::step() { emit signalEnded(); return; } + emit signalStarted(); + int pc_before = machine->getPC(); - - // Izvedi en ukaz machine->execute(); - int pc_after = machine->getPC(); - emit updateRequested(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - emit signalStopped(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - // Če PC ostane isti → neskončna zanka → HALT + emit updateRequested(); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + emit signalStopped(); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + if (pc_after == pc_before) { ended = true; emit signalEnded(); } } + diff --git a/ass2/simulator/logo.png b/ass2/simulator/logo.png new file mode 100644 index 0000000..a5e26f8 Binary files /dev/null and b/ass2/simulator/logo.png differ diff --git a/ass2/simulator/machine.cpp b/ass2/simulator/machine.cpp index 49efca2..5560732 100644 --- a/ass2/simulator/machine.cpp +++ b/ass2/simulator/machine.cpp @@ -2,7 +2,6 @@ #include "device.h" #include "opcode.h" #include - using namespace std; Machine::Machine() { diff --git a/ass2/simulator/mainwindow.cpp b/ass2/simulator/mainwindow.cpp index 535702f..03b4061 100644 --- a/ass2/simulator/mainwindow.cpp +++ b/ass2/simulator/mainwindow.cpp @@ -2,29 +2,38 @@ #include "ui_mainwindow.h" #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) { ui->setupUi(this); + QGuiApplication::setWindowIcon(QIcon("logo.png")); QAction *actionLoad = new QAction(tr("Load"), this); ui->menuLoad->addAction(actionLoad); + executor = new Executor(&machine); executorThread = new QThread(this); - executor.moveToThread(executorThread); - connect(this, &MainWindow::startExecutor, &executor, &Executor::start); - connect(this, &MainWindow::stopExecutor, &executor, &Executor::stop); - connect(this, &MainWindow::stepExecutor, &executor, &Executor::step); + + executor->moveToThread(executorThread); + + connect(this, &MainWindow::startExecutor, executor, &Executor::start, Qt::QueuedConnection); + connect(this, &MainWindow::stopExecutor, executor, &Executor::stop, Qt::QueuedConnection); + connect(this, &MainWindow::stepExecutor, executor, &Executor::step, Qt::QueuedConnection); + + connect(executor, &Executor::updateRequested, this, &MainWindow::updateUI, Qt::QueuedConnection); + connect(executor, &Executor::signalStarted, this, &MainWindow::setStatusLightRunning, Qt::QueuedConnection); + connect(executor, &Executor::signalStopped, this, &MainWindow::setStatusLightStopped, Qt::QueuedConnection); + connect(executor, &Executor::signalEnded, this, &MainWindow::setStatusLightEnded, Qt::QueuedConnection); + executorThread->start(); - connect(&executor, &Executor::updateRequested, this, &MainWindow::updateUI); - connect(&executor, &Executor::signalStarted, this, &MainWindow::setStatusLightRunning); - connect(&executor, &Executor::signalStopped, this, &MainWindow::setStatusLightStopped); - connect(&executor, &Executor::signalEnded, this, &MainWindow::setStatusLightEnded); + + connect(ui->menuVizitka, &QMenu::aboutToShow, this, &MainWindow::on_menuVizitka_triggered); connect(actionLoad, &QAction::triggered, this, &MainWindow::onLoadTriggered); - connect(ui->runButton, &QPushButton::clicked, this, &MainWindow::on_runButton_clicked); - connect(ui->stepButton, &QPushButton::clicked, this, &MainWindow::on_stepButton_clicked); + //connect(ui->runButton, &QPushButton::clicked, this, &MainWindow::on_runButton_clicked); + //connect(ui->stepButton, &QPushButton::clicked, this, &MainWindow::on_stepButton_clicked); updateUI(); ui->statusLight->setFixedSize(16,16); @@ -66,6 +75,7 @@ MainWindow::~MainWindow() { executorThread->quit(); executorThread->wait(); + delete executor; delete ui; } @@ -114,7 +124,7 @@ void MainWindow::updateUI() void MainWindow::onLoadTriggered() { machine.resetRegisters(); machine.resetMemory(); - executor.resetProgram(); + executor->resetProgram(); updateUI(); QString filename = QFileDialog::getOpenFileName(this, tr("Open Object File"), "", tr("Object Files (*.obj)")); if (!filename.isEmpty()) { @@ -162,7 +172,6 @@ void MainWindow::on_stopButton_clicked() emit stopExecutor(); } - void MainWindow::setStatusLightRunning() { ui->statusLight->setStyleSheet("background-color: green; border-radius: 8px;"); } @@ -174,3 +183,16 @@ void MainWindow::setStatusLightStopped() { void MainWindow::setStatusLightEnded() { ui->statusLight->setStyleSheet("background-color: black; border-radius: 8px;"); } + +void MainWindow::on_menuVizitka_triggered() +{ + QMessageBox::information( + this, + "Vizitka", + "Aljaž Brodar\n" + "Sistemska programska oprema\n" + "Simulator SIC/XE\n" + "2025\n" + ); +} + diff --git a/ass2/simulator/mainwindow.h b/ass2/simulator/mainwindow.h index 6eb0a11..7afb285 100644 --- a/ass2/simulator/mainwindow.h +++ b/ass2/simulator/mainwindow.h @@ -33,6 +33,7 @@ private slots: void setStatusLightRunning(); void setStatusLightStopped(); void setStatusLightEnded(); + void on_menuVizitka_triggered(); signals: void startExecutor(); void stopExecutor(); @@ -42,7 +43,7 @@ private: Ui::MainWindow *ui; Loader loader; Machine machine; - Executor executor{ &machine }; + Executor* executor; QThread* executorThread; QTimer* uiUpdateTimer; }; diff --git a/ass2/simulator/mainwindow.ui b/ass2/simulator/mainwindow.ui index 0ffcf8f..6679821 100644 --- a/ass2/simulator/mainwindow.ui +++ b/ass2/simulator/mainwindow.ui @@ -13,6 +13,10 @@ Simulator + + + logo.pnglogo.png + @@ -224,8 +228,8 @@ - 30 - 30 + 20 + 50 58 15 @@ -234,6 +238,19 @@ labelX + + + + 20 + 30 + 58 + 15 + + + + X + + @@ -250,8 +267,8 @@ - 30 - 30 + 10 + 50 58 15 @@ -260,6 +277,19 @@ labelSW + + + + 10 + 30 + 58 + 15 + + + + SW + +