Skip to content

Commit

Permalink
Minor fix
Browse files Browse the repository at this point in the history
Now the log lines are displayed with the proper colours.
  • Loading branch information
parraman committed Dec 12, 2017
1 parent 65e2d0e commit 3c7274e
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "asm-simulator",
"version": "1.4.0",
"version": "1.4.1",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand Down
34 changes: 31 additions & 3 deletions src/app/events-log-viewer/events-log-viewer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,36 @@ export class EventsLogViewerComponent implements AfterViewInit {

private eventGroups: Array<SystemEvent> = [];

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() {
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 3c7274e

Please sign in to comment.