Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau
In directory sc8-pr-cvs1:/tmp/cvs-serv8255/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau
Modified Files:
Hydraulique1dReseauBarragePrincipal.java
Hydraulique1dReseauFrame.java Hydraulique1dReseauPalette.java
Log Message:
Désactivation de la fonction Casier et des nouveautés de mascaret V5P2.
Index: Hydraulique1dReseauBarragePrincipal.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBarragePrincipal.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dReseauBarragePrincipal.java 22 Jul 2003 13:37:20 -0000 1.4
--- Hydraulique1dReseauBarragePrincipal.java 17 Oct 2003 16:26:08 -0000 1.5
***************
*** 112,115 ****
--- 112,117 ----
}
+
+
public String[] getInfos() {
IBarragePrincipal iobjet = (IBarragePrincipal)getData("barragePrincipal");
Index: Hydraulique1dReseauFrame.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Hydraulique1dReseauFrame.java 4 Aug 2003 17:50:09 -0000 1.6
--- Hydraulique1dReseauFrame.java 17 Oct 2003 16:26:08 -0000 1.7
***************
*** 164,174 ****
ISeuil iseuil;
boolean transcritique = (etude_.paramGeneraux().regime().value() == LRegime._TRANSCRITIQUE);
! iseuil = new Hydraulique1dSeuilChooser(reseau_, transcritique).activate();
! if (iseuil != null) {
! Hydraulique1dReseauSeuil seuil = new Hydraulique1dReseauSeuil(iseuil);
! grid_.add(seuil);
! repaint();
! }
}
--- 164,179 ----
ISeuil iseuil;
boolean transcritique = (etude_.paramGeneraux().regime().value() == LRegime._TRANSCRITIQUE);
! if (transcritique && (! CGlobal.autorisation2SingulariteTrans)) {
! iseuil = reseau_.creeSeuilTranscritique();
! }
! else {
! iseuil = new Hydraulique1dSeuilChooser(reseau_, transcritique).activate();
! }
! if (iseuil != null) {
! Hydraulique1dReseauSeuil seuil = new Hydraulique1dReseauSeuil(iseuil);
! grid_.add(seuil);
! repaint();
! }
}
Index: Hydraulique1dReseauPalette.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dReseauPalette.java 8 Jun 2003 22:10:19 -0000 1.4
--- Hydraulique1dReseauPalette.java 17 Oct 2003 16:26:08 -0000 1.5
***************
*** 12,15 ****
--- 12,16 ----
import com.memoire.bu.*;
import com.memoire.dja.*;
+ import org.fudaa.dodico.hydraulique1d.CGlobal;
import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
***************
*** 50,55 ****
buttons_=new BuButton[names.length];
!
! for(int i=0; i<buttons_.length; i++)
{
BuIcon icon=Hydraulique1dResource.HYDRAULIQUE1D.getIcon("hydraulique1d"+icons[i]);
--- 51,59 ----
buttons_=new BuButton[names.length];
! int decalage = 0;
! if (! CGlobal.autorisationCasier) {
! decalage = 2;
! }
! for(int i=0; i<(buttons_.length-decalage); i++)
{
BuIcon icon=Hydraulique1dResource.HYDRAULIQUE1D.getIcon("hydraulique1d"+icons[i]);
***************
*** 59,63 ****
buttons_[i].setMargin(new Insets(1,1,1,1));
buttons_[i].setRequestFocusEnabled(false);
! buttons_[i].setToolTipText( /* "Créer "+ */ names[i]);
buttons_[i].setActionCommand("HYDRAULIQUE1D_CREATE_RESEAU("+names[i]+")");
--- 63,67 ----
buttons_[i].setMargin(new Insets(1,1,1,1));
buttons_[i].setRequestFocusEnabled(false);
! buttons_[i].setToolTipText( names[i]);
buttons_[i].setActionCommand("HYDRAULIQUE1D_CREATE_RESEAU("+names[i]+")");
|
