Author: chatellier Date: 2009-05-18 16:11:06 +0000 (Mon, 18 May 2009) New Revision: 2240 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Add menu on sensitivity launcher (need to be refactored) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -36,8 +36,38 @@ public void refresh(){ paramsUI.refresh(); } + + // TODO duplicated code (simulUI, Params UI, SensitivityUI) + protected void importSimulation() { + JFileChooser fc = new JFileChooser(); + int returnVal = fc.showOpenDialog(null); + + if (returnVal == JFileChooser.APPROVE_OPTION) { + File file = fc.getSelectedFile(); + //This is where a real application would open the file. + getContextValue(SimulAction.class).importSimulation(file); + refresh(); + } + } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) + protected void saveSimulation() { + JFileChooser fc = new JFileChooser(); + int returnVal = fc.showSaveDialog(null); + + if (returnVal == JFileChooser.APPROVE_OPTION) { + File file = fc.getSelectedFile(); + //This is where a real application would open the file. + getContextValue(SimulAction.class).saveSimulation(file); + } + } ]]> </script> + <JMenuBar id="simulMenuBar" constraints='BorderLayout.NORTH'> + <JMenu id="simulMenu" text="isisfish.simulation.menu.simulation"> + <JMenuItem id="siSave" text="isisfish.simulation.menu.save" onActionPerformed="saveSimulation()"/> + <JMenuItem id="siImport" text="isisfish.simulation.menu.import" onActionPerformed="importSimulation()"/> + </JMenu> + </JMenuBar> <JTabbedPane id="sensitivityTabs" constraints="BorderLayout.CENTER"> <tab title='isisfish.params.title'> <ParamsUI id='paramsUI' sensitivity='{true}' constructorParams='getContextValue(SimulAction.class)'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -414,6 +414,7 @@ /** * TODO : Common code with {@link SimulUI#saveSimulation()} + * TODO duplicated code (simulUI, Params UI, SensitivityUI) */ protected void saveSimulation() { JFileChooser fc = new JFileChooser(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-18 16:11:06 UTC (rev 2240) @@ -165,7 +165,14 @@ simulName = name; } - protected void importSimulation(File f) { + /** + * Load simulation parameter file. + * + * @param f + * + * TODO public just for sensitivity + */ + public void importSimulation(File f) { FileInputStream fos = null; try { fos = new FileInputStream(f); @@ -192,7 +199,9 @@ /** * Save current simulation to given file. * - * @param f file to save smulation to + * @param f file to save simulation to + * + * TODO public just for sensitivity */ public void saveSimulation(File f) { FileOutputStream fos = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -66,6 +66,7 @@ resultChoiceUI.refresh(); advencedParamsUI.refresh(); } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) protected void importSimulation() { JFileChooser fc = new JFileChooser(); int returnVal = fc.showOpenDialog(null); @@ -77,6 +78,7 @@ refresh(); } } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) protected void saveSimulation() { JFileChooser fc = new JFileChooser(); int returnVal = fc.showSaveDialog(null);