From 01323407cd8ecda15d23e1089e914172978cf986 Mon Sep 17 00:00:00 2001 From: DragonWarri0r Date: Sun, 24 May 2020 17:45:30 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=20dr?= =?UTF-8?q?=20=D0=B2=D1=83-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/ifmo/cs/bcomp/ui/components/TraceView.java | 2 +- .../main/java/ru/ifmo/cs/bcomp/ui/io/SecondIO.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/TraceView.java b/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/TraceView.java index 547d3ff..126151f 100644 --- a/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/TraceView.java +++ b/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/TraceView.java @@ -398,7 +398,7 @@ public void panelActivate() { @Override public void panelDeactivate() { if(!isRun) - sleep = 0; + sleep = 1; } @Override diff --git a/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/io/SecondIO.java b/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/io/SecondIO.java index f8ce381..e0a0086 100644 --- a/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/io/SecondIO.java +++ b/bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/io/SecondIO.java @@ -1,14 +1,17 @@ package ru.ifmo.cs.bcomp.ui.io; + import ru.ifmo.cs.bcomp.IOCtrl; import ru.ifmo.cs.bcomp.ui.components.ComponentManager; -import ru.ifmo.cs.bcomp.ui.components.InputRegisterView; +import ru.ifmo.cs.bcomp.ui.components.InputRegisterViewByte; + import javax.swing.*; import java.awt.*; -import static ru.ifmo.cs.bcomp.ui.components.DisplayStyles.*; + +import static ru.ifmo.cs.bcomp.ui.components.DisplayStyles.COLOR_BACKGROUND; public class SecondIO extends IODevice { private ComponentManager componentManager; - private InputRegisterView input; + private InputRegisterViewByte input; public SecondIO(IOCtrl ioCtrl, ComponentManager componentManager) { super(ioCtrl, "input"); @@ -20,7 +23,7 @@ protected Component getContent() { JPanel panel = new JPanel(new GridBagLayout()); panel.setPreferredSize(new Dimension(500, 150)); panel.setBackground(COLOR_BACKGROUND); - input = new InputRegisterView(componentManager, ioctrl.getRegisters()[0]); + input = new InputRegisterViewByte(componentManager, ioctrl.getRegisters()[0]); input.setProperties(0, 0, false, false); input.setPreferredSize(input.getSize()); input.setMinimumSize(input.getSize());