|
From: <de...@us...> - 2014-10-14 19:59:27
|
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.
|