fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[8447] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java

[<bma...@us...>]

Revision: 8447
          http://sourceforge.net/p/fudaa/svn/8447
Author:   bmarchan
Date:     2013-07-19 10:00:53 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Mascaret : Visu r?\195?\169sultats temporels suivant unite de temps choisie

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2013-07-17 06:00:29 UTC (rev 8446)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2013-07-19 10:00:53 UTC (rev 8447)
@@ -2,12 +2,19 @@
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Vector;
 
+import javax.swing.ButtonGroup;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JSplitPane;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
@@ -19,6 +26,7 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
 import org.fudaa.ebli.graphe.BGrapheEditeurAxes;
+import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 import org.fudaa.fudaa.hydraulique1d.graphe.Hydraulique1dGrapheResuBief;
 
 import com.memoire.bu.BuBorderLayout;
@@ -28,21 +36,27 @@
 import com.memoire.bu.BuRadioButton;
 import com.memoire.bu.BuScrollPane;
 import com.memoire.bu.BuVerticalLayout;
-import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 
+/**
+ * Un panneau d'affichage des r\xE9sultats suivant le profil en long.
+ * 
+ * @author Unknown
+ * @version $Id$
+ */
 class PanneauGraphesResultats
 extends BuPanel implements ActionListener
 {
-	private final static int MODE_BIEF= 0;
-	private final static int MODE_CASIER= 1;
-	private final static int MODE_LIAISON= 2;
-        private final static String BIEF = Hydraulique1dResource.HYDRAULIQUE1D.getString("Bief");
-        private final static String CASIER = Hydraulique1dResource.HYDRAULIQUE1D.getString("Casier");
-        private final static String casier = Hydraulique1dResource.HYDRAULIQUE1D.getString("casier");
-        private final static String LIAISON = Hydraulique1dResource.HYDRAULIQUE1D.getString("Liaison");
-        private final static String liaison = Hydraulique1dResource.HYDRAULIQUE1D.getString("liaison");
-	private int mode_= MODE_BIEF;
-	private BuPanel pnWest_= new BuPanel();
+  private final static int MODE_BIEF = 0;
+  private final static int MODE_CASIER = 1;
+  private final static int MODE_LIAISON = 2;
+  private final static String BIEF = Hydraulique1dResource.HYDRAULIQUE1D.getString("Bief");
+  private final static String CASIER = Hydraulique1dResource.HYDRAULIQUE1D.getString("Casier");
+  private final static String casier = Hydraulique1dResource.HYDRAULIQUE1D.getString("casier");
+  private final static String LIAISON = Hydraulique1dResource.HYDRAULIQUE1D.getString("Liaison");
+  private final static String liaison = Hydraulique1dResource.HYDRAULIQUE1D.getString("liaison");
+  
+  private int mode_ = MODE_BIEF;
+  private BuPanel pnWest_ = new BuPanel();
 	private BuVerticalLayout loWest_= new BuVerticalLayout();
 	private BuPanel pnCenter_= new BuPanel();
 	private BuBorderLayout loCenter_= new BuBorderLayout();
@@ -54,24 +68,31 @@
 	private TitledBorder ttlListeVar_= new TitledBorder(Hydraulique1dResource.HYDRAULIQUE1D.getString("Liste Variable"));
 	private TitledBorder ttlPasTempsSection_= new TitledBorder("");
 	private TitledBorder ttlListeBiefCasierLiaison__= new TitledBorder(Hydraulique1dResource.HYDRAULIQUE1D.getString("Liste Biefs Casiers Liaisons"));
-	BuRadioButton rbSpatial_= new BuRadioButton(Hydraulique1dResource.HYDRAULIQUE1D.getString("Profil Spatial"));
-	BuRadioButton rbTemporel_= new BuRadioButton();
 	BuCheckBox cbLaisse_= new BuCheckBox(Hydraulique1dResource.HYDRAULIQUE1D.getString("Laisse de crue"));
 	BuList lstBiefCasierLiaison_= new BuList();
 	private BuScrollPane scrlpListeBiefCasierLiaison_= new BuScrollPane(lstBiefCasierLiaison_);
 	private BGrapheEditeurAxes bgEditeurAxes_;
 
+  BuRadioButton rbSpatial_= new BuRadioButton(Hydraulique1dResource.HYDRAULIQUE1D.getString("Profil Spatial"));
+  BuRadioButton rbTemporel_= new BuRadioButton();
+  JRadioButton rbUniteS_;
+  JRadioButton rbUniteM_;
+  JRadioButton rbUniteH_;
+  JRadioButton rbUniteJ_;
+  JPanel pnUnite_;
 
-	private MetierResultatsTemporelSpatial resultTempoSpatial_;
-	private MetierResultatsTemporelSpatial resultatsCasier_;
-	private MetierResultatsTemporelSpatial resultatsLiaison_;
-	private MetierResultatsTemporelSpatial resultatsCourant_= null;
+  private MetierResultatsTemporelSpatial resultTempoSpatial_;
+  private MetierResultatsTemporelSpatial resultatsCasier_;
+  private MetierResultatsTemporelSpatial resultatsLiaison_;
+  private MetierResultatsTemporelSpatial resultatsCourant_ = null;
 
+  private Hydraulique1dGraphesResultatsEditor parent_;
 
-	private Hydraulique1dGraphesResultatsEditor parent_;
+  private enum UniteTps {
+    s, mn, h, j
+  }
 
 
-
 	public PanneauGraphesResultats(Hydraulique1dGraphesResultatsEditor parent) {
 		this.setLayout(new BuBorderLayout());
 
@@ -99,15 +120,32 @@
 
 		lstBiefCasierLiaison_.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
 
+		rbUniteS_ = new JRadioButton(Hydraulique1dResource.getS("sec."));
+    rbUniteM_ = new JRadioButton(Hydraulique1dResource.getS("min."));
+    rbUniteH_ = new JRadioButton(Hydraulique1dResource.getS("heure"));
+    rbUniteJ_ = new JRadioButton(Hydraulique1dResource.getS("jour"));
+    
+    ButtonGroup bgUnite=new ButtonGroup();
+    bgUnite.add(rbUniteS_);
+    bgUnite.add(rbUniteM_);
+    bgUnite.add(rbUniteH_);
+    bgUnite.add(rbUniteJ_);
+    rbUniteS_.setSelected(true);
+    pnUnite_ = new JPanel();
+    pnUnite_.setLayout(new FlowLayout(FlowLayout.CENTER,3,0));
+    pnUnite_.add(rbUniteS_);
+    pnUnite_.add(rbUniteM_);
+    pnUnite_.add(rbUniteH_);
+    pnUnite_.add(rbUniteJ_);
 
-		int n= 0;
-		pnWest_.add(scrlpListeBiefCasierLiaison_, n++);
-		pnWest_.add(rbSpatial_, n++);
-		pnWest_.add(rbTemporel_, n++);
-		pnWest_.add(cbLaisse_, n++);
-		pnWest_.add(scrlpListeVar_, n++);
-		pnWest_.add(scrlpListPasTpsSection_, n++);
-		pnWest_.add(bgEditeurAxes_, n++);
+		pnWest_.add(scrlpListeBiefCasierLiaison_);
+		pnWest_.add(rbSpatial_);
+		pnWest_.add(rbTemporel_);
+    pnWest_.add(pnUnite_);
+		pnWest_.add(cbLaisse_);
+		pnWest_.add(scrlpListeVar_);
+		pnWest_.add(scrlpListPasTpsSection_);
+		pnWest_.add(bgEditeurAxes_);
 		pnCenter_.add(bgraphe_, BorderLayout.CENTER);
 
 		JSplitPane spt= new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, pnWest_, pnCenter_);
@@ -136,6 +174,32 @@
 		rbSpatial_.addActionListener(this);
 		rbTemporel_.setActionCommand("TEMPOREL");
 		rbTemporel_.addActionListener(this);
+		ButtonGroup bgProf=new ButtonGroup();
+		bgProf.add(rbSpatial_);
+    bgProf.add(rbTemporel_);
+		
+		rbSpatial_.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        if (e.getStateChange()!=ItemEvent.SELECTED) return;
+        
+        rbUniteS_.setEnabled(false);
+        rbUniteM_.setEnabled(false);
+        rbUniteH_.setEnabled(false);
+        rbUniteJ_.setEnabled(false);
+      }
+    });
+		rbTemporel_.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        if (e.getStateChange()!=ItemEvent.SELECTED) return;
+        
+        rbUniteS_.setEnabled(true);
+        rbUniteM_.setEnabled(true);
+        rbUniteH_.setEnabled(true);
+        rbUniteJ_.setEnabled(true);
+      }
+    });
 	}
   @Override
 	public void actionPerformed(ActionEvent _evt) {
@@ -208,7 +272,7 @@
 }*/
 
 	protected void setValeurs() {
-		Vector items= new Vector();
+		Vector<String> items= new Vector<String>();
     System.out.println("PanneauGraphesresultats setValeurs() LIAISON="+LIAISON);
     System.out.println("PanneauGraphesresultats setValeurs() Hydraulique1dResource.HYDRAULIQUE1D.getString(Liaison)="+Hydraulique1dResource.HYDRAULIQUE1D.getString("Liaison"));
 		if (resultTempoSpatial_!= null) {
@@ -234,17 +298,14 @@
 				resultatsCourant_ = resultTempoSpatial_;
 			}
 			rbSpatial_.setSelected(true);
-			rbTemporel_.setSelected(false);
 		} else if (resultatsCasier_ != null) {
 			resultatsCourant_ = resultatsCasier_;
 			mode_ = MODE_CASIER;
-			rbSpatial_.setSelected(false);
 			rbTemporel_.setSelected(true);
 
 		} else if (resultatsLiaison_ != null) {
 			resultatsCourant_ = resultatsLiaison_;
 			mode_ = MODE_LIAISON;
-			rbSpatial_.setSelected(false);
 			rbTemporel_.setSelected(true);
 		}
 //		btProfil_.setVisible((reseau_ != null));
