Author: sletellier Date: 2009-02-04 15:42:57 +0000 (Wed, 04 Feb 2009) New Revision: 1791 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Debug multi plan d'analyse Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-02-04 15:41:44 UTC (rev 1790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2009-02-04 15:42:57 UTC (rev 1791) @@ -39,21 +39,28 @@ import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; import javax.swing.table.TableColumn; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; + import fr.ifremer.isisfish.simulator.AnalysePlan; + import jaxx.runtime.swing.Item; public SensUI (SimulAction action){ setContextValue(action); } public void refresh(){ - listSimulParamsAnalysePlansList.setModel(new DefaultComboBoxModel(getContextValue(SimulAction.class).getParamAnalysePlans().toArray())); + java.util.List<Item> items = new ArrayList<Item>(); + for (AnalysePlan ap : getContextValue(SimulAction.class).getParamAnalysePlans()){ + items.add(new Item(ap.toString(), fr.ifremer.isisfish.datastore.AnalysePlanStorage.getName(ap), ap, false)); + } + listSimulParamsAnalysePlansList.setItems(items); setSimulParamsAnalysePlans(); } public void addAnalysePlan(){ getContextValue(SimulAction.class).addAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString()); + setAnalysePlanButton(); refresh(); } public void removeAnalysePlan(){ - getContextValue(SimulAction.class).removeAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString()); + getContextValue(SimulAction.class).removeAnalysePlan((AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); refresh(); } public void clearAnalysePlan(){ @@ -75,7 +82,7 @@ } protected void setSimulParamsAnalysePlans(){ if (listSimulParamsAnalysePlansList.getSelectedIndex() != -1){ - Map<String, Class> values = getContextValue(SimulAction.class).getAnalysePlanParameterName(listSimulParamsAnalysePlansList.getSelectedValue().toString()); + Map<String, Class> values = getContextValue(SimulAction.class).getAnalysePlanParameterName((AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); int row = 0; if (values != null){ DefaultTableModel model = new DefaultTableModel(){ @@ -92,7 +99,7 @@ java.util.List<Object> propertyList = new ArrayList<Object>(); for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) { String name = it.next(); - Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, listSimulParamsAnalysePlansList.getSelectedValue().toString()); + Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, (AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue()); GenericCell value = new GenericCell(name, values.get(name), null); valuesList.add(value); propertyList.add(properties); @@ -110,7 +117,7 @@ int row = e.getFirstRow(); TableModel model = (TableModel)e.getSource(); GenericCell data = (GenericCell) model.getValueAt(row, 0); - getContextValue(SimulAction.class).setAnalysePlanParameterValue(data.getName(), listSimulParamsAnalysePlansList.getSelectedValue().toString(), model.getValueAt(row, 1)); + getContextValue(SimulAction.class).setAnalysePlanParameterValue(data.getName(), (AnalysePlan)listSimulParamsAnalysePlansList.getSelectedValue(), model.getValueAt(row, 1)); } }); } 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-02-04 15:41:44 UTC (rev 1790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-04 15:42:57 UTC (rev 1791) @@ -97,7 +97,6 @@ protected RuleStorage ruleStorage = null; protected List<String> analysePlan = null; protected Map<Rule, String> rules = new HashMap<Rule, String>(); - protected Map<AnalysePlan, String> analysePlans = new HashMap<AnalysePlan, String>(); static private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm"); protected List<String> oldSimulNames = null; protected String simulName = null; @@ -545,55 +544,36 @@ public List<String> getAnalysePlanNames(){ return analysePlan; } - public List<String> getParamAnalysePlans(){ - List<String> result = new LinkedList<String>(); - for (AnalysePlan a : param.getAnalysePlans()){ - result.add(analysePlans.get(a)); - } - return result; + public List<AnalysePlan> getParamAnalysePlans(){ + return param.getAnalysePlans(); } public void addAnalysePlan(String name){ try { AnalysePlan ap = AnalysePlanStorage.getAnalysePlan(name).getNewAnalysePlanInstance(); - analysePlans.put(ap, name); getSimulationParameter().addAnalysePlan(ap); } catch (IsisFishException ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); } } - public void removeAnalysePlan(String name){ - AnalysePlan ap = getAnalysePlan(name); - analysePlans.remove(ap); + public void removeAnalysePlan(AnalysePlan ap){ getSimulationParameter().removeAnalysePlan(ap); } public void clearAnalysePlan(){ getSimulationParameter().clearPlans(); } - public AnalysePlan getAnalysePlan(String name){ - AnalysePlan r = null; - for (Map.Entry<AnalysePlan, String> entry : analysePlans.entrySet()) { - if (entry.getValue().equals(name)) { - r = entry.getKey(); - } - } - return r; - } - public Map<String, Class> getAnalysePlanParameterName(String analysePlanName) { + public Map<String, Class> getAnalysePlanParameterName(AnalysePlan ap) { Map<String, Class> result = null; - if (analysePlanName != null) { - AnalysePlan a = getAnalysePlan(analysePlanName); - if (a != null){ - result = AnalysePlanStorage.getParameterNames(a); - } + if (ap != null) { + result = AnalysePlanStorage.getParameterNames(ap); } return result; } - public Object getAnalysePlanParameterValue(String paramName, String analysePlanName){ + public Object getAnalysePlanParameterValue(String paramName, AnalysePlan ap){ Object result = null; - if (analysePlanName != null) { + if (ap != null) { try { - result = AnalysePlanStorage.getParameterValue(getAnalysePlan(analysePlanName), paramName); + result = AnalysePlanStorage.getParameterValue(ap, paramName); } catch (IsisFishException ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); @@ -601,15 +581,16 @@ } return result; } - public void setAnalysePlanParameterValue(String paramName, String analysePlanName, Object o){ - if (analysePlanName != null) { - try { - AnalysePlanStorage.setParameterValue(getAnalysePlan(analysePlanName), paramName, o); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); - showMsgBox(ex); - } + public void setAnalysePlanParameterValue(String paramName, AnalysePlan ap, Object value){ + if (log.isDebugEnabled()){ + log.debug("paramName : " + paramName + " analysePlanName : " + ap + " value : " + value); } + try { + AnalysePlanStorage.setParameterValue(ap, paramName, value); + } catch (IsisFishException ex) { + Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); + showMsgBox(ex); + } } /*