Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8335] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2013-03-18 20:54:22
|
Revision: 8335
http://fudaa.svn.sourceforge.net/fudaa/?rev=8335&view=rev
Author: deniger
Date: 2013-03-18 20:54:15 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -72,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2-RC21";
- infoSoft.date = "2013-01-24";
+ infoSoft.version = "1.2-RC22";
+ infoSoft.date = "2013-03-18";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -3,6 +3,7 @@
import com.memoire.bu.*;
import com.vividsolutions.jts.geom.LinearRing;
import java.awt.BorderLayout;
+import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.GridLayout;
@@ -119,10 +120,12 @@
cbChooseLine_ = new BuCheckBox();
content.add(new BuLabel(TrLib.getString("Sur les objets appartenant \xE0 la ligne")));
content.add(cbChooseLine_);
- JPanel res = new JPanel(new BorderLayout());
- res.add(content, BorderLayout.SOUTH);
+// JPanel res = new JPanel(new BorderLayout());
+// res.add(content, BorderLayout.SOUTH);
treeLignes_ = buildTree();
- res.add(new BuScrollPane(treeLignes_));
+ treeLignes_.setPreferredSize(new Dimension(300, 200));
+// final JScrollPane jScrollPane = new JScrollPane(treeLignes_);
+// res.add(jScrollPane);
treeLignes_.setEnabled(false);
cbChooseLine_.addItemListener(new ItemListener() {
@Override
@@ -144,7 +147,9 @@
} else {
JPanel newPn = new JPanel(new BuBorderLayout());
newPn.add(content, BorderLayout.NORTH);
- newPn.add(new JScrollPane(treeLignes_), BorderLayout.CENTER);
+ final JScrollPane jScrollPane = new JScrollPane(treeLignes_);
+ jScrollPane.setPreferredSize(new Dimension(200, 150));
+ newPn.add(jScrollPane, BorderLayout.CENTER);
content = newPn;
}
ButtonGroup gp = new ButtonGroup();
@@ -392,7 +397,7 @@
EfFilter filter = getFilter();
int nb = source_.getGrid().getEltNb();
for (int i = 0; i < nb; i++) {
- if (filter.isActivatedElt(i)) {
+ if (filter.isActivatedElt(i, EfComputeVolumeSeuil.USE_STRICT_FILTER)) {
set.set(i);
}
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -6,123 +6,147 @@
/**
* Filter pour le projet trpost
- *
+ *
* @author Adrien Hadoux
*/
public class TrPostFileFilter extends BuFileFilter {
- /**
- * Utilis\xE9 pour l'extension de tous les fichiers, repertoire et ficheirs inclus.
- */
- public final static String DEFAULT_EXTENSION = "POST";
+ /**
+ * Utilis\xE9 pour l'extension de tous les fichiers, repertoire et ficheirs inclus.
+ */
+ public final static String DEFAULT_EXTENSION = "POST";
- /**
- * Filtre utilis\xE9 pour les chooser de selection de projet .POST.
- * @author Adrien Hadoux
- *
- */
- public static class DirectoryPOSTFilter extends FileFilter{
+ /**
+ * Filtre utilis\xE9 pour les chooser de selection de projet .POST.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+ public static class DirectoryPOSTFilter extends FileFilter {
- @Override
- public boolean accept(File f) {
- // TODO Auto-generated method stub
-
- String s = f.getName();
-
- if(s.contains("."+DEFAULT_EXTENSION))
- return true;
+ @Override
+ public boolean accept(File f) {
+ if (f.isDirectory()) {
+ return true;
+ }
+ // TODO Auto-generated method stub
- return false;
- }
+ String s = f.getName();
- @Override
- public String getDescription() {
- // TODO Auto-generated method stub
- return DEFAULT_EXTENSION;
- }
+ if (s.contains("." + DEFAULT_EXTENSION)) {
+ return true;
+ }
- }
+ return false;
+ }
- public TrPostFileFilter(final TrPostFileFormat _ft) {
- super(new String[] { DEFAULT_EXTENSION }, _ft.getName());
+ @Override
+ public String getDescription() {
+ // TODO Auto-generated method stub
+ return DEFAULT_EXTENSION;
+ }
+ }
- }
+ public TrPostFileFilter(final TrPostFileFormat _ft) {
+ super(new String[]{DEFAULT_EXTENSION}, _ft.getName());
- @Override
- public boolean accept(final File _d, final String _fn) {
- if (_d == null) return accept(_fn);
- return accept(_d.getAbsolutePath());
- }
+ }
- @Override
- public boolean accept(final String _f) {
- if (_f == null) { return false; }
- final String name = _f;
- if (name == null) { return false; }
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return true;
- return false;
- }
+ @Override
+ public boolean accept(final File _d, final String _fn) {
+ if (_d == null) {
+ return accept(_fn);
+ }
+ return accept(_d.getAbsolutePath());
+ }
- @Override
- public boolean accept(final File _f) {
- if (_f == null) { return false; }
- final String name = _f.getName();
- if (name == null) { return false; }
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return true;
- return false;
+ @Override
+ public boolean accept(final String _f) {
+ if (_f == null) {
+ return false;
+ }
+ final String name = _f;
+ if (name == null) {
+ return false;
+ }
+ if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return true;
+ }
+ return false;
+ }
- }
+ @Override
+ public boolean accept(final File _f) {
+ if (_f == null) {
+ return false;
+ }
+ final String name = _f.getName();
+ if (name == null) {
+ return false;
+ }
+ if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return true;
+ }
+ return false;
- /**
- * Indique si le repertoire concern\xE9 est bien un r\xE9pertoire de type POST
- * @param _f
- * @return
- * @author Adrien Hadoux
- */
- public static boolean acceptDirectoryPOST(final File _f){
-
- if(_f==null)
- return false;
- if(!_f.isDirectory() || !_f.getName().contains("."+DEFAULT_EXTENSION))
- return false;
+ }
- //-- test du contenu si il est bien form\xE9: --//
- File[] children=_f.listFiles();
+ /**
+ * Indique si le repertoire concern\xE9 est bien un r\xE9pertoire de type POST
+ *
+ * @param _f
+ * @return
+ * @author Adrien Hadoux
+ */
+ public static boolean acceptDirectoryPOST(final File _f) {
- boolean setupFound=false;
- for(int i=0;!setupFound && i<children.length;i++){
- if (children[i] == null) { setupFound= false; }
- else{
- final String name = children[i].getName();
- if (name == null) { setupFound= false; }
- else
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) setupFound= true;
- }
- }
+ if (_f == null) {
+ return false;
+ }
+ if (!_f.isDirectory() || !_f.getName().contains("." + DEFAULT_EXTENSION)) {
+ return false;
+ }
+ //-- test du contenu si il est bien form\xE9: --//
+ File[] children = _f.listFiles();
- return setupFound;
- }
+ boolean setupFound = false;
+ for (int i = 0; !setupFound && i < children.length; i++) {
+ if (children[i] == null) {
+ setupFound = false;
+ } else {
+ final String name = children[i].getName();
+ if (name == null) {
+ setupFound = false;
+ } else if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ setupFound = true;
+ }
+ }
+ }
- /**
- * Recupere le fichier setup depuis le un r\xE9pertoire de type POST
- * @param _f
- * @return
- * @author Adrien Hadoux
- */
- public static File getSetupFormDirectoryPOST(final File _f){
- File[] children=_f.listFiles();
- for(int i=0; i<children.length;i++){
- if (children[i] == null) {}
- else{
- final String name = children[i].getName();
- if (name == null) { }
- else
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return children[i];
- }
- }
- return null;
- }
+ return setupFound;
+ }
+ /**
+ * Recupere le fichier setup depuis le un r\xE9pertoire de type POST
+ *
+ * @param _f
+ * @return
+ * @author Adrien Hadoux
+ */
+ public static File getSetupFormDirectoryPOST(final File _f) {
+ File[] children = _f.listFiles();
+ for (int i = 0; i < children.length; i++) {
+ if (children[i] == null) {
+ } else {
+ final String name = children[i].getName();
+ if (name == null) {
+ } else if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return children[i];
+ }
+ }
+ }
+ return null;
+ }
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -39,6 +39,11 @@
}
@Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
+ @Override
public boolean isGenerationSourceVisible() {
return true;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -54,6 +54,12 @@
return false;
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
+
private void computeMinMax() {
if (isUpdateToDate_) {
return;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -41,9 +41,14 @@
s_ = mng_.getTelemacSeuil(_i);
cote_ = _cote;
x_ = _x;
+ }
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
}
+
@Override
public boolean isGenerationSourceVisible() {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
