diff --git a/distribution/screenshot2.png b/distribution/screenshot2.png index 566b7b3d7..13fbc83cb 100644 Binary files a/distribution/screenshot2.png and b/distribution/screenshot2.png differ diff --git a/src/test/java/de/neemann/digital/docu/ScreenShots.java b/src/test/java/de/neemann/digital/docu/ScreenShots.java index 0b0bea41d..21fa9a3b4 100644 --- a/src/test/java/de/neemann/digital/docu/ScreenShots.java +++ b/src/test/java/de/neemann/digital/docu/ScreenShots.java @@ -7,6 +7,7 @@ package de.neemann.digital.docu; import de.neemann.digital.analyse.TruthTable; import de.neemann.digital.analyse.TruthTableTableModel; +import de.neemann.digital.analyse.expression.format.FormatToExpression; import de.neemann.digital.core.element.Keys; import de.neemann.digital.fsm.gui.FSMFrame; import de.neemann.digital.gui.Main; @@ -49,6 +50,7 @@ public class ScreenShots { private static Main mainStatic; public static void main(String[] args) { + FormatToExpression.setDefaultFormat(FormatToExpression.FORMATTER_UNICODE_NOAND); Settings.getInstance().getAttributes().set(Keys.SETTINGS_DEFAULT_TREESELECT, false); Settings.getInstance().getAttributes().set(Keys.SETTINGS_GRID, true); // mainScreenShot(); @@ -58,10 +60,12 @@ public class ScreenShots { } private static void all() { + Settings.getInstance().getAttributes() + .set(Keys.SETTINGS_GRID, true); + // English Lang.setActualRuntimeLanguage(new Language("en")); Settings.getInstance().getAttributes() - .set(Keys.SETTINGS_GRID, true) .set(Keys.SETTINGS_IEEE_SHAPES, true); mainScreenShot(); firstSteps(); @@ -70,7 +74,6 @@ public class ScreenShots { // German Lang.setActualRuntimeLanguage(new Language("de")); Settings.getInstance().getAttributes() - .set(Keys.SETTINGS_GRID, true) .set(Keys.SETTINGS_IEEE_SHAPES, false); firstSteps(); hierarchicalDesign(); @@ -78,7 +81,6 @@ public class ScreenShots { // Portuguese Lang.setActualRuntimeLanguage(new Language("pt")); Settings.getInstance().getAttributes() - .set(Keys.SETTINGS_GRID, true) .set(Keys.SETTINGS_IEEE_SHAPES, true); firstSteps(); hierarchicalDesign(); @@ -86,7 +88,6 @@ public class ScreenShots { // Spanish Lang.setActualRuntimeLanguage(new Language("es")); Settings.getInstance().getAttributes() - .set(Keys.SETTINGS_GRID, true) .set(Keys.SETTINGS_IEEE_SHAPES, true); firstSteps(); hierarchicalDesign(); @@ -94,13 +95,14 @@ public class ScreenShots { private static void mainScreenShot() { Lang.setActualRuntimeLanguage(new Language("en")); + Settings.getInstance().getAttributes() .set(Keys.SETTINGS_IEEE_SHAPES, true) .set(Keys.SETTINGS_GRID, true) .set(Keys.SETTINGS_SHOW_WIRE_BITS, true); new GuiTester("../../main/dig/processor/Processor.dig", "examples/processor/Processor.dig") .press(' ') - .delay(2000) + .delay(4000) .add(new GuiTester.WindowCheck<>(GraphicDialog.class, (gt, gd) -> { graphic = gd; final Main main = (Main) gd.getParent(); @@ -112,7 +114,7 @@ public class ScreenShots { .delay(500) .press("F1") .add(new MainScreenShot("distribution/screenshot.png")) - .execute(); + .execute(); /**/ new GuiTester() .press("F10") .press("RIGHT", 4) @@ -215,7 +217,7 @@ public class ScreenShots { .add(new GuiTester.CloseTopMost()) .add(new GuiTester.CloseTopMost()) .add(new GuiTester.CloseTopMost()) - .execute(); + .execute();/**/ } private static GuiTester.WindowCheck closeAllSolutionsDialog() { diff --git a/src/test/resources/docu/images/de/scr12.png b/src/test/resources/docu/images/de/scr12.png index 96c08bea3..d9a53787f 100644 Binary files a/src/test/resources/docu/images/de/scr12.png and b/src/test/resources/docu/images/de/scr12.png differ diff --git a/src/test/resources/docu/images/de/scr13.png b/src/test/resources/docu/images/de/scr13.png index 281363e7b..63ed7c9cd 100644 Binary files a/src/test/resources/docu/images/de/scr13.png and b/src/test/resources/docu/images/de/scr13.png differ diff --git a/src/test/resources/docu/images/de/scr14.png b/src/test/resources/docu/images/de/scr14.png index 5fd02cfef..d47171781 100644 Binary files a/src/test/resources/docu/images/de/scr14.png and b/src/test/resources/docu/images/de/scr14.png differ diff --git a/src/test/resources/docu/images/en/scr12.png b/src/test/resources/docu/images/en/scr12.png index 8e81fc725..4c93e354c 100644 Binary files a/src/test/resources/docu/images/en/scr12.png and b/src/test/resources/docu/images/en/scr12.png differ diff --git a/src/test/resources/docu/images/en/scr13.png b/src/test/resources/docu/images/en/scr13.png index b03f60659..fe8e01cc9 100644 Binary files a/src/test/resources/docu/images/en/scr13.png and b/src/test/resources/docu/images/en/scr13.png differ diff --git a/src/test/resources/docu/images/en/scr14.png b/src/test/resources/docu/images/en/scr14.png index 735f87d66..81abc24f4 100644 Binary files a/src/test/resources/docu/images/en/scr14.png and b/src/test/resources/docu/images/en/scr14.png differ diff --git a/src/test/resources/docu/images/es/scr12.png b/src/test/resources/docu/images/es/scr12.png index 81e68ab2d..bc230b13a 100644 Binary files a/src/test/resources/docu/images/es/scr12.png and b/src/test/resources/docu/images/es/scr12.png differ diff --git a/src/test/resources/docu/images/es/scr13.png b/src/test/resources/docu/images/es/scr13.png index 00044ad2e..55794b8d6 100644 Binary files a/src/test/resources/docu/images/es/scr13.png and b/src/test/resources/docu/images/es/scr13.png differ diff --git a/src/test/resources/docu/images/es/scr14.png b/src/test/resources/docu/images/es/scr14.png index f0e3b489a..d0f5a6a52 100644 Binary files a/src/test/resources/docu/images/es/scr14.png and b/src/test/resources/docu/images/es/scr14.png differ diff --git a/src/test/resources/docu/images/pt/scr12.png b/src/test/resources/docu/images/pt/scr12.png index f1e15de48..cc17cfc86 100644 Binary files a/src/test/resources/docu/images/pt/scr12.png and b/src/test/resources/docu/images/pt/scr12.png differ diff --git a/src/test/resources/docu/images/pt/scr13.png b/src/test/resources/docu/images/pt/scr13.png index 46872f316..51a95865c 100644 Binary files a/src/test/resources/docu/images/pt/scr13.png and b/src/test/resources/docu/images/pt/scr13.png differ diff --git a/src/test/resources/docu/images/pt/scr14.png b/src/test/resources/docu/images/pt/scr14.png index 4af8e54cf..264bfdc90 100644 Binary files a/src/test/resources/docu/images/pt/scr14.png and b/src/test/resources/docu/images/pt/scr14.png differ