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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6373
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6373&view=rev
Author:   bmarchan
Date:     2011-09-08 08:08:26 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Ame : Le nom de la vue est affich?\195?\169 dans le titre de la fenetre

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFille2d.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOriginalViewAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivRealViewAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransfViewAction.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFille2d.java
===================================================================

--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFille2d.java	2011-09-07 13:57:03 UTC (rev 6372)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFille2d.java	2011-09-08 08:08:26 UTC (rev 6373)
@@ -26,7 +26,7 @@
   public PivFille2d(PivImplementation _ui) {
     super(new PivVisuPanel(_ui), _ui, null);
     setName("mdlMainFille");
-    setTitle(PivResource.getS("Vue 2D"));
+    changeTitle(null);
     setPreferredSize(new Dimension(600, 600));
 //    cutCopyPasteManager_=new MdlCutCopyPasteManager(this, (MdlSceneEditor) getMdlVisuPanel().getEditor().getSceneEditor());
   }
@@ -46,6 +46,18 @@
   public final PivVisuPanel getPivVisuPanel() {
     return (PivVisuPanel)getVisuPanel();
   }
+  
+  /**
+   * Modifie le titre de la fenetre, en tenant compte de la vue courante.
+   * @param _view Le nom de la vue courante.
+   */
+  protected void changeTitle(String _view) {
+    String title=PivResource.getS("Vue 2D");
+    if (_view!=null) {
+      title+=" - "+_view;
+    }
+    setTitle(title);
+  }
 
 //  public final String[] getEnabledActions() {
 //    return new String[] { "RECHERCHER", "IMPRIMER", "MISEENPAGE", "PREVISUALISER", CtuluExportDataInterface.EXPORT_CMD,

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	2011-09-07 13:57:03 UTC (rev 6372)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java	2011-09-08 08:08:26 UTC (rev 6373)
@@ -11,6 +11,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import javax.swing.Action;
+import javax.swing.JMenu;
 import javax.units.NonSI;
 import javax.units.SI;
 import org.fudaa.ctulu.gis.GISAttributeString;
@@ -19,7 +20,6 @@
 
 import org.fudaa.ebli.calque.ZCalqueImageRaster;
 import org.fudaa.ebli.commun.EbliActionInterface;
-import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
 
 import org.fudaa.ebli.calque.ZEbliCalquesPanel;
 import org.fudaa.ebli.calque.dessin.DeForme;
@@ -71,6 +71,13 @@
   public static final int MODE_TRANSF_VIEW=2;
   /** La vue en espace r\xE9el */
   public static final int MODE_REAL_VIEW=3;
+  /** Le nom de la vue en espace image reconditionn\xE9e */
+  public static final String MODE_ORIGINAL_NAME=PivResource.getS("Espace image reconditionn\xE9e");
+  /** Le nom de la vue en espace image reconditionn\xE9e */
+  public static final String MODE_TRANSF_NAME=PivResource.getS("Espace image transform\xE9e");
+  /** Le nom de la vue en espace image reconditionn\xE9e */
+  public static final String MODE_REAL_NAME=PivResource.getS("Espace r\xE9el");
+  
 
   // Les d\xE9finitions des coordonn\xE9es pour X et Y.
   private static final EbliCoordinateDefinition DEF_COOR_X=new EbliCoordinateDefinition("X", new EbliFormatter(SI.METER));
@@ -135,7 +142,7 @@
    * les classes m\xE8res.
    * @param _impl L'implementation de l'application.
    */
