Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3904] trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar
|
From: <fa...@us...> - 2008-09-10 07:40:06
|
Revision: 3904
http://fudaa.svn.sourceforge.net/fudaa/?rev=3904&view=rev
Author: fargeix
Date: 2008-09-10 07:40:16 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
Modifications diverses du code pour r?\195?\169pondre ?\195?\160 certains probl?\195?\168mes :
- URL erronn?\195?\169es
- probl?\195?\168me de formats de nombres
- impossibilit?\195?\169 de saisir un moment n?\195?\169gatif en t?\195?\170te
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDeformeeResultatsBruts.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDiagrammePressionsResultatsBruts.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsParametresEffortsEnTeteDeRideau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsTranchantsResultatsBruts.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarMomentsFlechissantsResultatsBruts.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarPredimensionnementResultatsBruts.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDeformeeResultatsBruts.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDeformeeResultatsBruts.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDeformeeResultatsBruts.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -145,7 +145,7 @@
*
*/
protected void sauvegarder() {
- final String file = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es bruts", "Exporter",
+ final String file = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es brutes", "Exporter",
OscarLib.USER_HOME + "deformees.csv");
final StringBuffer txt = new StringBuffer();
if (file == null) {
@@ -187,8 +187,8 @@
SPointCoteValeur _p = null;
try {
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_deformee_.getValueAt(_n - 1, 0)).doubleValue();
- _p.valeur = ((Double) dm_tb_deformee_.getValueAt(_n - 1, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_deformee_.getValueAt(_n - 1, 0).toString());
+ _p.valeur = Double.parseDouble(dm_tb_deformee_.getValueAt(_n - 1, 1).toString());
} catch (final ArrayIndexOutOfBoundsException _e1) {
WSpy.Error(OscarMsg.ERR035);
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDiagrammePressionsResultatsBruts.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDiagrammePressionsResultatsBruts.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDiagrammePressionsResultatsBruts.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -131,7 +131,7 @@
*
*/
protected void sauvegarder() {
- final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es bruts", "Exporter", OscarLib.USER_HOME
+ final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es brutes", "Exporter", OscarLib.USER_HOME
+ "pressions.csv");
String _txt = "";
if (_f == null) {
@@ -173,8 +173,8 @@
SPointCoteValeur _p = null;
try {
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_pressions_.getValueAt(_n - 1, 0)).doubleValue();
- _p.valeur = ((Double) dm_tb_pressions_.getValueAt(_n - 1, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_pressions_.getValueAt(_n - 1, 0).toString());
+ _p.valeur = Double.parseDouble(dm_tb_pressions_.getValueAt(_n - 1, 1).toString());
} catch (final ArrayIndexOutOfBoundsException _e1) {
WSpy.Error(OscarMsg.ERR030);
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsParametresEffortsEnTeteDeRideau.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsParametresEffortsEnTeteDeRideau.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsParametresEffortsEnTeteDeRideau.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -148,9 +148,9 @@
}
if (_etr.valeurMomentEnTete == VALEUR_NULLE.value) {
_vm.add(OscarMsg.VMSG040);
- } else if (_etr.valeurMomentEnTete < 0.0) {
+ } /*else if (_etr.valeurMomentEnTete < 0.0) {
_vm.add(OscarMsg.VMSG041);
- }
+ }*/
return _vm;
}
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsTranchantsResultatsBruts.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsTranchantsResultatsBruts.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsTranchantsResultatsBruts.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -118,7 +118,7 @@
*
*/
protected void sauvegarder() {
- final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es bruts", "Exporter", OscarLib.USER_HOME
+ final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es brutes", "Exporter", OscarLib.USER_HOME
+ "efforts.csv");
String _txt = "";
if (_f == null) {
@@ -159,8 +159,8 @@
SPointCoteValeur _p = null;
try {
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_efforts_.getValueAt(_n - 1, 0)).doubleValue();
- _p.valeur = ((Double) dm_tb_efforts_.getValueAt(_n - 1, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_efforts_.getValueAt(_n - 1, 0).toString());
+ _p.valeur = Double.parseDouble(dm_tb_efforts_.getValueAt(_n - 1, 1).toString());
} catch (final ArrayIndexOutOfBoundsException _e1) {
WSpy.Error(OscarMsg.ERR035);
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -399,15 +399,15 @@
return false;
}
if (file != null) {
- try {
- appli_.getImplementation().displayURL(file.toURL().toString());
- } catch (final MalformedURLException e) {
+ //try {
+ appli_.getImplementation().displayURL(file.getAbsolutePath());
+ /*} catch (final MalformedURLException e) {
if (CtuluLibMessage.DEBUG) {
e.printStackTrace();
}
WSpy.Error("L'adresse du fichier " + file.getAbsolutePath() + " est invalide");
return false;
- }
+ }*/
}
return true;
} else if (_mode.equals("todisk")) {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -665,9 +665,9 @@
System.out.println("OscarImplementation.informationsSoftware().baseManUrl(): "+OscarImplementation.informationsSoftware().man);
System.out.println("OscarImplementation.informationsSoftware().name.toLowerCase(): "+OscarImplementation.informationsSoftware().name.toLowerCase());
- final String _u = "file:"
+ final String _u = //"file:"+
//+ OscarImplementation.informationsSoftware().man
- +cheminAide()
+ cheminAide()
//+ OscarImplementation.informationsSoftware().name.toLowerCase()+ "/"
+ _url;
return _u;
@@ -1804,9 +1804,10 @@
//--cas 3: plus de 2 chiffres apres la virgule: on formatte
- String formatC="0.000";
+ //String formatC="0.000";
- return new DecimalFormat(formatC).format(nombre);
+ //return new DecimalFormat(formatC).format(nombre);
+ return Double.toString(Math.round(nombre*1000)/1000);
}
public static String formatterNombre2(double nombre)
@@ -1820,9 +1821,10 @@
//--cas 3: plus de 2 chiffres apres la virgule: on formatte
- String formatC="0.000000000";
+ //String formatC="0.000000000";
- return new DecimalFormat(formatC).format(nombre);
+ //return new DecimalFormat(formatC).format(nombre);
+ return Double.toString(Math.round(nombre*1000000000)/1000000000);
}
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarMomentsFlechissantsResultatsBruts.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarMomentsFlechissantsResultatsBruts.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarMomentsFlechissantsResultatsBruts.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -119,7 +119,7 @@
*
*/
protected void sauvegarder() {
- final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es bruts", "Exporter", OscarLib.USER_HOME
+ final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es brutes", "Exporter", OscarLib.USER_HOME
+ "moments.csv");
String _txt = "";
if (_f == null) {
@@ -160,8 +160,8 @@
SPointCoteValeur _p = null;
try {
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_moments_.getValueAt(_n - 1, 0)).doubleValue();
- _p.valeur = ((Double) dm_tb_moments_.getValueAt(_n - 1, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_moments_.getValueAt(_n - 1, 0).toString());
+ _p.valeur = Double.parseDouble(dm_tb_moments_.getValueAt(_n - 1, 1).toString());
} catch (final ArrayIndexOutOfBoundsException _e1) {
WSpy.Error(OscarMsg.ERR035);
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarPredimensionnementResultatsBruts.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarPredimensionnementResultatsBruts.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarPredimensionnementResultatsBruts.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -109,7 +109,7 @@
*
*/
protected void sauvegarder() {
- final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es bruts", "Exporter", OscarLib.USER_HOME
+ final String _f = OscarLib.getFileChoosenByUser(this, "Exporter les donn\xE9es brutes", "Exporter", OscarLib.USER_HOME
+ "predimensionnement.csv");
String _txt = "";
if (_f == null) {
@@ -148,22 +148,22 @@
public SResultatsPredimensionnement getResultatsPredimensionnement() {
SPointCoteValeur _p = null;
final SResultatsPredimensionnement _sr = new SResultatsPredimensionnement();
- _sr.cotePressionNull = ((Double) dm_tb_predim_.getValueAt(0, 1)).doubleValue();
- _sr.pointButeeSimple = ((Double) dm_tb_predim_.getValueAt(1, 1)).doubleValue();
- _sr.pied20Pourcent = ((Double) dm_tb_predim_.getValueAt(2, 1)).doubleValue();
- _sr.piedContreButee = ((Double) dm_tb_predim_.getValueAt(3, 1)).doubleValue();
+ _sr.cotePressionNull = Double.parseDouble(dm_tb_predim_.getValueAt(0, 1).toString());
+ _sr.pointButeeSimple = Double.parseDouble(dm_tb_predim_.getValueAt(1, 1).toString());
+ _sr.pied20Pourcent = Double.parseDouble(dm_tb_predim_.getValueAt(2, 1).toString());
+ _sr.piedContreButee = Double.parseDouble(dm_tb_predim_.getValueAt(3, 1).toString());
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_predim_.getValueAt(4, 1)).doubleValue();
- _p.valeur = ((Double) dm_tb_predim_.getValueAt(5, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_predim_.getValueAt(4, 1).toString());
+ _p.valeur = Double.parseDouble(dm_tb_predim_.getValueAt(5, 1).toString());
_sr.momentMaximum = _p;
_p = new SPointCoteValeur();
- _p.cote = ((Double) dm_tb_predim_.getValueAt(6, 1)).doubleValue();
- _p.valeur = ((Double) dm_tb_predim_.getValueAt(7, 1)).doubleValue();
+ _p.cote = Double.parseDouble(dm_tb_predim_.getValueAt(6, 1).toString());
+ _p.valeur = Double.parseDouble(dm_tb_predim_.getValueAt(7, 1).toString());
_sr.momentMinimum = _p;
if (tb_predim_.getRowCount() > 8) {
- _sr.encastrement = ((Double) dm_tb_predim_.getValueAt(8, 1)).doubleValue();
- _sr.reactionAncrage = ((Double) dm_tb_predim_.getValueAt(9, 1)).doubleValue();
- _sr.niveauAncrage = ((Double) dm_tb_predim_.getValueAt(10, 1)).doubleValue();
+ _sr.encastrement = Double.parseDouble(dm_tb_predim_.getValueAt(8, 1).toString());
+ _sr.reactionAncrage = Double.parseDouble(dm_tb_predim_.getValueAt(9, 1).toString());
+ _sr.niveauAncrage = Double.parseDouble(dm_tb_predim_.getValueAt(10, 1).toString());
} else {
_sr.encastrement = VALEUR_NULLE.value;
_sr.niveauAncrage = VALEUR_NULLE.value;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java 2008-09-10 07:30:34 UTC (rev 3903)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java 2008-09-10 07:40:16 UTC (rev 3904)
@@ -82,7 +82,7 @@
final String _alt) {
final String _img = fichier_ + "files" + OscarLib.FILE_SEPARATOR + _imgname;
OscarLib.exportGraphScriptToGif(_script, _img);
- html_ += "<p><a href=\"" + _img + "\" target=\"_blank\"><img src=\"" + _img + "\" border=\"0\" "
+ html_ += "<p><a href=\"" + fichier_.substring(fichier_.lastIndexOf(OscarLib.FILE_SEPARATOR)+1)+"files/"+_imgname + "\" target=\"_blank\"><img src=\"" + fichier_.substring(fichier_.lastIndexOf(OscarLib.FILE_SEPARATOR)+1)+"files/"+_imgname + "\" border=\"0\" "
+ ((_w == -1) ? "" : ("width=\"" + _w + "\"")) + " " + ((_h == -1) ? "" : ("height=\"" + _h + "\""))
+ " alt=\"" + _alt + "\"></a></p>" + OscarLib.LINE_SEPARATOR;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
