Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-05-02 12:05:34
|
Revision: 7136
http://fudaa.svn.sourceforge.net/fudaa/?rev=7136&view=rev
Author: deniger
Date: 2012-05-02 12:05:23 +0000 (Wed, 02 May 2012)
Log Message:
-----------
corrections mineures
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/pom.xml
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-05-02 12:04:41 UTC (rev 7135)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-05-02 12:05:23 UTC (rev 7136)
@@ -1,110 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>prepro-ui</artifactId>
- <name>prepro-ui</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-3d</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-visuallibrary</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${dodicoGroupId}</groupId>
- <artifactId>dodico-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-gis</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>prepro-ui</artifactId>
+ <name>prepro-ui</name>
+ <dependencies>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>meshview</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-3d</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-visuallibrary</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
- <plugins>
+ <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
- </build>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
+ </build>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
</project>
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java 2012-05-02 12:04:41 UTC (rev 7135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageCompositeEditorPanel.java 2012-05-02 12:05:23 UTC (rev 7136)
@@ -16,7 +16,6 @@
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor;
-import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluNumberFormatDefault;
import org.fudaa.ctulu.CtuluUI;
@@ -46,32 +45,31 @@
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.bu.BuTable;
import com.memoire.bu.BuVerticalLayout;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ScrollPaneConstants;
@SuppressWarnings("serial")
public class TrRubarOuvrageCompositeEditorPanel extends CtuluDialogPanel {
- public static boolean edit(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent, CtuluUI ui) {
+ public static boolean edit(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent,
+ CtuluUI ui) {
TrRubarOuvrageCompositeEditorPanel panel = new TrRubarOuvrageCompositeEditorPanel(grid, ouvrage, parent);
panel.setCtuluUi(ui);
panel.build();
return panel.afficheModaleOk(ui.getParentComponent());
}
-
private final H2dRubarGridAreteSource grid;
private BuLabel lbAmont;
-
private BuLabel lbAval;
private H2dRubarOuvrage parent;
-
private H2dRubarOuvrageElementaireComposite ouvrage;
-
CtuluUI ui;
private BuButton editValues;
- public TrRubarOuvrageCompositeEditorPanel(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage, H2dRubarOuvrage parent) {
+ public TrRubarOuvrageCompositeEditorPanel(H2dRubarGridAreteSource grid, H2dRubarOuvrageElementaireComposite ouvrage,
+ H2dRubarOuvrage parent) {
this.grid = grid;
this.ouvrage = ouvrage;
this.parent = parent;
@@ -81,7 +79,8 @@
setLayout(new BuGridLayout(3, 5, 5));
addLabel(TrLib.getString("Contr\xF4le"));
- final BuComboBox cb = new BuComboBox(new Object[] { H2dRubarOuvrageCompositeTypeControle.TIME, H2dRubarOuvrageCompositeTypeControle.ELEVATION });
+ final BuComboBox cb = new BuComboBox(
+ new Object[]{H2dRubarOuvrageCompositeTypeControle.TIME, H2dRubarOuvrageCompositeTypeControle.ELEVATION});
cb.setRenderer(new CtuluCellTextRenderer() {
@Override
@@ -92,7 +91,6 @@
super.setValue(((H2dRubarOuvrageCompositeTypeControle) _value).getDesc());
}
}
-
});
add(cb);
cb.setSelectedItem(ouvrage.getTypeControle());
@@ -117,6 +115,7 @@
updateAmontLabel();
BuButton editAmont = new BuButton(BuResource.BU.getString("Editer"));
editAmont.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(ActionEvent e) {
editAmont();
@@ -129,6 +128,7 @@
updateAvalLabel();
BuButton editAval = new BuButton(BuResource.BU.getString("Editer"));
editAval.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(ActionEvent e) {
editAval();
@@ -245,7 +245,6 @@
protected Double[] getValues() {
return values;
}
-
}
protected void editValues() {
@@ -255,11 +254,13 @@
values[i] = valeurs[i];
}
DoubleTableModel tableModel = new DoubleTableModel(values, ouvrage.getTypeControle().getDesc());
- final BuTable table = new BuTable(tableModel);
+ final JTable table = new JTable(tableModel);
CtuluValueEditorDouble editor = new CtuluValueEditorDouble(false);
editor.setFormatter(CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS);
table.getColumnModel().getColumn(0).setCellEditor(editor.createTableEditorComponent());
+ table.getColumnModel().getColumn(0).setCellEditor(editor.createTableEditorComponent());
CtuluDialogPanel pn = new CtuluDialogPanel() {
+
@Override
public boolean isDataValid() {
TableCellEditor cellEditor = table.getCellEditor();
@@ -271,7 +272,11 @@
}
};
- pn.add(new BuScrollPane(table));
+ pn.setLayout(new BorderLayout());
+ final JScrollPane jScrollPane = new JScrollPane(table);
+ jScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+ jScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ pn.add(jScrollPane);
boolean ok = pn.afficheModaleOk(this, ouvrage.getTypeControle().getDesc());
if (ok) {
ouvrage.setValues(tableModel.getValues());
@@ -299,7 +304,8 @@
}
private String formatXY(double xAmont, double yAmont) {
- return CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(xAmont) + ", " + CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(yAmont);
+ return CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(xAmont) + ", " + CtuluNumberFormatDefault.DEFAULT_FMT_3DIGITS.format(
+ yAmont);
}
public CtuluUI getUi() {
@@ -318,7 +324,7 @@
cq.addCalque(element);
cq.setCalqueActif(element);
if (initIdx >= 0) {
- element.setSelection(new int[] { initIdx });
+ element.setSelection(new int[]{initIdx});
}
final List l = cq.getController().getActions();
@@ -347,7 +353,6 @@
}
return valid;
}
-
};
pn.setLayout(new BorderLayout());
pn.setPreferredSize(new Dimension(500, 500));
@@ -402,5 +407,4 @@
lbAval.setToolTipText(lbAval.getText());
lbAval.setToolTipText(lbAval.getToolTipText());
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-05-11 21:33:21
|
Revision: 9124
http://sourceforge.net/p/fudaa/svn/9124
Author: deniger
Date: 2015-05-11 21:33:18 +0000 (Mon, 11 May 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/pom.xml
Removed Paths:
-------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/ebli/
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/zoom/
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2015-05-11 21:32:55 UTC (rev 9123)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2015-05-11 21:33:18 UTC (rev 9124)
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-business.version>1.6-SNAPSHOT</fudaa-business.version>
+ <!--<fudaa-business.version>1.6-SNAPSHOT</fudaa-business.version>-->
<project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
</properties>
<parent>
@@ -61,10 +61,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${fudaa-business.version}</version>
- </dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-10-09 11:59:13
|
Revision: 9182
http://sourceforge.net/p/fudaa/svn/9182
Author: deniger
Date: 2015-10-09 11:59:10 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
nouveau dico pour Fudaa-Prepro
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/nbactions-release.xml
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/telemac/TrTelemacCommunParametres.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSerafinHelper.java
Modified: trunk/soft/fudaa-prepro/ui/nbactions-release.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/nbactions-release.xml 2015-10-09 11:59:01 UTC (rev 9181)
+++ trunk/soft/fudaa-prepro/ui/nbactions-release.xml 2015-10-09 11:59:10 UTC (rev 9182)
@@ -1,2 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-<actions />
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <packagings>
+ <packaging>jar</packaging>
+ </packagings>
+ <goals>
+ <goal>process-classes</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+ </goals>
+ <properties>
+ <exec.args>-classpath %classpath org.fudaa.fudaa.tr.Tr --no_log</exec.args>
+ <exec.executable>java</exec.executable>
+ </properties>
+ </action>
+ <action>
+ <actionName>debug</actionName>
+ <packagings>
+ <packaging>jar</packaging>
+ </packagings>
+ <goals>
+ <goal>process-classes</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+ </goals>
+ <properties>
+ <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.fudaa.fudaa.tr.Tr --no_log</exec.args>
+ <exec.executable>java</exec.executable>
+ <jpda.listen>true</jpda.listen>
+ </properties>
+ </action>
+ <action>
+ <actionName>profile</actionName>
+ <packagings>
+ <packaging>jar</packaging>
+ </packagings>
+ <goals>
+ <goal>process-classes</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+ </goals>
+ <properties>
+ <exec.args>-classpath %classpath org.fudaa.fudaa.tr.Tr --no_log</exec.args>
+ <exec.executable>java</exec.executable>
+ </properties>
+ </action>
+ </actions>
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 2015-10-09 11:59:01 UTC (rev 9181)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2015-10-09 11:59:10 UTC (rev 9182)
@@ -72,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.3.0-RC9";
- infoSoft.date = "2015-08-24";
+ infoSoft.version = "1.3.0-RC10";
+ infoSoft.date = "2015-10-07";
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/telemac/TrTelemacCommunParametres.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java 2015-10-09 11:59:01 UTC (rev 9181)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java 2015-10-09 11:59:10 UTC (rev 9182)
@@ -105,9 +105,8 @@
* TrTelemacParamsSavedData() {} public TrTelemacParamsSavedData(final boolean _isGeomFileSaved, final boolean
* _isRepriseFileSaved) { super(); isGeomFileSaved_ = _isGeomFileSaved; isRepriseFileSaved_ = _isRepriseFileSaved; } }
*/
-
TrTelemacCommunParametres(final TrImplementationEditorAbstract _ui, final H2dTelemacDicoParams _dicoParams, final File _f, final File _gridFile,
- final TrTelemacCommunProjectListener _listener) {
+ final TrTelemacCommunProjectListener _listener) {
super(_ui, _f, _dicoParams);
params_ = new H2dTelemacParameters((H2dTelemacDicoParams) getDicoParams(), _listener);
if (_gridFile != null) {
@@ -116,13 +115,15 @@
}
// TrTelemacSerafinBuilder serafinBuilder_;
-
TrTelemacSiActivator siActivator_;
private synchronized boolean internloadGeometrie(final boolean _newProject, final boolean _useOlb, final int[] _ipobo,
- final ProgressionInterface _prg) {
+ final ProgressionInterface _prg) {
final DicoEntite entFile = getDicoFileFormatVersion().getMaillageEntiteFile();
if (entFile == null) {
+ if (!getDicoFileFormatVersion().isGridRequired()) {
+ return false;
+ }
getUI().error(MvResource.getS("Fichier de maillage"), TrResource.getS("D\xE9finition du fichier g\xE9om\xE9trie non trouv\xE9e"), false);
return false;
}
@@ -219,7 +220,7 @@
CtuluLibMessage.info("save Cl file in " + _f);
}
final CtuluIOOperationSynthese op = getDicoFileFormatVersion().getDefaultTelemacCLFormat(getDicoFileFormatVersion().getCodeName()).write(_f,
- getTelemacParametres().getTelemacCLManager().createCLSourceInterface(), _prog);
+ getTelemacParametres().getTelemacCLManager().createCLSourceInterface(), _prog);
return !ui_.manageErrorOperationAndIsFatal(op);
}
@@ -366,8 +367,8 @@
}
/**
- * @return le repertoire contenant le maillage. Si impossible, renvoie le repertoire du projet / the folder containing
- * the mesh. If impossible, send the project folder
+ * @return le repertoire contenant le maillage. Si impossible, renvoie le repertoire du projet / the folder containing the mesh. If impossible, send
+ * the project folder
*/
public File getGridBaseDir() {
final DicoEntite entFile = getDicoFileFormatVersion().getMaillageEntiteFile();
@@ -386,9 +387,8 @@
}
/**
- * Renvoie le maillage. Si nul, il est necessaire de charger le maillage Send the meshing. If nought, it is necessary
- * to modify the meshing
- *
+ * Renvoie le maillage. Si nul, il est necessaire de charger le maillage Send the meshing. If nought, it is necessary to modify the meshing
+ *
* @return le maillage / the mesh
*/
public EfGridInterface getMaillage() {
@@ -425,8 +425,7 @@
}
/**
- * @return true si un fichier de condition limite est utilise par ce logiciel / true if a file of boundary condition
- * is used by this software
+ * @return true si un fichier de condition limite est utilise par ce logiciel / true if a file of boundary condition is used by this software
*/
public boolean isClSupported() {
return getDicoFileFormatVersion().getCLEntiteFile() != null;
@@ -435,7 +434,7 @@
@Override
public boolean isGeometrieLoaded() {
return getState().isLoaded(getDicoFileFormatVersion().getMaillageEntiteFile())
- || getState().isLoaded(getDicoFileFormatVersion().getRepriseFileKeyword());
+ || getState().isLoaded(getDicoFileFormatVersion().getRepriseFileKeyword());
}
public boolean isRepriseActivatedByUser() {
@@ -608,7 +607,8 @@
getState().setLoaded(entFile, f, modified);
if (modified) {
getImpl().message(entFile.getNom(),
- TrResource.getS("Certaines courbes temporelles ne sont pas assez \xE9tendues dans le temps" + "( cela sera automatiquement corrig\xE9)"), false);
+ TrResource.getS("Certaines courbes temporelles ne sont pas assez \xE9tendues dans le temps" + "( cela sera automatiquement corrig\xE9)"),
+ false);
}
// on verifie l'utilite de ce fichier
// we check the useful of this list
@@ -635,4 +635,4 @@
return getTelemacParametres().isTransientAvailable() && getTelemacParametres().getTelemacCLManager().isEvolutionUsed();
}
-}
\ No newline at end of file
+}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSerafinHelper.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSerafinHelper.java 2015-10-09 11:59:01 UTC (rev 9181)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSerafinHelper.java 2015-10-09 11:59:10 UTC (rev 9182)
@@ -51,6 +51,7 @@
* @version $Id: TrTelemacSerafinHelper.java,v 1.16 2007-06-11 13:08:22 deniger Exp $
*/
public class TrTelemacSerafinHelper extends TelemacVariableMapper {
+
private final TrTelemacCommunParametres params_;
/**
@@ -76,15 +77,17 @@
return null;
}
final CtuluIOOperationSynthese op = ((SerafinFileFormat) params_.getTelemacParametres().getTelemacVersion()
- .getDefaultSerafinFormat()).readLast(_file, _prg);
+ .getDefaultSerafinFormat()).readLast(_file, _prg);
final SerafinInterface serafinResults = (SerafinInterface) op.getSource();
- if (getUI().manageErrorOperationAndIsFatal(op)) { return null; }
+ if (getUI().manageErrorOperationAndIsFatal(op)) {
+ return null;
+ }
// le maillage n'est pas conforme
if (serafinResults != null) {
final String diff = EfLib.isDiffQuick(serafinResults.getGrid(), params_.getMaillage());
if (diff != null) {
getUI().error(getRepriseTitle(),
- TrResource.getS("Le fichier de reprise n'est pas compatible") + CtuluLibString.LINE_SEP + diff, false);
+ TrResource.getS("Le fichier de reprise n'est pas compatible") + CtuluLibString.LINE_SEP + diff, false);
return null;
}
}
@@ -113,7 +116,9 @@
* @return si le fichier a ete simplifie
*/
public RepriseResults loadRepriseData(final ProgressionInterface _prg, final File _file, final Map _m) {
- if (_m == null) { throw new IllegalArgumentException("map must not be null"); }
+ if (_m == null) {
+ throw new IllegalArgumentException("map must not be null");
+ }
final SerafinInterface serafinResults = readRepriseFile(_prg, _file);
// le maillage n'a pas pu etre lu ou le maillage ne correspond pas
if (serafinResults == null) {
@@ -137,9 +142,9 @@
}
// determineBathyForCI(t, messageBody);
// les variables non support\xE9es
- final H2dVariableType[] varsToRemove = new H2dVariableType[] { H2dVariableType.VITESSE, H2dVariableType.DEBIT,
- H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.DEBIT_X,
- H2dVariableType.DEBIT_Y };
+ final H2dVariableType[] varsToRemove = new H2dVariableType[]{H2dVariableType.VITESSE, H2dVariableType.DEBIT,
+ H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.DEBIT_X,
+ H2dVariableType.DEBIT_Y};
for (int i = varsToRemove.length - 1; i >= 0; i--) {
if (t.containsKey(varsToRemove[i])) {
isVarRemoved = true;
@@ -149,7 +154,7 @@
String msg = null;
final RepriseResults r = new RepriseResults();
- r.initialDate=serafinResults.getIdate();
+ r.initialDate = serafinResults.getIdate();
r.timeStep_ = serafinResults.getTimeStep(timeStep);
// simplification du fichier de reprise
if (isVarRemoved || isLastTimeKept) {
@@ -160,12 +165,12 @@
}
if (isVarRemoved) {
msg += CtuluLibString.LINE_SEP + " -"
- + TrResource.getS("les variables vitesses scalaires, d\xE9bit ont \xE9t\xE9 supprim\xE9es");
+ + TrResource.getS("les variables vitesses scalaires, d\xE9bit ont \xE9t\xE9 supprim\xE9es");
}
msg += CtuluLibString.LINE_SEP
- + TrResource.getS("Si vous modifiez et sauvegardez les conditions initiales, "
- + "ce nouveau fichier de reprise remplacera l'ancien.");
+ + TrResource.getS("Si vous modifiez et sauvegardez les conditions initiales, "
+ + "ce nouveau fichier de reprise remplacera l'ancien.");
}
// on charge les donn\xE9es
// si.load(t, si.getRepriseFile(_dirBase), serafinResults.getTimeStep(timeStep));
@@ -227,12 +232,12 @@
public boolean isRepriseFileSetAndValid() {
return params_.getDicoParams().isValueSetFor(getRepriseFileKw())
- && params_.getDicoParams().isValueValideFor(getRepriseFileKw());
+ && params_.getDicoParams().isValueValideFor(getRepriseFileKw());
}
public boolean isRepriseActivated() {
return getRepriseBooleanKw() != null && params_.getDicoParams().isValueSetFor(getRepriseBooleanKw())
- && DicoDataType.Binaire.getValue(params_.getDicoParams().getValue(getRepriseBooleanKw()));
+ && DicoDataType.Binaire.getValue(params_.getDicoParams().getValue(getRepriseBooleanKw()));
}
/**
@@ -301,7 +306,7 @@
_varDouble.put(H2dVariableType.COTE_EAU, new double[params_.getTelemacParametres().getMaillage().getPtsNb()]);
} else {
msgs
- .add(TrResource.getS("La surface libre ne peut pas \xEAtre r\xE9cup\xE9r\xE9e. Elle est initialis\xE9e \xE0 partir du fond."));
+ .add(TrResource.getS("La surface libre ne peut pas \xEAtre r\xE9cup\xE9r\xE9e. Elle est initialis\xE9e \xE0 partir du fond."));
_varDouble.put(H2dVariableType.COTE_EAU, new CtuluArrayDouble(bathy));
// on initialise avec cote=0;
}
@@ -347,7 +352,9 @@
getUI().setMainMessage(MvResource.getS("Lecture maillage"));
final File f = _f;
if (f == null) {
- getUI().error(getGridTitle(), TrResource.getS("Le mot-cl\xE9 n'est pas renseign\xE9"), false);
+ if (getParams().getDicoFileFormatVersion().isGridRequired()) {
+ getUI().error(getGridTitle(), TrResource.getS("Le mot-cl\xE9 n'est pas renseign\xE9"), false);
+ }
return null;
}
if (!f.exists()) {
@@ -355,8 +362,10 @@
return null;
}
final CtuluIOOperationSynthese op = params_.getTelemacParametres().getTelemacVersion().getDefaultSerafinFormat()
- .read(f, _prg);
- if (getUI().manageErrorOperationAndIsFatal(op)) { return null; }
+ .read(f, _prg);
+ if (getUI().manageErrorOperationAndIsFatal(op)) {
+ return null;
+ }
final SerafinInterface r = (SerafinInterface) op.getSource();
if (r.getGrid().getEltType() == EfElementType.T6) {
getUI().error(getGridTitle(), TrResource.getS("Les maillages 3D ne sont pas support\xE9s"), false);
@@ -443,7 +452,9 @@
public double getV(final Object _value, final int _ptIdx) {
final int valueIdx = nameIdx_.get(_value);
- if (valueIdx == oldVarIdx_) { return cache_[_ptIdx]; }
+ if (valueIdx == oldVarIdx_) {
+ return cache_[_ptIdx];
+ }
oldVarIdx_ = valueIdx;
try {
cache_ = ser_.getReadingInfo().getDouble(valueIdx, timeStep_);
@@ -457,14 +468,16 @@
}
public Map buildVariables(final SerafinInterface _serafin, final int _timeStep, final EfGridInterface _new,
- final ProgressionInterface _prog) {
- if (_new == null) { return buildVariables(_serafin, _timeStep, null); }
+ final ProgressionInterface _prog) {
+ if (_new == null) {
+ return buildVariables(_serafin, _timeStep, null);
+ }
final Map nodalVal = new HashMap();
final int nb = _serafin.getValueNb();
final GridInterpolAdapter src = new GridInterpolAdapter(_serafin, _timeStep);
final CtuluPermanentList allValues = src.getAllValues();
final InterpolationParameters params = new InterpolationParameters(allValues, new EfInterpolationTargetGridAdapter(
- _new, false), src);
+ _new, false), src);
params.setProg(_prog);
params.createDefaultResults();
final InterpolationResultsHolderI res = params.getResults();
@@ -490,4 +503,4 @@
public TrTelemacCommunParametres getParams() {
return params_;
}
-}
\ No newline at end of file
+}
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