Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7861] trunk/soft/fudaa-prepro/ui/src/main
|
From: <de...@us...> - 2012-11-05 16:23:06
|
Revision: 7861
http://fudaa.svn.sourceforge.net/fudaa/?rev=7861&view=rev
Author: deniger
Date: 2012-11-05 16:23:00 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2012-11-05 16:21:38 UTC (rev 7860)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2012-11-05 16:23:00 UTC (rev 7861)
@@ -11,8 +11,6 @@
*/
package org.fudaa.fudaa.tr.data;
-import java.awt.BorderLayout;
-import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.util.Collection;
import java.util.List;
@@ -21,11 +19,8 @@
import javax.swing.Action;
import javax.swing.Icon;
-import javax.swing.JButton;
import javax.swing.JFrame;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
@@ -66,16 +61,13 @@
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
import org.fudaa.fudaa.meshviewer.MvLayerGrid;
import org.fudaa.fudaa.meshviewer.MvResource;
-import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer;
import org.fudaa.fudaa.sig.FSigLib;
import org.fudaa.fudaa.sig.layer.FSigEditor;
import org.fudaa.fudaa.sig.wizard.FSigWizardVariableModifier;
import org.fudaa.fudaa.tr.TrLauncherDefault;
import org.fudaa.fudaa.tr.common.Tr3DFactory;
-import org.fudaa.fudaa.tr.common.TrLauncher;
import org.fudaa.fudaa.tr.common.TrProjectDispatcherListener;
import org.fudaa.fudaa.tr.common.TrResource;
-import org.fudaa.fudaa.tr.data.TrSaisiePoint.VisuFrameListener;
import org.fudaa.fudaa.tr.export.TrExportFactory;
import org.fudaa.fudaa.tr.post.TrPostSource;
import org.fudaa.fudaa.tr.post.profile.MvProfileAction;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java 2012-11-05 16:21:38 UTC (rev 7860)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java 2012-11-05 16:23:00 UTC (rev 7861)
@@ -51,7 +51,7 @@
}
public void interpolateValues(final GrSegment _target, final EfGridInterface _grid, final int _idxElt,
- final double _x, final double _y) {
+ final double _x, final double _y) {
_target.o_.x_ = _x;
_target.o_.y_ = _y;
double vx = 0;
@@ -82,9 +82,16 @@
public final double getVx(final int _ptIdx) {
return x_.getValue(_ptIdx);
+ }
+ public final EfData getVxData() {
+ return x_;
}
+ public final EfData getVyData() {
+ return y_;
+ }
+
/**
* @param _ptIdx l'indice du point demande
* @return la composant en y
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2012-11-05 16:21:38 UTC (rev 7860)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2012-11-05 16:23:00 UTC (rev 7861)
@@ -54,6 +54,7 @@
import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
import org.fudaa.fudaa.tr.post.TrPostSource;
import org.fudaa.fudaa.tr.post.TrPostVisuPanel;
+import org.fudaa.fudaa.tr.post.data.TrPostDataVecteur;
import org.fudaa.fudaa.tr.post.profile.MVProfileCourbeModel;
import org.fudaa.fudaa.tr.post.profile.MvProfileCoteTester;
import org.fudaa.fudaa.tr.post.profile.MvProfileCourbe;
@@ -83,6 +84,7 @@
JComboBox listVar_;
CtuluComboBoxModelAdapter modelPdt_;
JComboBox listPdt_;
+ JCheckBox cbVectoriel;
// isolignes
private JPanel panelIsolignes_;
JCheckBox boxSelectLineAuto_ = new JCheckBox(TrResource.getS("Choisir l'isoligne du calque"));
@@ -206,7 +208,6 @@
textY2.setValueValidator(BuValueValidator.FLOAT);
boxSelectLineAuto_.setAction(new AbstractAction() {
-
@Override
public void actionPerformed(final ActionEvent _e) {
final boolean enabled = false;
@@ -235,7 +236,6 @@
}
});
boxSelectLineManu_.setAction(new AbstractAction() {
-
@Override
public void actionPerformed(final ActionEvent _e) {
final boolean enabled = true;
@@ -315,7 +315,6 @@
// -- action relatives aux resultats --//
ajouter_.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(final ActionEvent _e) {
if (controleDataOk()) {
@@ -344,7 +343,6 @@
res.add(new BuLabel(""));
res.add(btChangeFmt_);
btChangeFmt_.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent _e) {
CtuluNumberFormatI newFmt = CtuluDecimalFormatEditPanel.chooseNumberFormat(currentFmt_);
@@ -445,19 +443,38 @@
}
private JPanel buildVariables() {
- final JPanel content = new JPanel(new GridLayout(2, 2));
+ final JPanel content = new JPanel(new GridLayout(3, 2));
listVar_ = new BuComboBox(modelVariables_);
listVar_.setSelectedIndex(0);
listPdt_ = new BuComboBox(modelPdt_);
listPdt_.setSelectedIndex(0);
+ cbVectoriel = new JCheckBox();
content.add(new JLabel(TrLib.getString("Variable")));
content.add(listVar_);
content.add(new JLabel(TrLib.getString("Pas de temps")));
content.add(listPdt_);
+ content.add(new JLabel(TrLib.getString("Calcul vectoriel")));
+ content.add(cbVectoriel);
content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix de la variable et du pas de temps")));
+ updateCbVectorielState();
+ listVar_.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ updateCbVectorielState();
+ }
+ });
return content;
}
+ private void updateCbVectorielState() {
+ H2dVariableType selectedItem = (H2dVariableType) listVar_.getSelectedItem();
+ if (selectedItem == null) {
+ cbVectoriel.setEnabled(false);
+ } else {
+ cbVectoriel.setEnabled(source_.getFlecheContent(selectedItem) != null);
+ }
+ }
+
private JPanel buildSeuil() {
seuil_.setCharValidator(BuCharValidator.FLOAT);
seuil_.setStringValidator(BuStringValidator.FLOAT);
@@ -537,7 +554,6 @@
private void computeResults() {
new CtuluTaskOperationGUI(impl_, FudaaLib.getS("Calcul Bilan")) {
-
@Override
public void act() {
final ProgressionInterface prog = getStateReceiver();
@@ -566,9 +582,14 @@
// -- calcul de l'int\xE9grale --//
impl_.setMainProgression(70);
impl_.setMainMessage(CtuluLib.getS("Calcul de l'int\xE9grale"));
+ EfDataIntegrale resCalcul = null;
+ if (cbVectoriel.isEnabled() && cbVectoriel.isSelected()) {
+ TrPostDataVecteur vectData = (TrPostDataVecteur) data;
+ resCalcul = EfBilanHelper.integrerMethodeTrapezeVector(interfaceRes, vectData.getVxData(), vectData.getVyData(), getSeuil());
+ } else {
+ resCalcul = EfBilanHelper.integrerMethodeTrapeze(interfaceRes, data, getSeuil());
+ }
- EfDataIntegrale resCalcul = EfBilanHelper.integrerMethodeTrapeze(interfaceRes, data, getSeuil());
-
res_ = resCalcul.getResultat();
resMax_ = resCalcul.getZonePlus();
resMin_ = resCalcul.getZoneMoins();
Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-11-05 16:21:38 UTC (rev 7860)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-11-05 16:23:00 UTC (rev 7861)
@@ -1209,4 +1209,5 @@
Variable\: {0}\n Point interpol\xE9\: {1}=Variable\: {0}\n Interpolated point \: {1}
Pas de valeurs \xE0 \xE9diter pour un ouvrage unique=No data to edit when only one structure is defined
Tout s\xE9lectionner=Select All
-Tout d\xE9s\xE9lectionner=Unselect All
\ No newline at end of file
+Tout d\xE9s\xE9lectionner=Unselect All
+Calcul vectoriel=Vector computation
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
