TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 07:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

If IEEE shapes are used, also the CircuitBuilder uses wide shapes, see #504

Browse Source
This commit is contained in:
hneemann 2020-08-21 20:33:46 +02:00
parent 72e5bc0c5a
commit 367d586379
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/builder/circuit/CircuitBuilder.java
View File

@ -30,6 +30,7 @@ import de.neemann.digital.draw.elements.VisualElement;
import de.neemann.digital.draw.elements.Wire; import de.neemann.digital.draw.elements.Wire;
import de.neemann.digital.draw.graphics.Vector; import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.draw.shapes.ShapeFactory; import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.gui.Settings;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import java.util.*; import java.util.*;
@ -91,6 +92,7 @@ public class CircuitBuilder implements BuilderInterface<CircuitBuilder> {
sequentialVars = new ArrayList<>(); sequentialVars = new ArrayList<>();
varsToNet = new HashSet<>(); varsToNet = new HashSet<>();
localVarsUsed = new HashSet<>(); localVarsUsed = new HashSet<>();
wideShapes = Settings.getInstance().get(Keys.SETTINGS_IEEE_SHAPES);
} }
/** /**

2
src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
View File

@ -36,7 +36,6 @@ import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.shapes.ShapeFactory; import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.gui.Main; import de.neemann.digital.gui.Main;
import de.neemann.digital.gui.SaveAsHelper; import de.neemann.digital.gui.SaveAsHelper;
import de.neemann.digital.gui.Settings;
import de.neemann.digital.gui.components.AttributeDialog; import de.neemann.digital.gui.components.AttributeDialog;
import de.neemann.digital.gui.components.ElementOrderer; import de.neemann.digital.gui.components.ElementOrderer;
import de.neemann.digital.gui.components.karnaugh.KarnaughMapDialog; import de.neemann.digital.gui.components.karnaugh.KarnaughMapDialog;
@ -636,7 +635,6 @@ public class TableDialog extends JDialog {
try { try {
final ModelAnalyserInfo modelAnalyzerInfo = undoManager.getActual().getModelAnalyzerInfo(); final ModelAnalyserInfo modelAnalyzerInfo = undoManager.getActual().getModelAnalyzerInfo();
CircuitBuilder circuitBuilder = new CircuitBuilder(shapeFactory, undoManager.getActual().getVars()) CircuitBuilder circuitBuilder = new CircuitBuilder(shapeFactory, undoManager.getActual().getVars())
.setWideShapes(Settings.getInstance().get(Keys.SETTINGS_IEEE_SHAPES))
.setUseJK(useJKff) .setUseJK(useJKff)
.setUseLUTs(useLUTs) .setUseLUTs(useLUTs)
.setModelAnalyzerInfo(modelAnalyzerInfo); .setModelAnalyzerInfo(modelAnalyzerInfo);