From 01cb035a2be9dd9902027e2b72c2e1474c907f3a Mon Sep 17 00:00:00 2001 From: Dennis Brown Date: Wed, 29 Mar 2017 20:33:28 -0500 Subject: [PATCH] monitor update --- app/assembler.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assembler.js b/app/assembler.js index 04a49f5..4747f68 100644 --- a/app/assembler.js +++ b/app/assembler.js @@ -35,8 +35,9 @@ function SimulatorWidget(node) { $node.find('.resetButton').click(simulator.reset); $node.find('.hexdumpButton').click(assembler.hexdump); $node.find('.disassembleButton').click(assembler.disassemble); - $node.find('.debug').change(function () { - var debug = $(this).is(':checked'); + $node.find('.debug').on('click', function () { + $(this).toggleClass('active'); + var debug = $(this).hasClass('active'); if (debug) { ui.debugOn(); simulator.enableDebugger(); @@ -45,7 +46,11 @@ function SimulatorWidget(node) { simulator.stopDebugger(); } }); - $node.find('.monitoring').change(function () { + $node.find('.monitoring').on('click', function () { + $(this).toggleClass('active'); + if($(this).hasClass('active')) { + + } ui.toggleMonitor(); simulator.toggleMonitor(); }); @@ -156,7 +161,7 @@ function SimulatorWidget(node) { } function toggleMonitor() { - $node.find('.monitor').toggle(); + $node.find('.monitor-container').toggle(); } function showNotes() { @@ -1633,10 +1638,8 @@ function SimulatorWidget(node) { } function updateDebugInfo() { - var html = "A=$" + num2hex(regA) + " X=$" + num2hex(regX) + " Y=$" + num2hex(regY) + "
"; - html += "SP=$" + num2hex(regSP) + " PC=$" + addr2hex(regPC); - html += "
"; - html += "NV-BDIZC
"; + var html = "A=$" + num2hex(regA) + " X=$" + num2hex(regX) + " Y=$" + num2hex(regY) + + " SP=$" + num2hex(regSP) + " PC=$" + addr2hex(regPC) + " NV-BDIZC: "; for (var i = 7; i >=0; i--) { html += regP >> i & 1; }