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

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

Revision: 9035
          http://sourceforge.net/p/fudaa/svn/9035
Author:   bmarchan
Date:     2015-02-19 15:59:11 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
Corrections diverses

Modified Paths:
--------------
    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/action/PivImportGRPAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java

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	2015-02-19 14:28:38 UTC (rev 9034)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2015-02-19 15:59:11 UTC (rev 9035)
@@ -13,7 +13,6 @@
 import java.awt.event.ActionEvent;
 import java.beans.PropertyVetoException;
 import java.io.File;
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Observable;
@@ -527,7 +526,7 @@
       fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
       fc.setAcceptAllFileFilterUsed(false);
       fc.setDialogTitle(PivResource.getS("Ouverture d'un projet"));
-      if (fc.showOpenDialog(this.getFrame()) == JFileChooser.CANCEL_OPTION) {
+      if (fc.showOpenDialog(this.getFrame()) == CtuluFileChooser.CANCEL_OPTION) {
         return;
       }
 

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	2015-02-19 14:28:38 UTC (rev 9034)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2015-02-19 15:59:11 UTC (rev 9035)
@@ -246,10 +246,10 @@
     cqInstantVelResults_ = new PivVelResultsLayer();
     cqInstantVelResults_.setTitle(PivResource.getS("Vit. surf. inst. brutes"));
     cqInstantVelResults_.setLongTitle(PivResource.getS("Vitesses de surface instantan\xE9es brutes"));
-    cqInstantVelResults_.setTitleModifiable(true);
     cqInstantVelResults_.setName("cqInstantVel");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqInstantVelResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE));
+    cqInstantVelResults_.setTitleModifiable(true);
     cqInstantVelResults_.setVisible(false);
 //    cqInstantVelResults_.addPropertyChangeListener(new PropertyChangeListener() {
 //      public void propertyChange(PropertyChangeEvent evt) {
@@ -263,10 +263,10 @@
     cqInstantVelFltResults_ = new PivVelResultsLayer();
     cqInstantVelFltResults_.setTitle(PivResource.getS("Vit. surf. inst. filtr\xE9es"));
     cqInstantVelFltResults_.setLongTitle(PivResource.getS("Vitesses de surface instantan\xE9es filtr\xE9es"));
-    cqInstantVelFltResults_.setTitleModifiable(true);
     cqInstantVelFltResults_.setName("cqInstantVelFlt");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqInstantVelFltResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.GREEN.darker()));
+    cqInstantVelFltResults_.setTitleModifiable(true);
     cqInstantVelFltResults_.setVisible(false);
 //    cqInstantVelFltResults_.addPropertyChangeListener(new PropertyChangeListener() {
 //      public void propertyChange(PropertyChangeEvent evt) {
@@ -300,10 +300,12 @@
     // Layer des transect
     cqTransect_= new ZCalqueLigneBriseeEditable();
     cqTransect_.setTitle(PivResource.getS("Transect"));
+    cqTransect_.setLongTitle(PivResource.getS("Transect"));
     cqTransect_.setName("cqTransect");
     cqTransect_.setFormeEnable(new int[]{DeForme.LIGNE_BRISEE});
     cqTransect_.setLineModel(1, new TraceLigneModel(TraceLigne.POINTILLE, 2, Color.ORANGE));
     cqTransect_.setIconModel(1, new TraceIconModel(TraceIcon.LOSANGE_PLEIN, 3, Color.ORANGE));
+    cqTransect_.setTitleModifiable(true);
     cqTransect_.setDestructible(false);
     cqTransect_.setEditor(pnLayers_.getEditor());
     getNewTransectAction().setTransectLayer(cqTransect_);
@@ -314,6 +316,7 @@
     cqInstantFltIso_.setTitle(PivResource.getS("R\xE9sultats inst. filtr\xE9s"));
     cqInstantFltIso_.setLongTitle(PivResource.getS("R\xE9sultats instantan\xE9s filtr\xE9s"));
     cqInstantFltIso_.setName("cqInstantFltResults");
+    cqInstantFltIso_.setTitleModifiable(true);
     cqInstantFltIso_.setDestructible(false);
     cqInstantFltIso_.setVisible(false);
 
@@ -323,6 +326,7 @@
     cqInstantIso_.setTitle(PivResource.getS("R\xE9sultats inst. bruts"));
     cqInstantIso_.setLongTitle(PivResource.getS("R\xE9sultats instantan\xE9s bruts"));
     cqInstantIso_.setName("cqInstantResults");
+    cqInstantIso_.setTitleModifiable(true);
     cqInstantIso_.setDestructible(false);
     cqInstantIso_.setVisible(false);
 
