r2885 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget/filter - Isis-fish-commits

6 Jan 2010

Author: chatellier
Date: 2010-01-06 18:34:55 +0000 (Wed, 06 Jan 2010)
New Revision: 2885

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/SimulAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
Log:
Fix simulation filtering.

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	2010-01-06 16:32:34 UTC (rev 2884)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2010-01-06 18:34:55 UTC (rev 2885)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -337,8 +337,11 @@
 
 protected void selectFilter() {
     try {
-        simulAction.setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()));
-        refresh();
+        java.util.List<String> simulationsNames = fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem());
+        // TODO add " " to not triger event (need to be fixed)
+        simulationsNames.add(0, " ");
+        simulAction.setOldSimulatorNames(simulationsNames);
+        fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false));
     } catch (ParseException ex) {
         if (log.isErrorEnabled()) {
             log.error("Can't select simulation filter", ex);
@@ -367,6 +370,7 @@
 
 protected void resetFilter(){
     simulAction.resetOldSimulatorNames();
+    fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false));
 }
 protected void saveName(){
     simulAction.setName(fieldSimulParamsName.getText());
@@ -393,12 +397,10 @@
         <cell fill="horizontal" weightx="1.0">
             <Table>
                 <row>
-                    <cell columns="4" fill="horizontal">
+                    <cell fill="horizontal">
                         <JLabel text="isisfish.params.loadOldSimulation"/>
                     </cell>
-                </row>
-                <row>
-                    <cell columns="2" fill="horizontal"  weightx="1.0">
+                    <cell fill="horizontal" weightx="1.0">
                         <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/>
                     </cell>
                     <cell>
@@ -412,6 +414,11 @@
         </cell>
     </row>
     <row>
+        <cell fill="horizontal" weightx="1.0" insets="0,3,0,3">
+            <JSeparator />
+        </cell>
+    </row>
+    <row>
         <cell fill="both" weightx="1.0" weighty="1.0">
             <Table>
                 <row>

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	2010-01-06 16:32:34 UTC (rev 2884)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2010-01-06 18:34:55 UTC (rev 2885)
@@ -27,7 +27,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +43,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.topia.TopiaContext;
-import org.nuiton.util.FileUtil;
 
 import fr.ifremer.isisfish.IsisFish;
 import fr.ifremer.isisfish.IsisFishException;
@@ -66,7 +64,6 @@
 import fr.ifremer.isisfish.rule.Rule;
 import fr.ifremer.isisfish.simulator.AnalysePlan;
 import fr.ifremer.isisfish.simulator.SimulationParameter;
-import fr.ifremer.isisfish.simulator.SimulationProperties;
 import fr.ifremer.isisfish.simulator.launcher.SimulationService;
 import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
 import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
@@ -77,9 +74,7 @@
 import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
-import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
 import fr.ifremer.isisfish.ui.util.ErrorHelper;
-import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
 
 /**
  * SimulAction.
@@ -472,17 +467,17 @@
      */
     public List<String> getOldSimulationItem() {
 
-        try {
+        //try {
             oldSimulNames = new ArrayList<String>();
 
-            FilterModel<SimulationProperties, String> filterModel;
+            //FilterModel<SimulationProperties, String> filterModel;
             // keep in context list of old simulation names (for filter process)
             oldSimulNames.addAll(SimulationStorage.getSimulationNames());
             // create filter model
-            filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames);
+            //filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames);
             // to used directly model.getFilteredResult() in xml
             // we must fill filterModel result with original items
-            filterModel.selectAll();
+            //filterModel.selectAll();
 
             // chatellier : Ajout d'une entrée vide pour forcer la sélection
             // et que le changement lance un evenement sur la liste
@@ -491,7 +486,7 @@
             oldSimulNames.add(0, " ");
 
             return oldSimulNames;
-        } catch (ParseException e) {
+        /*} catch (ParseException e) {
             if (log.isErrorEnabled()) {
                 log.error("Can't get old simulation item", e);
             }
@@ -502,13 +497,9 @@
             }
             ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e);
         }
-        return null;
+        return null;*/
     }
 
-    public List<String> getFilteredOldSimulatorNames() {
-        return getFilteredOldSimulatorNames(false);
-    }
-
     public List<String> getFilteredOldSimulatorNames(boolean force) {
         if (oldSimulNames == null || force) {
             oldSimulNames = getOldSimulationItem();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2010-01-06 16:32:34 UTC (rev 2884)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2010-01-06 18:34:55 UTC (rev 2885)
@@ -37,6 +37,8 @@
         setSize(getMinimumSize());
         repaint();
         doReset();
+        // TODO pas de composant parent ?
+        org.nuiton.widget.SwingUtil.center(this);
         // launch ui and waits for reply
         setVisible(true);
         return model.getFilteredResult();
@@ -46,6 +48,8 @@
         setSize(getMinimumSize());
         repaint();
         doReset();
+        // TODO pas de composant parent ?
+        org.nuiton.widget.SwingUtil.center(this);
         // launch ui and waits for reply
         setVisible(true);
         return (String) comboResult.getSelectedItem();

    

r2885 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget/filter

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)