Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6523] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2011-10-11 15:11:30
|
Revision: 6523
http://fudaa.svn.sourceforge.net/fudaa/?rev=6523&view=rev
Author: bmarchan
Date: 2011-10-11 15:11:20 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Mod : PIV_param.dat est sauv?\195?\169 avant appel ?\195?\160 bathy_compute.exe
Mod : Distance d'extrapolation des vitesses par pas d'interpolation de la bathy.
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.form
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamReader.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamWriter.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowParameters.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.form
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.form 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.form 2011-10-11 15:11:20 UTC (rev 6523)
@@ -23,18 +23,18 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
+ <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="lbCoef" min="-2" max="-2" attributes="0"/>
- <Component id="lbDmax" min="-2" max="-2" attributes="0"/>
- <Component id="lbDExtrapolation" min="-2" max="-2" attributes="0"/>
+ <Component id="lbCoef" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="lbDmax" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="lbInterpolationStep" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tfDExtrapolation" pref="94" max="32767" attributes="1"/>
- <Component id="tfDmax" alignment="0" pref="94" max="32767" attributes="1"/>
- <Component id="tfCoef" alignment="1" pref="94" max="32767" attributes="1"/>
+ <Component id="tfInterpolationStep" alignment="0" pref="98" max="32767" attributes="1"/>
+ <Component id="tfCoef" alignment="1" pref="98" max="32767" attributes="1"/>
+ <Component id="tfDmax" alignment="0" pref="98" max="32767" attributes="1"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -45,20 +45,20 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
- <Component id="tfCoef" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="lbCoef" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="tfInterpolationStep" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="lbInterpolationStep" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="tfDmax" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lbDmax" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
- <Component id="tfDExtrapolation" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="lbDExtrapolation" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="tfCoef" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="lbCoef" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -78,12 +78,15 @@
</Component>
<Component class="javax.swing.JTextField" name="tfDmax">
</Component>
- <Component class="javax.swing.JLabel" name="lbDExtrapolation">
+ <Component class="javax.swing.JLabel" name="lbInterpolationStep">
<Properties>
- <Property name="text" type="java.lang.String" value="Velocity extrapolation distance (m):"/>
+ <Property name="text" type="java.lang.String" value="Bathymetry interpolation step (m):"/>
</Properties>
</Component>
- <Component class="javax.swing.JTextField" name="tfDExtrapolation">
+ <Component class="javax.swing.JTextField" name="tfInterpolationStep">
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="tfInterpolationStepActionPerformed"/>
+ </Events>
</Component>
</SubComponents>
</Form>
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.java 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowParamPanel.java 2011-10-11 15:11:20 UTC (rev 6523)
@@ -20,9 +20,9 @@
}
private void customize() {
- lbCoef.setText(PivResource.getS("Coefficient de surface:"));
- lbDmax.setText(PivResource.getS("Rayon de recherche des vitesses (m):"));
- lbDExtrapolation.setText(PivResource.getS("Distance d'extrapolation des vitesses (m):"));
+ lbCoef.setText(PivResource.getS("Coefficient de surface"));
+ lbDmax.setText(PivResource.getS("Rayon de recherche des vitesses (m)"));
+ lbInterpolationStep.setText(PivResource.getS("Pas d'espace d'interpolation de bathym\xE9trie (m)"));
}
/**
@@ -32,7 +32,7 @@
public void setFlowParams(PivFlowParameters _params) {
tfCoef.setText("" + _params.getSurfaceCoef());
tfDmax.setText("" + _params.getDmax());
- tfDExtrapolation.setText("" + _params.getDextrapolation());
+ tfInterpolationStep.setText("" + _params.getInterpolationStep());
}
/**
@@ -45,7 +45,7 @@
public void retrieveFlowParams(PivFlowParameters _params) {
_params.setSurfaceCoef(Double.parseDouble(tfCoef.getText().trim()));
_params.setDmax(Double.parseDouble(tfDmax.getText().trim()));
- _params.setDextrapolation(Double.parseDouble(tfDExtrapolation.getText().trim()));
+ _params.setInterpolationStep(Double.parseDouble(tfInterpolationStep.getText().trim()));
}
/**
@@ -158,7 +158,7 @@
boolean bok=
isStrictPositiveReal(tfCoef.getText(),PivResource.getS("Coefficient de surface")) &&
isStrictPositiveReal(tfDmax.getText(),PivResource.getS("Rayon de recherche des vitesses")) &&
- isStrictPositiveReal(tfDExtrapolation.getText(),PivResource.getS("Distance d'extrapolation"));
+ isStrictPositiveReal(tfInterpolationStep.getText(),PivResource.getS("Distance d'extrapolation"));
return bok;
}
@@ -176,8 +176,8 @@
tfCoef = new javax.swing.JTextField();
lbDmax = new javax.swing.JLabel();
tfDmax = new javax.swing.JTextField();
- lbDExtrapolation = new javax.swing.JLabel();
- tfDExtrapolation = new javax.swing.JTextField();
+ lbInterpolationStep = new javax.swing.JLabel();
+ tfInterpolationStep = new javax.swing.JTextField();
setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
@@ -185,23 +185,29 @@
lbDmax.setText("Velocity search radius (m):");
- lbDExtrapolation.setText("Velocity extrapolation distance (m):");
+ lbInterpolationStep.setText("Bathymetry interpolation step (m):");
+ tfInterpolationStep.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ tfInterpolationStepActionPerformed(evt);
+ }
+ });
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbCoef)
.addComponent(lbDmax)
- .addComponent(lbDExtrapolation))
+ .addComponent(lbInterpolationStep))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(tfDExtrapolation, javax.swing.GroupLayout.DEFAULT_SIZE, 94, Short.MAX_VALUE)
- .addComponent(tfDmax, javax.swing.GroupLayout.DEFAULT_SIZE, 94, Short.MAX_VALUE)
- .addComponent(tfCoef, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 94, Short.MAX_VALUE))
+ .addComponent(tfInterpolationStep, javax.swing.GroupLayout.DEFAULT_SIZE, 98, Short.MAX_VALUE)
+ .addComponent(tfCoef, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 98, Short.MAX_VALUE)
+ .addComponent(tfDmax, javax.swing.GroupLayout.DEFAULT_SIZE, 98, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(
@@ -209,26 +215,30 @@
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(tfCoef, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lbCoef))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tfInterpolationStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lbInterpolationStep))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(tfDmax, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lbDmax))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(tfDExtrapolation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lbDExtrapolation))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(tfCoef, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lbCoef))
+ .addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
+ private void tfInterpolationStepActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tfInterpolationStepActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_tfInterpolationStepActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel lbCoef;
- private javax.swing.JLabel lbDExtrapolation;
private javax.swing.JLabel lbDmax;
+ private javax.swing.JLabel lbInterpolationStep;
private javax.swing.JTextField tfCoef;
- private javax.swing.JTextField tfDExtrapolation;
private javax.swing.JTextField tfDmax;
+ private javax.swing.JTextField tfInterpolationStep;
// End of variables declaration//GEN-END:variables
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2011-10-11 15:11:20 UTC (rev 6523)
@@ -723,10 +723,16 @@
createExeDirs();
try {
- // Sauvegarde des donn\xE9es du projet.
+ // PIV_param.dat
+ File paramFile=new File(exeOutputs, "PIV_param.dat");
+ FileWriteOperationAbstract writer=PivParamFileFormat.getInstance().createWriter();
+ Object[] params=new Object[]{_prj.getComputeParameters(), _prj.getFlowParameters(), _prj.getTransfImageSize()};
+ CtuluIOOperationSynthese ret=writer.write(params, paramFile, null);
+
+ // bathy.dat
File bathyFile=new File(exeOutputs, "bathy.dat");
- FileWriteOperationAbstract writer=PivBathyFileFormat.getInstance().createWriter();
- CtuluIOOperationSynthese ret=writer.write(_prj.getTransect(), bathyFile, null);
+ writer=PivBathyFileFormat.getInstance().createWriter();
+ ret=writer.write(_prj.getTransect(), bathyFile, null);
int prog=5;
@@ -791,18 +797,14 @@
// createExeDirs();
try {
- // PIV_param.dat
- File paramFile=new File(exeOutputs, "PIV_param.dat");
- FileWriteOperationAbstract writer=PivParamFileFormat.getInstance().createWriter();
- Object[] params=new Object[]{_prj.getComputeParameters(), _prj.getFlowParameters(), _prj.getTransfImageSize()};
- CtuluIOOperationSynthese ret=writer.write(params, paramFile, null);
+ // PIV_param.dat => D\xE9j\xE0 dans le r\xE9pertoire de sortie
// bathy_p.dat => D\xE9j\xE0 dans le r\xE9pertoire de sortie.
// Hauteurs d'eau
File hFile = new File(exeOutputs, "h.dat");
- writer = PivHFileFormat.getInstance().createWriter();
- ret = writer.write(_prj.getOrthoParameters().getWaterElevation(), hFile, null);
+ FileWriteOperationAbstract writer = PivHFileFormat.getInstance().createWriter();
+ CtuluIOOperationSynthese ret = writer.write(_prj.getOrthoParameters().getWaterElevation(), hFile, null);
// average_vel.out => Copie depuis le r\xE9pertoire projet.
copyFile(prjOutputs, exeOutputs, "average_vel.out");
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamReader.java 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamReader.java 2011-10-11 15:11:20 UTC (rev 6523)
@@ -128,10 +128,10 @@
in_.readFields();
paramsFlow.setDmax(in_.doubleField(0));
- // Distance d'extrapolation des vitesses.
+ // Pas d'interpolation de la bathy.
in_.readLine();
in_.readFields();
- paramsFlow.setDextrapolation(in_.doubleField(0));
+ paramsFlow.setInterpolationStep(in_.doubleField(0));
if (progress_ != null) {
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamWriter.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamWriter.java 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivParamWriter.java 2011-10-11 15:11:20 UTC (rev 6523)
@@ -91,8 +91,8 @@
writer.println(flowDefined ? paramsFlow.getDmax():-1);
// Distance au-dela de laquelle on extrapole les vitesses : trunc
- writer.println("Distance au-dela de laquelle on extrapole les vitesses : trunc");
- writer.println(flowDefined ? paramsFlow.getDextrapolation():-1);
+ writer.println("Pas d espace d interpolation de la bathymetrie : Dxp");
+ writer.println(flowDefined ? paramsFlow.getInterpolationStep():-1);
}
catch (final Exception _evt) {
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowParameters.java 2011-10-11 14:52:53 UTC (rev 6522)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowParameters.java 2011-10-11 15:11:20 UTC (rev 6523)
@@ -12,7 +12,7 @@
/** Rayon de recherche des vitesses autour du point bathy */
protected double dmax=10;
/** Distance au dela de laquelle on extrapole les vitesses */
- protected double dextrapolation=1000000;
+ protected double interpolationStep=1000000;
public PivFlowParameters() {
}
@@ -46,16 +46,16 @@
}
/**
- * @return the dextrapolation
+ * @return Le pas d'interpolation
*/
- public double getDextrapolation() {
- return dextrapolation;
+ public double getInterpolationStep() {
+ return interpolationStep;
}
/**
- * @param dextrapolation the dextrapolation to set
+ * @param _step Le pas d'interpolation
*/
- public void setDextrapolation(double dextrapolation) {
- this.dextrapolation = dextrapolation;
+ public void setInterpolationStep(double _step) {
+ this.interpolationStep = _step;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
