[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier Hydraulique1dCasierPlanimEditor.java,1.2,1.3 Hydraulique1dCasierSemiPointsEditor.java,1.2,1.3 Hydraulique1dCasierTableauXYZPanel.java,1.2,1.3

[<jm_...@us...>]

Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier
In directory sc8-pr-cvs1:/tmp/cvs-serv14568/editor/casier

Modified Files:
	Hydraulique1dCasierPlanimEditor.java 
	Hydraulique1dCasierSemiPointsEditor.java 
	Hydraulique1dCasierTableauXYZPanel.java 
Log Message:
Debug et import export


Index: Hydraulique1dCasierPlanimEditor.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierPlanimEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hydraulique1dCasierPlanimEditor.java	23 Jul 2003 09:13:49 -0000	1.2
--- Hydraulique1dCasierPlanimEditor.java	4 Aug 2003 17:50:07 -0000	1.3
***************
*** 206,211 ****
    public int print(Graphics _g,PageFormat _format, int _page) {
      if (_page==0) return grapheSurface_.print(_g,_format, _page);
!     else return grapheVolume_.print(_g,_format, _page);
    }
  
    public String[] getEnabledActions() {
--- 206,216 ----
    public int print(Graphics _g,PageFormat _format, int _page) {
      if (_page==0) return grapheSurface_.print(_g,_format, _page);
!     else return grapheVolume_.print(_g,_format, _page-1);
    }
+ 
+   public int getNumberOfPages() {
+     return 2;
+   }
+ 
  
    public String[] getEnabledActions() {

Index: Hydraulique1dCasierSemiPointsEditor.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hydraulique1dCasierSemiPointsEditor.java	23 Jul 2003 09:13:49 -0000	1.2
--- Hydraulique1dCasierSemiPointsEditor.java	4 Aug 2003 17:50:08 -0000	1.3
***************
*** 157,164 ****
      String cmd=_evt.getActionCommand();
      if( "VALIDER".equals(cmd) ) {
!       if( getValeurs() ) {
!         firePropertyChange("casier", null, param_);
        }
-       fermer();
      }
      else if("EDITER_AXES".equals(cmd) ) {
--- 157,184 ----
      String cmd=_evt.getActionCommand();
      if( "VALIDER".equals(cmd) ) {
!       String messageTableauFront = pnTableauPtsFrontieres_.validationDonnees();
!       String messageTableauInter = pnTableauPtsInterieurs_.validationDonnees();
!       double plusPetitEcartZPtsInter = pnTableauPtsInterieurs_.getPlusPetitEcartCote();
!       double pasPlanim = ((Double)tfPasPlanim_.getValue()).doubleValue();
!       String messageEcartZ="";
!       if (plusPetitEcartZPtsInter != Double.MAX_VALUE) {
!         if ( pasPlanim < plusPetitEcartZPtsInter) {
!           messageEcartZ= "Le pas de planimètrage ("+pasPlanim+") doit être supérieur au";
!           messageEcartZ+="\nplus petit écart entre les cotes des points intérieurs ("+plusPetitEcartZPtsInter+")";
!         }
!       }
!       if ( messageTableauFront.equals("") && messageTableauInter.equals("") && messageEcartZ.equals("") ){
!         if( getValeurs() ) {
!           firePropertyChange("casier", null, param_);
!         }
!         fermer();
!       }
!       else {
!        new BuDialogMessage(
!         (BuCommonInterface)Hydraulique1dBaseApplication.FRAME,
!         ((BuCommonInterface)Hydraulique1dBaseApplication.FRAME).getInformationsSoftware(),
!         "Contraintes non vérifiées :\n"+messageTableauFront+"\n\n"+messageTableauInter+"\n\n"+messageEcartZ
!           ).activate();
        }
      }
      else if("EDITER_AXES".equals(cmd) ) {
***************
*** 188,193 ****
  
      try {
-       System.out.println("Hydraulique1dCasierSemiPointsEditor getValeurs() : ");
-       System.out.println("                           tfPasPlanim_.getValue()="+tfPasPlanim_.getValue());
        double pas=((Double)tfPasPlanim_.getValue()).doubleValue();
        if( pas!=param_.getPasPlanimetrage() ) {
--- 208,211 ----
***************
*** 196,204 ****
        }
  
-       System.out.println("                           cmbOptionCalcul_.getSelectedItem()="+cmbOptionCalcul_.getSelectedItem());
-       System.out.println("                           param_.isSurfaceDependCote()="+param_.isSurfaceDependCote());
        boolean option = ((String)cmbOptionCalcul_.getSelectedItem()).equals(OPTIONS_CALCUL[1]);
-       System.out.println("                           option="+option);
-       System.out.println("                           param_.isSurfaceDependCote()="+param_.isSurfaceDependCote());
        if ( option != param_.isSurfaceDependCote()) {
          param_.setSurfaceDependCote(option);
--- 214,218 ----

Index: Hydraulique1dCasierTableauXYZPanel.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauXYZPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hydraulique1dCasierTableauXYZPanel.java	23 Jul 2003 09:13:49 -0000	1.2
--- Hydraulique1dCasierTableauXYZPanel.java	4 Aug 2003 17:50:08 -0000	1.3
***************
*** 158,161 ****
--- 158,171 ----
    }
  
+   public String validationDonnees() {
+     if (model_ == null) return null;
+     return ((Hydraulique1dCasierTabXYZModel)table_.getModel()).validationDonnees();
+   }
+ 
+   public double getPlusPetitEcartCote() {
+     if (model_ == null) return Double.NaN;
+     return ((Hydraulique1dCasierTabXYZModel)table_.getModel()).getPlusPetitEcartCote();
+   }
+ 
    void setValeurs() {
      if (model_ == null) return;