@@ -269,7 +330,7 @@
 		}
 		Object[] values = lstBiefCasierLiaison_.getSelectedValues();
 
-		ArrayList listeIndexes = new ArrayList(values.length);
+		ArrayList<Integer> listeIndexes = new ArrayList<Integer>(values.length);
 		for (int i = 0; i < values.length; i++) {
                         String valueChaine = values[i].toString();
                         boolean commenceParDebutChaine = valueChaine.startsWith(debutChaine);
@@ -284,14 +345,14 @@
 		}
 		int[] res = new int[listeIndexes.size()];
 		for (int i = 0; i < res.length; i++) {
-			res[i]=((Integer)listeIndexes.get(i)).intValue();
+			res[i]=listeIndexes.get(i).intValue();
 		}
 		return res;
 	}
 	protected void setListeSectionsCalcul() {
 		if (rbTemporel_.isSelected()) {
 			int[] indexElements= getIndexElementsSelectionnes();
-			Vector vSections = new Vector();
+			Vector<String> vSections = new Vector<String>();
 			for (int i = 0; i < indexElements.length; i++) {
 				MetierResultatsTemporelSpatialBief res=
 					resultatsCourant_.resultatsBiefs()[indexElements[i]];
@@ -314,7 +375,7 @@
 	}
 	protected void setListePasTps() {
 		if (rbSpatial_.isSelected()) {
-			double[] pasTps= resultatsCourant_.pasTemps();
+			double[] pasTps= resultatsCourant_.valPas();
 			if (pasTps != null) {
 				String[] pasTemps= new String[pasTps.length];
 				for (int i= 0; i < pasTps.length; i++) {
@@ -344,7 +405,7 @@
 	protected void listeBiefCasierLiaison() {
 
 		int[] indices = lstBiefCasierLiaison_.getSelectedIndices();
-		ArrayList newIndices = new ArrayList(indices.length);
+		ArrayList<Integer> newIndices = new ArrayList<Integer>(indices.length);
 
 		int modeInit = mode_;
 
@@ -380,12 +441,11 @@
 		if (mode_ != MODE_BIEF) {
 
 			rbSpatial_.setEnabled(false);
-			rbTemporel_.setEnabled(false);
+			rbTemporel_.setSelected(true);
 			scrlpListPasTpsSection_.setVisible(false);
 			//pnWest_.paintAll(pnWest_.getGraphics());
 		} else {
 			rbSpatial_.setEnabled(true);
-			rbTemporel_.setEnabled(true);
 			scrlpListPasTpsSection_.setVisible(true);
 			//pnWest_.paintAll(pnWest_.getGraphics());
 		}
@@ -428,10 +488,8 @@
 
 	protected void spatial() {
 		lstBiefCasierLiaison_.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-		if (rbTemporel_.isSelected()) {
-			rbTemporel_.setSelected(false);
-		}
 		rbSpatial_.setSelected(true);
+		
 //		ttlPasTempsSection_.setTitle("Pas de Temps");
 		setListePasTps();
 //		scrlpListPasTpsSection_.repaint();
@@ -442,10 +500,8 @@
 		int indexe = lstBiefCasierLiaison_.getSelectedIndex();
 		lstBiefCasierLiaison_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		if (indexe != -1) lstBiefCasierLiaison_.setSelectedIndex(indexe);
-		if (rbSpatial_.isSelected()) {
-			rbSpatial_.setSelected(false);
-		}
 		rbTemporel_.setSelected(true);
+    
 //		ttlPasTempsSection_.setTitle("Sections de calcul");
 		setListeSectionsCalcul();
 //		scrlpListPasTpsSection_.repaint();
@@ -518,6 +574,26 @@
 		String titre= "";
 		String titreX= "";
 		String absUnite= "";
+		
+		UniteTps unit;
+		String sunit;
+		if (rbUniteS_.isSelected()) {
+		  unit=UniteTps.s;
+		  sunit=Hydraulique1dResource.getS("s");
+		}
+		else if (rbUniteM_.isSelected()) {
+      unit=UniteTps.mn;
+      sunit=Hydraulique1dResource.getS("mn");
+    }
+    else if (rbUniteH_.isSelected()) {
+      unit=UniteTps.h;
+      sunit=Hydraulique1dResource.getS("h");
+    }
+    else {
+      unit=UniteTps.j;
+      sunit=Hydraulique1dResource.getS("j");
+    }
+		
 		double[][] tab= null;
 
 		if (mode_== MODE_BIEF){
@@ -530,26 +606,26 @@
 			else if (resultatsCourant_.isTemporel()) {
 				tab=getTableauResultatsTemporels(res, indicesVar,
 						indicesPasTpsSection,
-						resultatsCourant_.valPas());
+						resultatsCourant_.valPas(), unit);
 				titre= Hydraulique1dResource.HYDRAULIQUE1D.getString("PROFIL TEMPOREL");
 				titreX= Hydraulique1dResource.HYDRAULIQUE1D.getString("tps");
-				absUnite= "s";
+				absUnite= sunit;
 			}
 			else {//Cas du calage ???
 				tab=getTableauResultatsTemporels(res, indicesVar,
 						indicesPasTpsSection,
-						resultatsCourant_.valPas());
+						resultatsCourant_.valPas(), unit);
 				titre= Hydraulique1dResource.HYDRAULIQUE1D.getString("PROFIL ITERATIF");
 				titreX= Hydraulique1dResource.HYDRAULIQUE1D.getString("it\xE9ration");
-				absUnite= "";
+				absUnite= sunit;
 			}
 		}else{
 			tab=getTableauResultatsCasiersLiaisons(res, indicesVar,
-					resultatsCourant_.valPas());
+					resultatsCourant_.valPas(), unit);
 
 			titre= Hydraulique1dResource.HYDRAULIQUE1D.getString("PROFIL TEMPOREL");
 			titreX= Hydraulique1dResource.HYDRAULIQUE1D.getString("tps");
-			absUnite= "s";
+			absUnite= sunit;
 		}
 
 
@@ -601,14 +677,14 @@
 	 * @param indicesPasTps int[]
 	 * @return double[][]
 	 */
-	private final static double[][] getTableauResultatsSpatial(
+	private final double[][] getTableauResultatsSpatial(
 			MetierResultatsTemporelSpatialBief[] resBiefs,
 			int[] indicesVar,
 			int[] indicesPasTps) {
 		int nbCourbe= indicesVar.length * indicesPasTps.length;
 		int nbBief = resBiefs.length;
 		int nbSectionTotal = 0;
-		ArrayList listeRes = new ArrayList(nbBief);
+		ArrayList<double[][]> listeRes = new ArrayList<double[][]>(nbBief);
 		for (int i = 0; i < nbBief; i++) {
 			MetierResultatsTemporelSpatialBief resBief = resBiefs[i];
 			double[][] resB= new double[nbCourbe + 1][];
@@ -630,7 +706,7 @@
 		for (int i = 0; i < res.length; i++) {
 			int indiceDest = 0;
 			for (int j = 0; j < nbBief; j++) {
-				double[][] resB = (double[][])listeRes.get(j);
+				double[][] resB = listeRes.get(j);
 				double[] resBCbi = resB[i];
 				int nbSectionsBief = resBCbi.length;
 				System.arraycopy(resBCbi,0,res[i],indiceDest,nbSectionsBief);
@@ -644,21 +720,37 @@
 	 * @param resBiefs DResultatsTemporelSpatialBief[]
 	 * @param indicesVar int[]
 	 * @param indicesSection int[]
+	 * @param _unit L'unit\xE9 de temps.
 	 * @return double[][]
 	 */
-	private final static double[][] getTableauResultatsTemporels(
+	private final double[][] getTableauResultatsTemporels(
 			MetierResultatsTemporelSpatialBief[] resBiefs,
 			int[] indicesVar,
 			int[] indicesSection,
-			double[] pasTemps) {
+			double[] pasTemps, UniteTps _unit) {
 
 		int nbPasTemps= pasTemps.length;
 
+		int coef;
+		switch (_unit) {
+    default:
+		case s:
+		  coef=1; break;
+		case mn:
+		  coef=60; break;
+		case h:
+		  coef=60*60; break;
+		case j:
+		  coef=60*60*24; break;
+		}
 
 		int nbCourbe= indicesVar.length * indicesSection.length;
 		double[][] res= new double[nbCourbe + 1][nbPasTemps];
 //		l'abscisse : les pas de temps
-		res[0]= pasTemps;
+		res[0]= Arrays.copyOf(pasTemps, nbPasTemps);
+		for (int i=0; i<nbPasTemps; i++)
+		  res[0][i]/=coef;
+		
 //		les ordonn\xE9es
 		double[][][] vals= resBiefs[0].valeursVariables();
 		for (int i= 0; i < nbPasTemps; i++) {
@@ -677,15 +769,29 @@
 	 * @param indicesVar.lengthresCasiersLiasons DResultatsTemporelSpatialBief[]
 	 * @param indicesVar int[]
 	 * @param indicesSection int[]
+	 * @param _unit L'unite de temps
 	 * @return double[][]
 	 */
-	private final static double[][] getTableauResultatsCasiersLiaisons(
+	private final double[][] getTableauResultatsCasiersLiaisons(
 			MetierResultatsTemporelSpatialBief[] resCasiersLiasons,
 			int[] indicesVar,
-			double[] pasTemps) {
+			double[] pasTemps, UniteTps _unit) {
 
 		int nbPasTemps= pasTemps.length;
 
+    int coef;
+    switch (_unit) {
+    default:
+    case s:
+      coef=1; break;
+    case mn:
+      coef=60; break;
+    case h:
+      coef=60*60; break;
+    case j:
+      coef=60*60*24; break;
+    }
+
 //		!!!!!!!!!!!!!!!!!!!!!!!!
 //		pour afficher plusieurs casiers il faudrait plusieurs courbe or normaleemnt en mode temporel le nombre de courbe devrait le nombre de variable
 //		idem la courbe a pour titre casier 0.0 car elle affiche le numero de section qui est pas defaut 0
@@ -698,7 +804,9 @@
 
 		double[][] res= new double[nbCourbe + 1][nbPasTemps];
 //		l'abscisse : les pas de temps
-		res[0]= pasTemps;
+    res[0]= Arrays.copyOf(pasTemps, nbPasTemps);
+    for (int i=0; i<nbPasTemps; i++)
+      res[0][i]/=coef;
 
 //		les ordonn\xE9es
 		double[][][] vals= resCasiersLiasons[0].valeursVariables();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8878] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java

[<de...@us...>]

Revision: 8878
          http://sourceforge.net/p/fudaa/svn/8878
Author:   deniger
Date:     2014-10-14 19:59:19 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
correction bogue 2.1.5

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2014-10-09 22:26:53 UTC (rev 8877)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java	2014-10-14 19:59:19 UTC (rev 8878)
@@ -90,7 +90,7 @@
   private MetierResultatsTemporelSpatial resultatsCourant_ = null;
 
   private Hydraulique1dGraphesResultatsEditor parent_;
-private JCheckBox checkboxGrid = new JCheckBox(Hydraulique1dResource.HYDRAULIQUE1D.getString("Afficher la Grille"));
+  private JCheckBox checkboxGrid = new JCheckBox(Hydraulique1dResource.HYDRAULIQUE1D.getString("Afficher la Grille"));
 
   private enum UniteTps {
 
@@ -110,8 +110,6 @@
     Dimension d = bgraphe_.getPersonnaliseurGraphe().getPreferredSize();
     Dimension dList = new Dimension(d.width, d.height / 2);
 
-    
-    
     scrlpListPasTpsSection_.setPreferredSize(dList);
     scrlpListPasTpsSection_.setBorder(ttlPasTempsSection_);
 
@@ -177,16 +175,16 @@
     });
     checkboxGrid.setSelected(true);
     checkboxGrid.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-			boolean displayGrid = checkboxGrid.isSelected();
-			if(bgraphe_.getGraphe() != null && bgraphe_.getGraphe() instanceof MascaretGridGraphe) {
-				((MascaretGridGraphe)bgraphe_.getGraphe()).setDisplayGrid(displayGrid);
-				bgraphe_.fullRepaint();
-			}
-			
-		}
-	});
-    
+      public void actionPerformed(ActionEvent e) {
+        boolean displayGrid = checkboxGrid.isSelected();
+        if (bgraphe_.getGraphe() != null && bgraphe_.getGraphe() instanceof MascaretGridGraphe) {
+          ((MascaretGridGraphe) bgraphe_.getGraphe()).setDisplayGrid(displayGrid);
+          bgraphe_.fullRepaint();
+        }
+
+      }
+    });
+
     rbSpatial_.setActionCommand("SPATIAL");
     rbSpatial_.addActionListener(this);
     rbTemporel_.setActionCommand("TEMPOREL");
@@ -362,7 +360,7 @@
         String numFinChaine = valueChaine.substring(debutChaine.length()).trim();
         listeIndexes.add(new Integer(Integer.parseInt(numFinChaine) - 1));
       }
-			//StringTokenizer st= new StringTokenizer(values[i].toString());
+      //StringTokenizer st= new StringTokenizer(values[i].toString());
       //if (debutChaine.equals(st.nextToken())) {
       //	listeIndexes.add(new Integer(Integer.parseInt(st.nextToken()) - 1));
       //}
@@ -485,6 +483,11 @@
       //pnWest_.paintAll(pnWest_.getGraphics());
     } else {
       rbSpatial_.setEnabled(true);
+      if (rbSpatial_.isSelected()) {
+        spatial();
+      } else {
+        temporel();
+      }
       scrlpListPasTpsSection_.setVisible(true);
       //pnWest_.paintAll(pnWest_.getGraphics());
     }
@@ -573,7 +576,7 @@
 
   protected void visualiser(boolean calculBorne) {
     int[] index = getIndexElementsSelectionnes();
-		//System.err.println("Mode "+mode_);
+    //System.err.println("Mode "+mode_);
 
     MetierResultatsTemporelSpatialBief[] res = new MetierResultatsTemporelSpatialBief[index.length];
     for (int i = 0; i < index.length; i++) {
@@ -853,7 +856,7 @@
 //		idem la courbe a pour titre casier 0.0 car elle affiche le numero de section qui est pas defaut 0
 //		!!!!!!!!!!!!!!!!!!!!!!!!!!
     int nbCourbe = indicesVar.length * resCasiersLiasons.length;
-		//System.err.println("NB VAR "+indicesVar.length);
+    //System.err.println("NB VAR "+indicesVar.length);
     //System.err.println("NBCASIER "+resCasiersLiasons.length);
     //System.err.println("NB COURBE "+nbCourbe);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.