diff --git a/src/main/java/elntranslator/toELN/TopCellGenerator.java b/src/main/java/elntranslator/toELN/TopCellGenerator.java index 44ccd478c42081d9f2a7725ced74b55d9f67a3d7..d80e64324b4dd1e5283d04dca7303e7ce1af3ae0 100644 --- a/src/main/java/elntranslator/toELN/TopCellGenerator.java +++ b/src/main/java/elntranslator/toELN/TopCellGenerator.java @@ -62,8 +62,11 @@ import elntranslator.*; public class TopCellGenerator { public static ELNSpecification eln; - private final static String GENERATED_PATH1 = "generated_CPP" + File.separator; - private final static String GENERATED_PATH2 = "generated_H" + File.separator; + //private final static String GENERATED_PATH1 = "generated_CPP" + File.separator; + //private final static String GENERATED_PATH2 = "generated_H" + File.separator; + + private String GENERATED_PATH1 = "generated_CPP" + File.separator; + private String GENERATED_PATH2 = "generated_H" + File.separator; public TopCellGenerator(ELNSpecification _eln) { eln = _eln; @@ -93,13 +96,19 @@ public class TopCellGenerator { return (top); } - public void saveFile(String path) { + public void saveFile(String path, Boolean standalone) { ELNTCluster cluster = TopCellGenerator.eln.getCluster(); LinkedList<ELNTConnector> connectorsModule = TopCellGenerator.eln.getAllConnectorsInModule(); LinkedList<ELNTConnector> connectorsCluster = TopCellGenerator.eln.getAllConnectorsInCluster(); String top; + if(standalone){ + + GENERATED_PATH1 = ""; + GENERATED_PATH2 = ""; + } + try { // Save file .cpp System.err.println(path + GENERATED_PATH1 + cluster.getName() + ".cpp"); @@ -111,13 +120,19 @@ public class TopCellGenerator { ex.printStackTrace(); } // Save files .h - saveFileModule(path, cluster, connectorsModule); + saveFileModule(path, cluster, connectorsModule, standalone); } - public void saveFileModule(String path, ELNTCluster cluster, List<ELNTConnector> connectors) { + public void saveFileModule(String path, ELNTCluster cluster, List<ELNTConnector> connectors, Boolean standalone) { LinkedList<ELNTModule> modules = cluster.getModule(); String code; + + if(standalone){ + + GENERATED_PATH1 = ""; + GENERATED_PATH2 = ""; + } for (ELNTModule module : modules) { try { @@ -131,4 +146,4 @@ public class TopCellGenerator { } } } -} \ No newline at end of file +} diff --git a/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java index 3ef7014b1da3efc007f14429f13a417bfddf491f..80366ab9f54589e4efed13bdde8eee982d11d1e4 100644 --- a/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java +++ b/src/main/java/ui/window/JDialogELNExecutableCodeGeneration.java @@ -500,6 +500,8 @@ public class JDialogELNExecutableCodeGeneration extends javax.swing.JFrame imple // String list;//, data; // hasError = false; + Boolean standalone = true; //are there any GPIO blocks? Currently ELN is always standalone and has no direct connection to SocLib (via TDF: yes) + try { if (jp1.getSelectedIndex() == 0) { jta.append("Generating executable code (ELN version)\n"); @@ -531,7 +533,7 @@ public class JDialogELNExecutableCodeGeneration extends javax.swing.JFrame imple pathCode = code2.getText(); System.err.println("ELN TOPCELL : " + elnSpec.getCluster().getName() + "saved in " + code2.getText()); - topCellGenerator.saveFile(pathCode); + topCellGenerator.saveFile(pathCode, standalone); jta.append("Code saved\n"); } catch (Exception e) {