Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8460] trunk/soft/fudaa-mascaret
|
From: <bma...@us...> - 2013-07-29 16:30:29
|
Revision: 8460
http://sourceforge.net/p/fudaa/svn/8460
Author: bmarchan
Date: 2013-07-29 16:30:26 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Mascaret : Chgt version => 3.1.8
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/pom.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
trunk/soft/fudaa-mascaret/pom.xml
trunk/soft/fudaa-mascaret/server/pom.xml
trunk/soft/fudaa-mascaret/ui/pom.xml
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml 2013-07-29 16:30:26 UTC (rev 8460)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.1.7</version>
+ <version>3.1.8</version>
</parent>
<artifactId>mascaret-distrib</artifactId>
<properties>
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt 2013-07-29 16:30:26 UTC (rev 8460)
@@ -1,5 +1,5 @@
====================
-Fudaa-Mascaret 3.1.7
+Fudaa-Mascaret 3.1.8
====================
Fudaa Mascaret : Installation
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt 2013-07-29 16:30:26 UTC (rev 8460)
@@ -1,5 +1,5 @@
====================
-Fudaa-Mascaret 3.1.7
+Fudaa-Mascaret 3.1.8
====================
Fudaa Mascaret : Installation
Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/pom.xml 2013-07-29 16:30:26 UTC (rev 8460)
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.1.7</version>
+ <version>3.1.8</version>
<name>Fudaa-Mascaret</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/server/pom.xml 2013-07-29 16:30:26 UTC (rev 8460)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.1.7</version>
+ <version>3.1.8</version>
</parent>
<artifactId>mascaret-server</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml 2013-07-29 16:30:26 UTC (rev 8460)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.1.7</version>
+ <version>3.1.8</version>
</parent>
<artifactId>mascaret-ui</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java 2013-07-29 16:30:26 UTC (rev 8460)
@@ -165,6 +165,13 @@
btProfAvancer_.setVisible(btravers);
btProfAvancerVite_.setVisible(btravers);
}
+
+ public void updateNavigation() {
+ btProfAvancer_.setEnabled(pnProfils_.getProfilCourant()!=pnProfils_.getProfilsModeleBief().length-1);
+ btProfAvancerVite_.setEnabled(pnProfils_.getProfilCourant()!=pnProfils_.getProfilsModeleBief().length-1);
+ btProfReculer_.setEnabled(pnProfils_.getProfilCourant()!=0);
+ btProfReculerVite_.setEnabled(pnProfils_.getProfilCourant()!=0);
+ }
@Override
public void actionPerformed(ActionEvent _evt) {
@@ -206,6 +213,8 @@
else if ("ANIM".equals(cmd)) {
aniAction_.changeAll();
}
+
+ updateNavigation();
}
@Override
@@ -295,6 +304,7 @@
}
if (_n instanceof MetierEtude1d) {
pnProfils_.setEtude((MetierEtude1d)_n);
+ updateNavigation();
}
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java 2013-07-29 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java 2013-07-29 16:30:26 UTC (rev 8460)
@@ -23,6 +23,7 @@
import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
import org.fudaa.fudaa.hydraulique1d.editor.Hydraulique1dCustomizerImprimable;
+import com.memoire.bu.BuButton;
import com.memoire.bu.BuCutCopyPasteInterface;
import com.memoire.bu.BuSelectFindReplaceInterface;
import com.memoire.bu.BuUndoRedoInterface;
@@ -55,6 +56,10 @@
private static final int PROFIL_RAPIDE=Hydraulique1dPreferences.HYDRAULIQUE1D.getIntegerProperty("profil.rapide", 5);
/** Le panneau consacr\xE9 au graphe */
Hydraulique1dProfilPane pnProfs_;
+ BuButton btAvancer_;
+ BuButton btAvancerVite_;
+ BuButton btReculer_;
+ BuButton btReculerVite_;
/**
* Contructeur minimal
@@ -80,15 +85,29 @@
BPanneauNavigation.AVANCER_VITE|BPanneauNavigation.FERMER|BPanneauNavigation.ALIGN_RIGHT);
}
+ btAvancer_ = getNavPanel().getBtNavAvancer();
+ btAvancerVite_ = getNavPanel().getBtNavAvancerVite();
+ btReculer_ = getNavPanel().getBtNavReculer();
+ btReculerVite_ = getNavPanel().getBtNavReculerVite();
+
+ updateButtons();
pack();
}
+ public void updateButtons() {
+ btAvancer_.setEnabled(pnProfs_.getProfilCourant()!=pnProfs_.getProfilsModeleBief().length-1);
+ btAvancerVite_.setEnabled(pnProfs_.getProfilCourant()!=pnProfs_.getProfilsModeleBief().length-1);
+ btReculer_.setEnabled(pnProfs_.getProfilCourant()!=0);
+ btReculerVite_.setEnabled(pnProfs_.getProfilCourant()!=0);
+ }
+
public Hydraulique1dProfilPane getPane() {
return pnProfs_;
}
public void setEtude(MetierEtude1d _res) {
pnProfs_.setEtude(_res);
+ updateButtons();
}
/**
@@ -97,6 +116,7 @@
*/
public void setProfilsModeleBief(Hydraulique1dProfilModel[] _profils) {
pnProfs_.setProfilsModeleBief(_profils);
+ updateButtons();
}
/**
@@ -105,6 +125,7 @@
*/
public void setProfilModel(Hydraulique1dProfilModel _profil) {
pnProfs_.setProfilModel(_profil);
+ updateButtons();
}
/**
@@ -231,6 +252,8 @@
else if ("AVANCERVITE".equals(cmd)) {
pnProfs_.setProfilCourant(pnProfs_.getProfilCourant()+PROFIL_RAPIDE);
}
+
+ updateButtons();
}
/**
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 15:44:27 UTC (rev 8459)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-07-29 16:30:26 UTC (rev 8460)
@@ -148,7 +148,7 @@
static {
isApp_.name = "Fudaa-Mascaret";
isApp_.version = "3.1.8";
- isApp_.date = "30-07-2013";
+ isApp_.date = "29-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.
|
