Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9292] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2016-02-24 15:56:10
|
Revision: 9292
http://sourceforge.net/p/fudaa/svn/9292
Author: bmarchan
Date: 2016-02-24 15:56:08 +0000 (Wed, 24 Feb 2016)
Log Message:
-----------
- Add show flow results action
- Signe +/- pour l'ecart sur fenetre de resultats de calcul de debit
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java
Added Paths:
-----------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java
Removed Paths:
-------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java 2016-02-24 12:58:11 UTC (rev 9291)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -10,6 +10,7 @@
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
+import java.text.DecimalFormat;
import java.text.NumberFormat;
import javax.swing.JLabel;
@@ -88,17 +89,17 @@
return rowIndex==res_.length? meanDisch_:res_[rowIndex].getDischarge();
case 2:
val=rowIndex==res_.length? meanDisch_:res_[rowIndex].getDischarge();
- return Math.abs((val-meanDisch_)/meanDisch_*100);
+ return (val-meanDisch_)/meanDisch_*100;
case 3:
return rowIndex==res_.length? meanArea_:res_[rowIndex].getWettedArea();
case 4:
val=rowIndex==res_.length? meanArea_:res_[rowIndex].getWettedArea();
- return Math.abs((val-meanArea_)/meanArea_*100);
+ return (val-meanArea_)/meanArea_*100;
case 5:
return rowIndex==res_.length? meanMeanV_:res_[rowIndex].getMeanVelocity();
case 6:
val=rowIndex==res_.length? meanMeanV_:res_[rowIndex].getMeanVelocity();
- return Math.abs((val-meanMeanV_)/meanMeanV_*100);
+ return (val-meanMeanV_)/meanMeanV_*100;
}
}
@@ -111,19 +112,26 @@
* Une classe pour une repr\xE9sentation des doubles.
*/
private class DischargeCellRenderer extends DefaultTableCellRenderer {
- NumberFormat fmt = CtuluLib.getDecimalFormat(3);
+ DecimalFormat fmt = CtuluLib.getDecimalFormat(3);
+ DecimalFormat fmtEcart = CtuluLib.getNoEffectDecimalFormat();
public DischargeCellRenderer() {
this.setHorizontalAlignment(SwingConstants.RIGHT);
fmt.setMaximumFractionDigits(3);
fmt.setMinimumFractionDigits(3);
+ fmtEcart.setMaximumFractionDigits(1);
+ fmtEcart.setMinimumFractionDigits(1);
+ fmtEcart.setPositivePrefix("+");
}
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table,value,isSelected,hasFocus,row,column);
if (value instanceof Double) {
- this.setText(fmt.format((Double)value));
+ if (column==2 || column==4 || column==6)
+ this.setText(fmtEcart.format((Double)value));
+ else
+ this.setText(fmt.format((Double)value));
}
return this;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-02-24 12:58:11 UTC (rev 9291)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -57,6 +57,7 @@
import org.fudaa.fudaa.piv.action.PivOrthoVerifyGRPAction;
import org.fudaa.fudaa.piv.action.PivSelectImagesAction;
import org.fudaa.fudaa.piv.action.PivShow3DTransectAction;
+import org.fudaa.fudaa.piv.action.PivShowFlowResultsAction;
import org.fudaa.fudaa.piv.metier.PivProject;
import org.fudaa.fudaa.piv.metier.PivProjectStateListener;
@@ -820,7 +821,7 @@
mn.add(sm);
mn.add(get2dFrame().getVisuPanel().getRealView().getParamsTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE));
mn.add(new PivComputeFlowAction(this));
-// mn.add(get2dFrame().getVisuPanel().getShowFlowAction().buildMenuItem(EbliComponentFactory.INSTANCE));
+ mn.add(new PivShowFlowResultsAction(this));
mn.add(new PivShow3DTransectAction(this));
mn.addSeparator(PivResource.getS("Vue"));
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2016-02-24 12:58:11 UTC (rev 9291)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -311,13 +311,6 @@
cqFlowResults.setName("cqRealFlow");
// Donne la couleur des fl\xE8ches si pas de palette de couleurs.
cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE));
- cqFlowResults.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if ("visible".equals(evt.getPropertyName())) {
- pnLayers_.getShowFlowAction().setSelected((Boolean)evt.getNewValue());
- }
- }
- });
// Layer des transect
cqTransect_= new PivTransectLayer();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java 2016-02-24 12:58:11 UTC (rev 9291)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -45,7 +45,6 @@
import org.fudaa.fudaa.piv.action.PivEditAction;
import org.fudaa.fudaa.piv.action.PivNewTransectAction;
import org.fudaa.fudaa.piv.action.PivOrthoGRPAction;
-import org.fudaa.fudaa.piv.action.PivShowFlowAction;
import org.fudaa.fudaa.piv.action.PivShowVelocityAction;
import org.fudaa.fudaa.piv.layer.PivEditableModel;
import org.fudaa.fudaa.piv.metier.PivProject;
@@ -129,7 +128,6 @@
private PivComputeGridDefinitionAction actComputeGrid_;
private PivShowVelocityAction actShowVelocities_;
- private PivShowFlowAction actShowFlow_;
private PivEditAction actEdit_;
private SceneRotationAction actRotation_;
private SceneDeplacementAction actDeplacement_;
@@ -290,7 +288,6 @@
protected void buildActions() {
actComputeGrid_=new PivComputeGridDefinitionAction(this);
actShowVelocities_=new PivShowVelocityAction((PivImplementation)getCtuluUI());
- actShowFlow_=new PivShowFlowAction((PivImplementation)getCtuluUI());
actEdit_=new PivEditAction(this);
actTransfMatrix_=new PivChangeCoordinatesSystemAction((PivImplementation)getCtuluUI());
getScene().addSelectionListener(actEdit_);
@@ -377,14 +374,6 @@
}
/**
- * Retourne l'action pour voir les d\xE9bits.
- * @return L'action.
- */
- public PivShowFlowAction getShowFlowAction() {
- return actShowFlow_;
- }
-
- /**
* Retourne l'action pour \xE9diter une g\xE9om\xE9trie.
* @return L'action.
*/
Deleted: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java 2016-02-24 12:58:11 UTC (rev 9291)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -1,50 +0,0 @@
-/*
- * @creation 3 juil. 2008
- * @modification $Date:$
- * @license GNU General Public License 2
- * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.piv.action;
-
-import org.fudaa.ebli.commun.EbliActionChangeState;
-import org.fudaa.fudaa.piv.PivImplementation;
-import org.fudaa.fudaa.piv.PivResource;
-import org.fudaa.fudaa.piv.PivVisuPanel;
-
-/**
- * Une action pour voir les d\xE9bits apr\xE8s calcul en espace r\xE9el.
- *
- * @author Bertrand Marchand (mar...@de...)
- * @version $Id$
- */
-public class PivShowFlowAction extends EbliActionChangeState {
- PivImplementation impl;
-
- /**
- * Constructeur.
- * @param _impl L'implementation.
- */
- public PivShowFlowAction(PivImplementation _impl) {
- super(PivResource.getS("Voir les vitesses moyennes sur la verticale"), null, "SHOW_FLOW_RESULTS");
-
- impl=_impl;
- setEnabled(false);
- }
-
-
- @Override
- public String getEnableCondition() {
- return PivResource.getS("Il doit exister des r\xE9sultats de calcul de d\xE9bit");
- }
-
-
- @Override
- public void changeAction() {
- // On bascule dans la bonne vue.
- if (isSelected()) {
- impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
- }
- impl.get2dFrame().getVisuPanel().setFlowLayerVisible(isSelected());
- }
-}
Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java 2016-02-24 15:56:08 UTC (rev 9292)
@@ -0,0 +1,69 @@
+/*
+ * @creation 3 juil. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.piv.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ctulu.gui.CtuluDialog;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.piv.PivFlowInfoPanel;
+import org.fudaa.fudaa.piv.PivImplementation;
+import org.fudaa.fudaa.piv.PivResource;
+
+/**
+ * Une action pour afficher les resultats de calcul de d\xE9bit (sans refaire le calcul).
+ *
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id: PivComputeFlowAction.java 9133 2015-06-16 16:36:57Z bmarchan $
+ */
+public class PivShowFlowResultsAction extends EbliActionSimple {
+ PivImplementation impl;
+ CtuluDialog diProgress_;
+
+ /**
+ * Constructeur.
+ * @param _impl L'implementation.
+ */
+ public PivShowFlowResultsAction(PivImplementation _impl) {
+ super(PivResource.getS("Afficher les r\xE9sultats du calcul..."), null, "SHOW_FLOW_RESULTS");
+
+ impl=_impl;
+ setEnabled(false);
+ }
+
+ /**
+ * Affiche la fenetre resultats.
+ * @param _e L'evenement pour l'action.
+ */
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ if (!isValide()) {
+ return;
+ }
+
+ PivFlowInfoPanel pnInfo=new PivFlowInfoPanel(impl.getCurrentProject().getFlowResults());
+ pnInfo.afficheModale(impl.getFrame(), PivResource.getS("R\xE9sultats du calcul"), CtuluDialog.OK_OPTION);
+ }
+
+ /**
+ * @return true Si toutes les donn\xE9es sont pr\xE9sentes pour un lancement.
+ */
+ public boolean isValide() {
+ if (impl.getCurrentProject().getFlowResults()==null) {
+ impl.error(PivResource.getS("Erreur"), PivResource.getS("Il n'existe pas de r\xE9sultats de calcul de d\xE9bit"));
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public String getEnableCondition() {
+ return PivResource.getS("Les r\xE9sultats de calcul de d\xE9bit doivent exister");
+ }
+}
Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
