diff --git a/java_console/inifile/src/com/opensr5/ini/IniFileModel.java b/java_console/inifile/src/com/opensr5/ini/IniFileModel.java index 75f3e8fdcc..370096d1fc 100644 --- a/java_console/inifile/src/com/opensr5/ini/IniFileModel.java +++ b/java_console/inifile/src/com/opensr5/ini/IniFileModel.java @@ -104,6 +104,10 @@ public class IniFileModel { System.out.println("IniFileModel: Field label=[" + uiFieldName + "] : key=[" + key + "]"); } + public Map getAllFields() { + return allFields; + } + @Nullable public DialogModel.Field getField(String key) { DialogModel.Field field = allFields.get(key); diff --git a/java_tools/ts_screenshots/.gitignore b/java_tools/ts_screenshots/.gitignore index e72f0e6eb6..a23912f728 100644 --- a/java_tools/ts_screenshots/.gitignore +++ b/java_tools/ts_screenshots/.gitignore @@ -3,3 +3,4 @@ config TunerStudio.properties lib images +output.xml diff --git a/java_tools/ts_screenshots/build.xml b/java_tools/ts_screenshots/build.xml new file mode 100644 index 0000000000..3d14df0411 --- /dev/null +++ b/java_tools/ts_screenshots/build.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/Callback.java b/java_tools/ts_screenshots/screen/src/com/rusefi/Callback.java new file mode 100644 index 0000000000..d6b78f9fba --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/Callback.java @@ -0,0 +1,7 @@ +package com.rusefi; + +import java.awt.*; + +interface Callback { + void onComponent(Component parent, Component component); +} diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java b/java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java index ad08793807..1c2618701f 100644 --- a/java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java @@ -1,12 +1,11 @@ package com.rusefi; +import com.opensr5.ini.DialogModel; import com.opensr5.ini.IniFileModel; +import com.rusefi.xml.*; import javax.imageio.ImageIO; import javax.swing.*; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RasterFormatException; @@ -26,22 +25,36 @@ public class ScreenGenerator { private static final String DESTINATION = "images" + File.separator; static Content content = new Content(); + static IniFileModel iniFileModel = new IniFileModel(); + + static Map byCleanUiName = new TreeMap<>(); public static void main(String[] args) throws Exception { - IniFileModel iniFileModel = new IniFileModel(); - iniFileModel.readIniFile("../../firmware/tunerstudio"); + if (args.length != 1) { + System.out.println("One parameter expected: path to directory containing rusefi.ini file"); + System.exit(-1); + } + iniFileModel.readIniFile("."); + + for (Map.Entry a : iniFileModel.getAllFields().entrySet()) { + String cleanUiName = cleanName(a.getValue().getUiName()); + byCleanUiName.put(cleanUiName, a.getValue()); + } + + System.out.println("mkdirs " + DESTINATION); new File(DESTINATION).mkdirs(); - Frame mainFrame = findMainFrame(); + System.out.println("Launching TunerStudioIntegraion"); + Frame mainFrame = TunerStudioIntegraion.findMainFrame(); while (topLevelButtons.isEmpty()) { - visitComponents(mainFrame, "", (parent, component) -> { + UiUtils.visitComponents(mainFrame, "", (parent, component) -> { if (component instanceof AbstractButton) { AbstractButton ab = (AbstractButton) component; System.out.println("topLevelButton " + ab.getText()); - if (isTopLevelMenuButton(component)) { + if (TunerStudioIntegraion.isTopLevelMenuButton(component)) { topLevelButtons.add(ab); } } @@ -54,117 +67,39 @@ public class ScreenGenerator { handleTopLevelButtons(mainFrame, topLevelButtons); } - private static void writeXml(Content content) throws JAXBException, IOException { - JAXBContext jaxbContext = JAXBContext.newInstance(Content.class); - - Marshaller marshaller = jaxbContext.createMarshaller(); - - StringWriter xmlWriter = new StringWriter(); - marshaller.marshal(content, xmlWriter); - System.out.println(xmlWriter.toString()); - - marshaller.marshal(content, new FileWriter("output.xml")); - } - - - private static Frame findMainFrame() throws InterruptedException { - while (true) { - Frame[] all = JFrame.getFrames(); - - for (Frame frame : all) { - System.out.println("I see " + frame.getTitle()); - - if (frame.getTitle().contains("TunerStudio")) { - return frame; - } - } - Thread.sleep(1000); - } - } - - interface Callback { - void onComponent(Component parent, Component component); - } - - public static void visitComponents(Component cmp, String prefix, Callback callback) { - visitComponents(cmp, null, prefix, callback); - } - - public static void visitComponents(Component component, Component parent, String prefix, Callback callback) { - if (component == null) - throw new NullPointerException("component"); - if (component instanceof AbstractButton) { - AbstractButton ab = (AbstractButton) component; - System.out.println("[button " + ab.getText() + "]"); - } else if (component instanceof JLabel) { - JLabel ab = (JLabel) component; - System.out.println("[label " + ab.getText() + "]"); - } else if (component instanceof JComboBox) { - JComboBox ab = (JComboBox) component; - System.out.println("[combo " + ab.getSelectedItem() + "]"); - } else if (component instanceof JPanel) { - JPanel p = (JPanel) component; - System.out.println("[panel " + p.getLayout() + "] children=" + p.getComponents().length); - System.out.println("[panel " + p.getLayout() + "] " + p.getLocation() + " size = "+ p.getSize()); - } - - - System.out.println(prefix + " I see " + component.getClass()); - callback.onComponent(parent, component); - Container container = (Container) component; - if (container == null) { - // Not a container, return - return; - } - // Go visit and add all children - for (Component subComponent : container.getComponents()) { - if (subComponent == null) - continue; - visitComponents(subComponent, component, prefix + " " + subComponent.getClass().getSimpleName(), callback); - } - } - - private static boolean isTopLevelMenuButton(Component component) { - return component instanceof bi.b; - } - private static void handleTopLevelButtons(Frame frame, ArrayList topLevelButtons) throws Exception { - printAllDialogs("Dialogs before clicking ", JDialog.getWindows()); - for (AbstractButton topLevel : topLevelButtons) { - handleTopLevelButton(frame, topLevel); + handleTopLevelButton(frame, topLevel, content); } + XmlUtil.writeXml(content); } - private static void handleTopLevelButton(Frame frame, AbstractButton topLevel) throws Exception { + private static void handleTopLevelButton(Frame frame, AbstractButton topLevel, Content content) throws Exception { SwingUtilities.invokeAndWait(topLevel::doClick); Thread.sleep(TOP_MENU_CLICK_DELAY); - content.getTopLevelMenus().add(new TopLevelMenu(topLevel.getText())); - - writeXml(content); - + TopLevelMenu topLevelMenu = new TopLevelMenu(topLevel.getText()); + ScreenGenerator.content.getTopLevelMenus().add(topLevelMenu); ImageIO.write( - getScreenShot(frame), + UiUtils.getScreenShot(frame), "png", new File(DESTINATION + cleanName(topLevel.getText()) + ".png")); - List menuItems = findMenuItems(frame); + List menuItems = TunerStudioIntegraion.findMenuItems(frame); for (JMenuItem menuItem : menuItems) { - handleMenuItem(menuItem); + handleMenuItem(menuItem, topLevelMenu); } } - private static void handleMenuItem(JMenuItem menuItem) throws InterruptedException, InvocationTargetException { + private static void handleMenuItem(JMenuItem menuItem, TopLevelMenu topLevelMenu) throws InterruptedException, InvocationTargetException { SwingUtilities.invokeAndWait(menuItem::doClick); Thread.sleep(MENU_CLICK_DELAY); - AtomicReference ref = new AtomicReference<>(); - SwingUtilities.invokeAndWait(() -> ref.set(findDynamicDialog())); + SwingUtilities.invokeAndWait(() -> ref.set(TunerStudioIntegraion.findDynamicDialog())); // let's give it time to appear on the screen Thread.sleep(MENU_CLICK_DELAY); JDialog dialog = ref.get(); @@ -173,28 +108,24 @@ public class ScreenGenerator { return; } + DialogDescription dialogDescription = new DialogDescription(); + topLevelMenu.getDialogs().add(dialogDescription); + SwingUtilities.invokeAndWait(() -> { try { - Map yCoordinates = new TreeMap<>(); - - BufferedImage dialogScreenShot = getScreenShot(dialog); - - findSlices(dialog, yCoordinates, dialog.getLocationOnScreen().y); + findSlices(dialog, dialogDescription); if (dialog == null) { // this happens for example for disabled menu items return; } - - saveSlices(dialog, yCoordinates, dialogScreenShot); - - // Robot robot = new Robot(); // Rectangle captureRect = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize()); // BufferedImage screenFullImage = robot.createScreenCapture(captureRect); // ImageIO.write(screenFullImage, PNG, new File(DESTINATION + "full_" + d.getTitle() + ".png")); + BufferedImage dialogScreenShot = UiUtils.getScreenShot(dialog); ImageIO.write( dialogScreenShot, PNG, @@ -207,7 +138,7 @@ public class ScreenGenerator { }); } - private static void saveSlices(JDialog dialog, Map yCoordinates, BufferedImage dialogScreenShot) throws IOException { + private static void saveSlices(String dialogTitle, Map yCoordinates, BufferedImage dialogScreenShot, DialogDescription dialogDescription) { System.out.println("Label Y coordinates: " + yCoordinates); yCoordinates.put(0, "top"); yCoordinates.put(dialogScreenShot.getHeight(), "bottom"); @@ -233,7 +164,14 @@ public class ScreenGenerator { System.out.println("Weird"); continue; } - String fileName = cleanName(dialog.getTitle()) + "_slice_" + fromY + "_" + sectionName + ".png"; + String fileName = cleanName(dialogTitle) + "_slice_" + fromY + "_" + sectionName + ".png"; + + DialogModel.Field f = byCleanUiName.get(sectionName); + if (f == null) + continue; + + dialogDescription.fields.add(new FieldDescription(sectionNameWithSpecialCharacters, f.getKey(), fileName)); + File output = new File(DESTINATION + fileName); if (output == null) { System.out.println(sectionName + " in " + fileName + " was not a success"); @@ -241,46 +179,58 @@ public class ScreenGenerator { } try { ImageIO.write(slice, PNG, output); - } catch (NullPointerException | FileNotFoundException e) { + } catch (Exception e) { System.out.println(sectionName + " in " + fileName + " was not a success?"); continue; } } } - private static void findSlices(JDialog dialog, Map yCoordinates, int relativeY) { - visitComponents(dialog, "Dynamic dialog", new Callback() { + private static void findSlices(JDialog dialog, DialogDescription dialogDescription) { + UiUtils.visitComponents(dialog, "Dynamic dialog", new Callback() { @Override public void onComponent(Component parent, Component component) { - if (component instanceof JLabel) { - JLabel label = (JLabel) component; - if (!label.isVisible() || label.getSize().width == 0) - return; - String labelText = label.getText(); - if (labelText.length() > 0) { - System.out.println("Looking at " + label); - try { - yCoordinates.put(label.getLocationOnScreen().y - relativeY, labelText); - } catch (IllegalComponentStateException e) { - System.out.printf("Did not go well for " + label); - } - } + if (component instanceof JPanel) { + JPanel panel = (JPanel) component; + handleBox(dialog.getTitle(), panel, dialogDescription); } - } }); } - private static List findMenuItems(Frame frame) { - List menuItems = new ArrayList<>(); - visitComponents(frame, "Just clicked ", (parent, component) -> { - if (component instanceof JMenuItem && component.getClass().getName().endsWith("aH.gc")) { - JMenuItem menuItem = (JMenuItem) component; - System.out.println("Menu item " + menuItem.getText()); - menuItems.add(menuItem); - } - }); - return menuItems; + private static void handleBox(String dialogTitle, JPanel panel, DialogDescription dialogDescription) { + if (panel.getLayout() instanceof BoxLayout) { + BoxLayout layout = (BoxLayout) panel.getLayout(); + if (layout.getAxis() == BoxLayout.X_AXIS) + return; + + BufferedImage panelImage = UiUtils.getScreenShot(panel); + + Map yCoordinates = new TreeMap<>(); + int relativeY = panel.getLocationOnScreen().y; + + UiUtils.visitComponents(panel, "Looking inside the box", new Callback() { + @Override + public void onComponent(Component parent, Component component) { + if (component instanceof JLabel) { + JLabel label = (JLabel) component; + if (!label.isVisible() || label.getSize().width == 0) + return; + String labelText = label.getText(); + if (labelText.length() > 0) { + System.out.println("Looking at " + label); + try { + yCoordinates.put(label.getLocationOnScreen().y - relativeY, labelText); + } catch (IllegalComponentStateException e) { + System.out.printf("Did not go well for " + label); + } + } + } + } + }); + + saveSlices(dialogTitle, yCoordinates, panelImage, dialogDescription); + } } private static String cleanName(String title) { @@ -296,32 +246,4 @@ public class ScreenGenerator { title = title.replace(" ", " "); return title; } - - private static JDialog findDynamicDialog() { - for (Window d : Dialog.getWindows()) { - if (d.getClass().getName().equals(TS_DIALOG) && d.isVisible()) { - return (JDialog) d; - } - } - return null; - } - - private static void printAllDialogs(String message, Window[] windows) { - System.out.println(message + windows.length); - for (Window window : windows) - System.out.println("type " + window.getClass()); - } - - public static BufferedImage getScreenShot(Component component) { - - BufferedImage image = new BufferedImage( - component.getWidth(), - component.getHeight(), - BufferedImage.TYPE_INT_RGB - ); - // call the Component's paint method, using - // the Graphics object of the image. - component.paint(image.getGraphics()); // alternately use .printAll(..) - return image; - } } diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/TunerStudioIntegraion.java b/java_tools/ts_screenshots/screen/src/com/rusefi/TunerStudioIntegraion.java new file mode 100644 index 0000000000..0924fc7372 --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/TunerStudioIntegraion.java @@ -0,0 +1,48 @@ +package com.rusefi; + +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +public class TunerStudioIntegraion { + static Frame findMainFrame() throws InterruptedException { + while (true) { + Frame[] all = JFrame.getFrames(); + + for (Frame frame : all) { + System.out.println("I see " + frame.getTitle()); + + if (frame.getTitle().contains("TunerStudio")) { + return frame; + } + } + Thread.sleep(1000); + } + } + + static boolean isTopLevelMenuButton(Component component) { + return component instanceof bi.b; + } + + static java.util.List findMenuItems(Frame frame) { + List menuItems = new ArrayList<>(); + UiUtils.visitComponents(frame, "Just clicked ", (parent, component) -> { + if (component instanceof JMenuItem && component.getClass().getName().endsWith("aH.gc")) { + JMenuItem menuItem = (JMenuItem) component; + System.out.println("Menu item " + menuItem.getText()); + menuItems.add(menuItem); + } + }); + return menuItems; + } + + static JDialog findDynamicDialog() { + for (Window d : Dialog.getWindows()) { + if (d.getClass().getName().equals(ScreenGenerator.TS_DIALOG) && d.isVisible()) { + return (JDialog) d; + } + } + return null; + } +} diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/UiUtils.java b/java_tools/ts_screenshots/screen/src/com/rusefi/UiUtils.java new file mode 100644 index 0000000000..84a2e38abe --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/UiUtils.java @@ -0,0 +1,56 @@ +package com.rusefi; + +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; + +public class UiUtils { + public static void visitComponents(Component cmp, String prefix, Callback callback) { + visitComponents(cmp, null, prefix, callback); + } + + public static void visitComponents(Component component, Component parent, String prefix, Callback callback) { + if (component == null) + throw new NullPointerException("component"); + if (component instanceof AbstractButton) { + AbstractButton ab = (AbstractButton) component; + System.out.println("[button " + ab.getText() + "]"); + } else if (component instanceof JLabel) { + JLabel ab = (JLabel) component; + System.out.println("[label " + ab.getText() + "]"); + } else if (component instanceof JComboBox) { + JComboBox ab = (JComboBox) component; + System.out.println("[combo " + ab.getSelectedItem() + "]"); + } else if (component instanceof JPanel) { + JPanel p = (JPanel) component; + System.out.println("[panel " + p.getLayout() + "] children=" + p.getComponents().length); + System.out.println("[panel " + p.getLayout() + "] " + p.getLocation() + " size = " + p.getSize()); + } + + System.out.println(prefix + " I see " + component.getClass()); + callback.onComponent(parent, component); + Container container = (Container) component; + if (container == null) { + // Not a container, return + return; + } + // Go visit and add all children + for (Component subComponent : container.getComponents()) { + if (subComponent == null) + continue; + visitComponents(subComponent, component, prefix + " " + subComponent.getClass().getSimpleName(), callback); + } + } + + public static BufferedImage getScreenShot(Component component) { + BufferedImage image = new BufferedImage( + component.getWidth(), + component.getHeight(), + BufferedImage.TYPE_INT_RGB + ); + // call the Component's paint method, using + // the Graphics object of the image. + component.paint(image.getGraphics()); // alternately use .printAll(..) + return image; + } +} diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/Content.java b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/Content.java similarity index 94% rename from java_tools/ts_screenshots/screen/src/com/rusefi/Content.java rename to java_tools/ts_screenshots/screen/src/com/rusefi/xml/Content.java index 6c36282a36..ee3e512eda 100644 --- a/java_tools/ts_screenshots/screen/src/com/rusefi/Content.java +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/Content.java @@ -1,4 +1,4 @@ -package com.rusefi; +package com.rusefi.xml; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/DialogDescription.java b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/DialogDescription.java new file mode 100644 index 0000000000..019d79121f --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/DialogDescription.java @@ -0,0 +1,12 @@ +package com.rusefi.xml; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import java.util.ArrayList; +import java.util.List; + +public class DialogDescription { + @XmlElementWrapper + @XmlElement(name = "field") + public List fields = new ArrayList<>(); +} diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/FieldDescription.java b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/FieldDescription.java new file mode 100644 index 0000000000..529ee515bf --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/FieldDescription.java @@ -0,0 +1,31 @@ +package com.rusefi.xml; + +import javax.xml.bind.annotation.XmlAttribute; + +public class FieldDescription { + + private final String uiName; + private final String fieldName; + private final String fileName; + + public FieldDescription(String uiName, String fieldName, String fileName) { + this.uiName = uiName; + this.fieldName = fieldName; + this.fileName = fileName; + } + + @XmlAttribute + public String getUiName() { + return uiName; + } + + @XmlAttribute + public String getFieldName() { + return fieldName; + } + + @XmlAttribute + public String getFileName() { + return fileName; + } +} diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/TopLevelMenu.java b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/TopLevelMenu.java similarity index 75% rename from java_tools/ts_screenshots/screen/src/com/rusefi/TopLevelMenu.java rename to java_tools/ts_screenshots/screen/src/com/rusefi/xml/TopLevelMenu.java index 1e3b79bf27..dadf08c61b 100644 --- a/java_tools/ts_screenshots/screen/src/com/rusefi/TopLevelMenu.java +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/TopLevelMenu.java @@ -1,6 +1,4 @@ -package com.rusefi; - -import com.opensr5.ini.DialogModel; +package com.rusefi.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; @@ -13,7 +11,7 @@ public class TopLevelMenu { @XmlElementWrapper @XmlElement(name = "dialog") - private List dialogs = new ArrayList<>(); + private List dialogs = new ArrayList<>(); public TopLevelMenu(String title) { this.title = title; @@ -24,7 +22,7 @@ public class TopLevelMenu { return title; } - public List getDialogs() { + public List getDialogs() { return dialogs; } } diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/XmlUtil.java b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/XmlUtil.java new file mode 100644 index 0000000000..43c7294340 --- /dev/null +++ b/java_tools/ts_screenshots/screen/src/com/rusefi/xml/XmlUtil.java @@ -0,0 +1,22 @@ +package com.rusefi.xml; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringWriter; + +public class XmlUtil { + public static void writeXml(Content content) throws JAXBException, IOException { + JAXBContext jaxbContext = JAXBContext.newInstance(Content.class); + + Marshaller marshaller = jaxbContext.createMarshaller(); + + StringWriter xmlWriter = new StringWriter(); + marshaller.marshal(content, xmlWriter); + System.out.println(xmlWriter.toString()); + + marshaller.marshal(content, new FileWriter("output.xml")); + } +}