@@ -330,7 +334,9 @@
     cqAverageIso_ = new PivResultsLayer();
     cqAverageIso_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
     cqAverageIso_.setTitle(PivResource.getS("R\xE9sultats moyenn\xE9s"));
+    cqAverageIso_.setLongTitle(PivResource.getS("R\xE9sultats moyenn\xE9s"));
     cqAverageIso_.setName("cqAveResults");
+    cqAverageIso_.setTitleModifiable(true);
     cqAverageIso_.setDestructible(false);
     cqAverageIso_.setVisible(false);
     

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java	2015-02-19 14:28:38 UTC (rev 9034)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java	2015-02-19 15:59:11 UTC (rev 9035)
@@ -13,6 +13,7 @@
 import javax.swing.JFileChooser;
 
 import org.fudaa.ctulu.CtuluIOResult;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.fudaa.piv.PivImplementation;
 import org.fudaa.fudaa.piv.PivResource;
@@ -28,7 +29,7 @@
  */
 public class PivImportGRPAction extends EbliActionSimple {
   PivImplementation impl;
-  JFileChooser fcGRP;
+  CtuluFileChooser fcGRP;
 
   /**
    * Constructeur
@@ -54,7 +55,7 @@
 
     // Selection du fichier
     if (fcGRP==null)
-      fcGRP = new JFileChooser();
+      fcGRP = new CtuluFileChooser(true);
     fcGRP.setAcceptAllFileFilterUsed(true);
     fcGRP.setFileFilter(PivImplementation.FILE_FLT_GRP);
     fcGRP.setMultiSelectionEnabled(false);

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java	2015-02-19 14:28:38 UTC (rev 9034)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java	2015-02-19 15:59:11 UTC (rev 9035)
@@ -10,9 +10,8 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 
-import javax.swing.JFileChooser;
-
 import org.fudaa.ctulu.CtuluIOResult;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.fudaa.piv.PivImplementation;
 import org.fudaa.fudaa.piv.PivResource;
@@ -29,7 +28,7 @@
  */
 public class PivImportGridAction extends EbliActionSimple {
   PivImplementation impl;
-  JFileChooser fcGrid;
+  CtuluFileChooser fcGrid;
 
   /**
    * Constructeur
@@ -62,12 +61,12 @@
 
     // Selection du fichier
     if (fcGrid==null)
-      fcGrid = new JFileChooser();
+      fcGrid = new CtuluFileChooser(true);
     fcGrid.setAcceptAllFileFilterUsed(true);
     fcGrid.setFileFilter(PivImplementation.FILE_FLT_GRID);
     fcGrid.setMultiSelectionEnabled(false);
     fcGrid.setDialogTitle(PivResource.getS("S\xE9lection d'un fichier de grille"));
-    if (fcGrid.showOpenDialog(impl.getFrame()) == JFileChooser.CANCEL_OPTION) {
+    if (fcGrid.showOpenDialog(impl.getFrame()) == CtuluFileChooser.CANCEL_OPTION) {
       return;
     }
     File gridFile=fcGrid.getSelectedFile();

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java	2015-02-19 14:28:38 UTC (rev 9034)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java	2015-02-19 15:59:11 UTC (rev 9035)
@@ -3,9 +3,8 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 
-import javax.swing.JFileChooser;
-
 import org.fudaa.ctulu.CtuluIOResult;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.fudaa.piv.PivImplementation;
 import org.fudaa.fudaa.piv.PivResource;
@@ -21,7 +20,7 @@
  */
 public class PivImportTransectAction extends EbliActionSimple {
   PivImplementation impl;
-  JFileChooser fcTransect;
+  CtuluFileChooser fcTransect;
 
   /**
    * Constructeur
@@ -47,12 +46,12 @@
 
     // Selection du fichier
     if (fcTransect==null)
-      fcTransect = new JFileChooser();
+      fcTransect = new CtuluFileChooser();
     fcTransect.setAcceptAllFileFilterUsed(true);
     fcTransect.setFileFilter(PivImplementation.FILE_FLT_BATHY);
     fcTransect.setMultiSelectionEnabled(false);
     fcTransect.setDialogTitle(PivResource.getS("S\xE9lection d'un fichier transect"));
-    if (fcTransect.showOpenDialog(impl.getFrame()) == JFileChooser.CANCEL_OPTION) {
+    if (fcTransect.showOpenDialog(impl.getFrame()) == CtuluFileChooser.CANCEL_OPTION) {
       return;
     }
     File transectFile=fcTransect.getSelectedFile();

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