Skip to content
Snippets Groups Projects
Commit d2b4cc01 authored by Martin Högstedt's avatar Martin Högstedt
Browse files

merge

parents c685c783 450458f0
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ class Memory(Module):
self.output_s = output_signal
# Internal state
self.memory = [0 for i in range(size)]
self.memory = [0 for _ in range(size)]
self.current_adress = 0
self.is_write = False
......
......@@ -7,6 +7,7 @@ from qtpy.QtWidgets import (
QTextEdit,
QVBoxLayout,
QWidget,
QErrorMessage,
)
from simudator.core.modules import Memory
......@@ -57,6 +58,7 @@ class MiaMemoryGraphicsItem(MemoryGraphicsItem):
def __init__(self, memory_module: Memory, **kwargs):
super().__init__(memory_module, **kwargs)
self.memory_window = None
self.errorMessageWidget = QErrorMessage()
def draw_graphics_item(self) -> None:
# Same as normal memory but no control signal
......@@ -145,6 +147,12 @@ class MiaMemoryGraphicsItem(MemoryGraphicsItem):
)
else:
module_state = self.module.get_state()
module_state['memory'][parsed_adress] = parsed_value
self.module.set_state(module_state)
self.update_graphics_signal.emit()
try:
module_state['memory'][parsed_adress] = parsed_value
except IndexError:
self.errorMessageWidget.showMessage(
"Address entered was larger than memory space. Max address is 0xff"
)
else:
self.module.set_state(module_state)
self.update_graphics_signal.emit()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment