Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-10-24 15:40:34
|
Revision: 7793
http://fudaa.svn.sourceforge.net/fudaa/?rev=7793&view=rev
Author: deniger
Date: 2012-10-24 15:40:25 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2012-10-24 15:34:03 UTC (rev 7792)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2012-10-24 15:40:25 UTC (rev 7793)
@@ -107,6 +107,7 @@
import com.memoire.fu.FuLib;
import org.fudaa.ctulu.CtuluLib;
import com.memoire.bu.BuLib;
+import com.memoire.fu.FuLog;
/**
* @author Jean-Marc Lacombe
@@ -326,9 +327,12 @@
fProprietes_ = new FudaaProjetInformationsFrame(this);
ihmP_ = Hydraulique1dIHMRepository.getInstance();
projet_.setIhmRepository(ihmP_);
+ //Genesis: autorisation de la version 1.7
String versionJava = System.getProperty("java.version").substring(0, 3);
- if (versionJava.equalsIgnoreCase("1.4") || versionJava.equalsIgnoreCase("1.5") || versionJava.equalsIgnoreCase("1.6")) {
- System.out.println(_("version de java correcte"));
+ if (versionJava.equalsIgnoreCase("1.4") || versionJava.equalsIgnoreCase("1.5") || versionJava.equalsIgnoreCase("1.6")
+ || versionJava.equalsIgnoreCase("1.7")
+ ) {
+ FuLog.debug(_("version de java correcte"));
} else {
error(_("Version de Java"), _("La version de java est incorrecte") + " "
+ System.getProperty("java.version") + "\n" + _("Une version 1.4 \xE0 1.6 est n\xE9cessaire"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-05-16 21:48:59
|
Revision: 8409
http://sourceforge.net/p/fudaa/svn/8409
Author: bmarchan
Date: 2013-05-16 21:48:56 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Version 3.1.6 suite a fix pb binaire
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-05-16 21:37:59 UTC (rev 8408)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-05-16 21:48:56 UTC (rev 8409)
@@ -147,9 +147,9 @@
static {
isApp_.name = "Fudaa-Mascaret";
- isApp_.version = "3.1.5";
- isApp_.date = "07-D\xE9cembre-2012";
- isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2012";
+ isApp_.version = "3.1.6";
+ isApp_.date = "16-05-2013";
+ isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "http://www.openmascaret.org/";
isApp_.license = MascaretResource.MASCARET.getString("licences GPL pour Fudaa-Mascaret et le noyau de calcul");
@@ -168,7 +168,7 @@
isApp_.libraries = null;
isApp_.thanks = new String[]{"Fudaa team"};
idApp_.name = "Fudaa-Mascaret";
- idApp_.version = "3.1.5";
+ idApp_.version = "3.1.6";
idApp_.organization = "EDF-CETMEF";
idApp_.author = author;
idApp_.contact = "http://www.openmascaret.org/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-07-26 15:48:40
|
Revision: 8450
http://sourceforge.net/p/fudaa/svn/8450
Author: bmarchan
Date: 2013-07-26 15:48:37 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
MAscaret : Chgt de n?\194?\176 de version
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-26 15:48:04 UTC (rev 8449)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-26 15:48:37 UTC (rev 8450)
@@ -147,8 +147,8 @@
static {
isApp_.name = "Fudaa-Mascaret";
- isApp_.version = "3.1.7-1";
- isApp_.date = "05-07-2013";
+ isApp_.version = "3.1.8";
+ isApp_.date = "30-07-2013";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "http://www.openmascaret.org/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-07-29 08:52:59
|
Revision: 8451
http://sourceforge.net/p/fudaa/svn/8451
Author: bmarchan
Date: 2013-07-29 08:52:55 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Mascaret : Sauvegarde dans les recent files du dernier fichier ouvert.
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-26 15:48:37 UTC (rev 8450)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-29 08:52:55 UTC (rev 8451)
@@ -1579,6 +1579,7 @@
return;
}
getMainMenuBar().addRecentFile(fichier.getAbsolutePath(), "mascaret");
+ MascaretPreferences.MASCARET.writeIniFile();
} else {
fermer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-07-29 10:31:56
|
Revision: 8455
http://sourceforge.net/p/fudaa/svn/8455
Author: bmarchan
Date: 2013-07-29 10:31:53 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Mascaret : Suppression des log ds assistance.log
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-29 10:31:07 UTC (rev 8454)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-29 10:31:53 UTC (rev 8455)
@@ -280,6 +280,7 @@
getApp().removeAction("VISIBLE_LEFTCOLUMN");
setEnableMenu();
assistant_ = new BuAssistant();
+ assistant_.setLog(false);
MascaretResource.ASSISTANT = assistant_;
Hydraulique1dResource.setAssistant(assistant_);
BuMainPanel mp = getApp().getMainPanel();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-12-05 11:51:46
|
Revision: 8537
http://sourceforge.net/p/fudaa/svn/8537
Author: bmarchan
Date: 2013-12-05 11:51:42 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Mascaret : Controle des variables manquantes avant calcul.
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-12-05 11:50:56 UTC (rev 8536)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-12-05 11:51:42 UTC (rev 8537)
@@ -149,7 +149,7 @@
static {
isApp_.name = "Fudaa-Mascaret";
- isApp_.version = "3.1.10-beta1";
+ isApp_.version = "3.1.10-beta2";
isApp_.date = "14-11-2013";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
@@ -170,7 +170,7 @@
isApp_.libraries = null;
isApp_.thanks = new String[]{"Fudaa team"};
idApp_.name = "Fudaa-Mascaret";
- idApp_.version = "3.1.10-beta1";
+ idApp_.version = "3.1.10-beta2";
idApp_.organization = "EDF-CETMEF";
idApp_.author = author;
idApp_.contact = "http://www.openmascaret.org/";
@@ -529,7 +529,7 @@
bcalcul_ = true;
setEnableMenu();
-
+
//BuMainPanel mp= getMainPanel();
System.err.println(_("Transmission des parametres") + "...");
HYDRO_KONVERT.convertirParametres(false);
@@ -543,19 +543,10 @@
HYDRO_KONVERT.convertirResultats(avertissement);
if (ietude1d_.resultatsGeneraux()!=null && ietude1d_.resultatsGeneraux().hasResultatsTemporelSpatial()) {
- // On ajoute le nouveau r\xE9sultat s\xE9dimentaire
+ // On ajoute les nouveaux r\xE9sultats s\xE9dimentaires
if (ietude1d_.sediment().parametres().isActif()) {
MetierCalculSediment calSed=new MetierCalculSediment(ietude1d_.resultatsGeneraux().resultatsTemporelSpatial(), ietude1d_.sediment().parametres());
- MetierDescriptionVariable[] vars=calSed.computeResultsForVariable();
- if (vars!=null) {
- StringBuilder sb=new StringBuilder();
- for (MetierDescriptionVariable var : vars) {
- sb.append("\n- ").append(var.description());
- }
- JOptionPane.showMessageDialog(getApp().getFrame(), Hydraulique1dResource.getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun r\xE9sultat s\xE9dimentologique calcul\xE9.", sb.toString()),
- Hydraulique1dResource.getS("Attention"), JOptionPane.WARNING_MESSAGE);
-
- }
+ calSed.computeResultsForVariables();
}
}
@@ -912,6 +903,24 @@
return;
}
+ // Controle que toutes les variables hydrauliques sont bien pr\xE9sentes pour le calcul s\xE9dimentaire.
+ if (ietude1d_.sediment().parametres().isActif()) {
+ MetierDescriptionVariable[] missVars=ietude1d_.sediment().parametres().isVariablesManquantes(ietude1d_.paramResultats().variables());
+ if (missVars.length!=0) {
+ StringBuilder sb=new StringBuilder();
+ for (MetierDescriptionVariable var : missVars) {
+ sb.append("\n- ").append(var.description());
+ }
+ if (JOptionPane.showConfirmDialog(getApp().getFrame(), Hydraulique1dResource.getS(
+ "Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul s\xE9dimentologique par les formules choisies:{0}\n\n"+
+ "Certains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.\nVoulez-vous poursuivre ?", sb.toString()),
+ Hydraulique1dResource.getS("Attention"), JOptionPane.OK_CANCEL_OPTION)==JOptionPane.CANCEL_OPTION) {
+ return;
+ }
+ }
+ }
+
+
JInternalFrame[] internFrames = getAllInternalFrames();
for (int i = 0; i < internFrames.length; i++) {
if (internFrames[i] instanceof Hydraulique1dReseauFrame) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 01:23:33
|
Revision: 8707
http://sourceforge.net/p/fudaa/svn/8707
Author: deniger
Date: 2014-05-20 01:23:29 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 01:23:12 UTC (rev 8706)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 01:23:29 UTC (rev 8707)
@@ -150,8 +150,8 @@
static {
isApp_.name = "Fudaa-Mascaret";
- isApp_.version = "3.2.1";
- isApp_.date = "13-02-2014";
+ isApp_.version = "3.3";
+ isApp_.date = "20-05-2014";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CEREMA (c) 2001-2014";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "ot-...@op...";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-11-06 21:31:27
|
Revision: 8907
http://sourceforge.net/p/fudaa/svn/8907
Author: deniger
Date: 2014-11-06 21:31:23 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
mois de version
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-05 17:34:09 UTC (rev 8906)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-06 21:31:23 UTC (rev 8907)
@@ -153,7 +153,7 @@
static {
isApp_.name = "Fudaa-Mascaret";
isApp_.version = "3.4";
- isApp_.date = "October 2014";
+ isApp_.date = "November 2014";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CEREMA (c) 2001-2014";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "ot-...@op...";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-11-19 20:47:38
|
Revision: 8936
http://sourceforge.net/p/fudaa/svn/8936
Author: deniger
Date: 2014-11-19 20:47:30 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
maj versions finales
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-17 10:54:07 UTC (rev 8935)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-11-19 20:47:30 UTC (rev 8936)
@@ -179,6 +179,8 @@
idApp_.contact = "http://www.openmascaret.org/";
idApp_.date = FuLib.date();
idApp_.logo = MascaretResource.MASCARET.getIcon("fudaamascaretlogo");
+
+ isApp_.citation = "Jean-Marc Lacombe";
BuPrinter.INFO_LOG = isApp_;
BuPrinter.INFO_DOC = idApp_;
}
@@ -365,7 +367,7 @@
ensureRigthColumnIsVisible(rl);
}
});
-
+
//Genesis: autorisation de la version 1.7
String versionJava = System.getProperty("java.version").substring(0, 3);
if (versionJava.equalsIgnoreCase("1.6") || versionJava.equalsIgnoreCase("1.7") || versionJava.equalsIgnoreCase("1.8")) {
@@ -377,7 +379,7 @@
}
}
- public void ensureRigthColumnIsVisible(BuColumn rl) {
+ public void ensureRigthColumnIsVisible(BuColumn rl) {
rl.setVisible(true);
int h = (int) rl.getPreferredSize().getHeight();
rl.setMinimumSize(new Dimension(LEFT_COLUMN_MIN_WIDTH, h));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X