[Fudaa-svn-commit] SF.net SVN: fudaa:[9058] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/PivFilterInstantResultsPanel.java

[<bma...@us...>]

Revision: 9058
          http://sourceforge.net/p/fudaa/svn/9058
Author:   bmarchan
Date:     2015-03-09 15:04:35 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Fix : Valeurs par d?\195?\169faut pour les filtrages

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java	2015-03-09 14:17:01 UTC (rev 9057)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java	2015-03-09 15:04:35 UTC (rev 9058)
@@ -222,8 +222,11 @@
   public void setFilterValues(PivComputeParameters _params) {
     if (_params==null) return;
     
-    if (_params.getMinCorrelation()==PivResource.FORTRAN_DOUBLE_MIN) {
+    if (_params.getMinCorrelation()==PivUtils.FORTRAN_DOUBLE_MIN && 
+        _params.getMaxCorrelation()==PivUtils.FORTRAN_DOUBLE_MAX) {
       cbCorrelFlt_.setSelected(false);
+      tfCorrelMinLimit_.setText("0.");
+      tfCorrelMaxLimit_.setText("1.");
     }
     else {
       cbCorrelFlt_.setSelected(true);
@@ -231,8 +234,15 @@
       tfCorrelMaxLimit_.setText(""+_params.getMaxCorrelation());
     }
     
-    if (_params.getSmin()==PivResource.FORTRAN_DOUBLE_MIN) {
+    if (_params.getSmin()==PivUtils.FORTRAN_DOUBLE_MIN &&
+        _params.getSmax()==PivUtils.FORTRAN_DOUBLE_MAX &&
+        _params.getVmin()==PivUtils.FORTRAN_DOUBLE_MIN &&
+        _params.getVmax()==PivUtils.FORTRAN_DOUBLE_MAX) {
       cbVelFlt_.setSelected(false);
+      tfNormalMinLimit_.setText("0.");
+      tfNormalMaxLimit_.setText(""+_params.getSmax());
+      tfVyMinLimit_.setText(""+_params.getVmin());
+      tfVyMaxLimit_.setText(""+_params.getVmax());
     }
     else {
       cbVelFlt_.setSelected(true);
@@ -256,8 +266,8 @@
       _params.setMaxCorrelation(Double.parseDouble(tfCorrelMaxLimit_.getText()));
     }
     else {
-      _params.setMinCorrelation(PivResource.FORTRAN_DOUBLE_MIN);
-      _params.setMaxCorrelation(PivResource.FORTRAN_DOUBLE_MAX);
+      _params.setMinCorrelation(PivUtils.FORTRAN_DOUBLE_MIN);
+      _params.setMaxCorrelation(PivUtils.FORTRAN_DOUBLE_MAX);
     }
     
     if (cbVelFlt_.isSelected()) {
@@ -267,10 +277,10 @@
       _params.setVmax(Double.parseDouble(tfVyMaxLimit_.getText()));
     }
     else {
-      _params.setSmin(PivResource.FORTRAN_DOUBLE_MIN);
-      _params.setSmax(PivResource.FORTRAN_DOUBLE_MAX);
-      _params.setVmin(PivResource.FORTRAN_DOUBLE_MIN);
-      _params.setVmax(PivResource.FORTRAN_DOUBLE_MAX);
+      _params.setSmin(PivUtils.FORTRAN_DOUBLE_MIN);
+      _params.setSmax(PivUtils.FORTRAN_DOUBLE_MAX);
+      _params.setVmin(PivUtils.FORTRAN_DOUBLE_MIN);
+      _params.setVmax(PivUtils.FORTRAN_DOUBLE_MAX);
     }
   }
 
@@ -345,27 +355,27 @@
     
     if (cbVelFlt_.isSelected()) {
       min=Double.parseDouble(tfNormalMinLimit_.getText());
-      if (min<=PivResource.FORTRAN_DOUBLE_MIN) {
+      if (min<PivUtils.FORTRAN_DOUBLE_MIN) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}",
-            PivResource.getS("Min norme de vitesse"), PivResource.FORTRAN_DOUBLE_MIN));
+            PivResource.getS("Min norme de vitesse"), PivUtils.FORTRAN_DOUBLE_MIN));
         return false;
       }
       max=Double.parseDouble(tfNormalMaxLimit_.getText());
-      if (max>=PivResource.FORTRAN_DOUBLE_MAX) {
+      if (max>PivUtils.FORTRAN_DOUBLE_MAX) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}",
-            PivResource.getS("Max norme de vitesse"), PivResource.FORTRAN_DOUBLE_MAX));
+            PivResource.getS("Max norme de vitesse"), PivUtils.FORTRAN_DOUBLE_MAX));
         return false;
       }
       min=Double.parseDouble(tfVyMinLimit_.getText());
-      if (min<=PivResource.FORTRAN_DOUBLE_MIN) {
+      if (min<PivUtils.FORTRAN_DOUBLE_MIN) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}",
-            PivResource.getS("Min vitesse transversale"), PivResource.FORTRAN_DOUBLE_MIN));
+            PivResource.getS("Min vitesse transversale"), PivUtils.FORTRAN_DOUBLE_MIN));
         return false;
       }
       max=Double.parseDouble(tfVyMaxLimit_.getText());
-      if (max>=PivResource.FORTRAN_DOUBLE_MAX) {
+      if (max>PivUtils.FORTRAN_DOUBLE_MAX) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}",
-            PivResource.getS("Max vitesse transversale"), PivResource.FORTRAN_DOUBLE_MAX));
+            PivResource.getS("Max vitesse transversale"), PivUtils.FORTRAN_DOUBLE_MAX));
         return false;
       }
     }
@@ -378,15 +388,15 @@
 
     if (cbCorrelFlt_.isSelected()) {
       min=Double.parseDouble(tfCorrelMinLimit_.getText());
-      if (min <= PivResource.FORTRAN_DOUBLE_MIN) {
+      if (min < PivUtils.FORTRAN_DOUBLE_MIN) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}", 
-            PivResource.getS("Min corr\xE9lation"), PivResource.FORTRAN_DOUBLE_MIN));
+            PivResource.getS("Min corr\xE9lation"), PivUtils.FORTRAN_DOUBLE_MIN));
         return false;
       }
       max=Double.parseDouble(tfCorrelMaxLimit_.getText());
-      if (max >= PivResource.FORTRAN_DOUBLE_MAX) {
+      if (max > PivUtils.FORTRAN_DOUBLE_MAX) {
         setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}", 
-            PivResource.getS("Max corr\xE9lation"), PivResource.FORTRAN_DOUBLE_MAX));
+            PivResource.getS("Max corr\xE9lation"), PivUtils.FORTRAN_DOUBLE_MAX));
         return false;
       }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.