From 3c7274ebb2b7cffdcae2d538af99f9c7aa595ee3 Mon Sep 17 00:00:00 2001 From: Pablo Parra Date: Tue, 12 Dec 2017 16:37:22 +0100 Subject: [PATCH] Minor fix Now the log lines are displayed with the proper colours. --- package.json | 2 +- .../events-log-viewer.component.ts | 34 +++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4bd986d..ded98f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "asm-simulator", - "version": "1.4.0", + "version": "1.4.1", "license": "MIT", "scripts": { "ng": "ng", diff --git a/src/app/events-log-viewer/events-log-viewer.component.ts b/src/app/events-log-viewer/events-log-viewer.component.ts index 18618f9..8a84f10 100644 --- a/src/app/events-log-viewer/events-log-viewer.component.ts +++ b/src/app/events-log-viewer/events-log-viewer.component.ts @@ -56,6 +56,36 @@ export class EventsLogViewerComponent implements AfterViewInit { private eventGroups: Array = []; + private static getStyle(systemEvent: SystemEvent): string { + + let ret; + + if (systemEvent instanceof MemoryOperation) { + ret = 'memory-event'; + } else if (systemEvent instanceof ControlUnitOperation) { + ret = 'control-unit-event'; + } else if (systemEvent instanceof ALUOperation) { + ret = 'aluevent'; + } else if (systemEvent instanceof CPURegisterOperation) { + ret = 'cpuregister-event'; + } else if (systemEvent instanceof IORegisterOperation) { + ret = 'ioregister-event'; + } else if (systemEvent instanceof IrqCtrlOperation) { + ret = 'irq-ctrl-event'; + } else if (systemEvent instanceof TimerOperation) { + ret = 'timer-event'; + } else if (systemEvent instanceof VisualDisplayOperation) { + ret = 'visual-display-event'; + } else if (systemEvent instanceof TextualDisplayOperation) { + ret = 'textual-display-event'; + } else if (systemEvent instanceof KeypadOperation) { + ret = 'keypad-event'; + } + + return ret; + + } + constructor(private eventsLogService: EventsLogService) { } ngAfterViewInit() { @@ -124,9 +154,7 @@ export class EventsLogViewerComponent implements AfterViewInit { private pushNewLine(loggedEvent: LoggedEvent) { if (this.isEventEnabled(loggedEvent.systemEvent)) { - const style = loggedEvent.systemEvent.constructor.name.replace(/Operation/, 'Event') - .replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); - const newLine = new LogLine(this.getTextLine(loggedEvent), style); + const newLine = new LogLine(this.getTextLine(loggedEvent), EventsLogViewerComponent.getStyle(loggedEvent.systemEvent)); this.logLines.push(newLine); }