-  public PivVisuPanel(FudaaCommonImplementation _impl) {
+  public PivVisuPanel(PivImplementation _impl) {
     super(_impl);
 
     // L'editeur de g\xE9om\xE9trie sert pour affichage du panneau d'\xE9dition.
@@ -298,6 +305,8 @@
     viewMode_=_mode;
     
     removeAllCalqueDonnees();
+    
+    String title=null;
 
     if (_mode == MODE_ORIGINAL_VIEW) {
       addCalque(cqOrthoPoints_);
@@ -308,6 +317,8 @@
       actOriginalView_.putValue(Action.SELECTED_KEY,true);
 
       setCoordinateDefinitions(new EbliCoordinateDefinition[]{DEF_COOR_I,DEF_COOR_J});
+      
+      title=MODE_ORIGINAL_NAME;
     }
     else if (_mode == MODE_REAL_VIEW) {
       cqRealOrthoPoints_.setLegende(null);
@@ -323,6 +334,8 @@
       getCqLegend().enleve(cqIASA_);
 
       setCoordinateDefinitions(new EbliCoordinateDefinition[]{DEF_COOR_X,DEF_COOR_Y});
+      
+      title=MODE_REAL_NAME;
     }
     else if (_mode == MODE_TRANSF_VIEW) {
       // Pas terrible, mais ca marche. Il serait mieux de pouvoir ajouter le
@@ -338,8 +351,12 @@
       getCqLegend().enleve(cqVelResults);
 
       setCoordinateDefinitions(new EbliCoordinateDefinition[]{DEF_COOR_J,DEF_COOR_I});
+      
+      title=MODE_TRANSF_NAME;
     }
-
+    
+    ((PivImplementation)getCtuluUI()).get2dFrame().changeTitle(title);
+    
     restaurer();
     getVueCalque().revalidate();
     getVueCalque().repaint();
@@ -576,4 +593,15 @@
   public EbliActionInterface[] getApplicationActions() {
     return new EbliActionInterface[0];
   }
+  
+  /**
+   * Necessaire pour que le titre du menu ne soit pas celui de la fenetre, qui
+   * est dynamiquement modifi\xE9.
+   * @param _title Non utilis\xE9.
+   * @return Les menus sp\xE9cifiques.
+   */
+  @Override
+  public JMenu[] getSpecificMenus(final String _title) {
+    return super.getSpecificMenus(PivResource.getS("Vue 2D"));
+  }
 }
\ No newline at end of file

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOriginalViewAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOriginalViewAction.java	2011-09-07 13:57:03 UTC (rev 6372)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOriginalViewAction.java	2011-09-08 08:08:26 UTC (rev 6373)
@@ -27,7 +27,7 @@
    * @param _impl L'implementation.
    */
   public PivOriginalViewAction(PivImplementation _impl) {
-    super(PivResource.getS("Espace image reconditionn\xE9e"), null, "PIV_ORIGINAL_VIEW");
+    super(PivVisuPanel.MODE_ORIGINAL_NAME, null, "PIV_ORIGINAL_VIEW");
     setKey(KeyStroke.getKeyStroke('I'));
 
     impl=_impl;

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivRealViewAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivRealViewAction.java	2011-09-07 13:57:03 UTC (rev 6372)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivRealViewAction.java	2011-09-08 08:08:26 UTC (rev 6373)
@@ -28,7 +28,7 @@
    * @param _impl L'implementation.
    */
   public PivRealViewAction(PivImplementation _impl) {
-    super(PivResource.getS("Espace r\xE9el"), null, "PIV_REAL_VIEW");
+    super(PivVisuPanel.MODE_REAL_NAME, null, "PIV_REAL_VIEW");
     setKey(KeyStroke.getKeyStroke('R'));
 
     impl=_impl;

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransfViewAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransfViewAction.java	2011-09-07 13:57:03 UTC (rev 6372)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransfViewAction.java	2011-09-08 08:08:26 UTC (rev 6373)
@@ -27,7 +27,7 @@
    * @param _impl L'implementation.
    */
   public PivTransfViewAction(PivImplementation _impl) {
-    super(PivResource.getS("Espace image transform\xE9e"), null, "PIV_TRANSF_VIEW");
+    super(PivVisuPanel.MODE_TRANSF_NAME, null, "PIV_TRANSF_VIEW");
     setKey(KeyStroke.getKeyStroke('T'));
 
     impl=_impl;

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





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

https://gitlab.com/fudaa

fudaa-svn-commit