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

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

Revision: 6689
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6689&view=rev
Author:   bmarchan
Date:     2011-11-21 11:23:40 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Add : Possibilit?\195?\169 de choisir son image en espace transform?\195?\169.

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

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java	2011-11-21 11:20:20 UTC (rev 6688)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java	2011-11-21 11:23:40 UTC (rev 6689)
@@ -60,6 +60,8 @@
   
   PivOriginalImageModel mdlOriginalImage;
   PivOrthoPointsModel mdlOrthoPoints;
+
+  private boolean enableEvents_=true;
   
   /**
    * Constructeur.
@@ -195,8 +197,6 @@
     
     enableEvents_=true;
   }
-
-  boolean enableEvents_=true;
   
   @Override
   public void projectStateChanged(PivProject _prj, String _prop) {

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java	2011-11-21 11:20:20 UTC (rev 6688)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java	2011-11-21 11:23:40 UTC (rev 6689)
@@ -4,6 +4,10 @@
 package org.fudaa.fudaa.piv;
 
 import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +34,7 @@
 import org.fudaa.fudaa.piv.layer.PivCntGridModel;
 import org.fudaa.fudaa.piv.layer.PivIASALayer;
 import org.fudaa.fudaa.piv.layer.PivIASAModel;
+import org.fudaa.fudaa.piv.layer.PivImageRasterLayer;
 import org.fudaa.fudaa.piv.layer.PivTransfImageModel;
 import org.fudaa.fudaa.piv.metier.PivGrid;
 import org.fudaa.fudaa.piv.metier.PivProject;
@@ -59,11 +64,13 @@
   PivIASALayer cqIASA_;
   ZCalquePointEditable cqGrille_;
   ZCalqueLigneBriseeEditable cqCntGrille_;
-  ZCalqueImageRaster cqTransfImage_;
+  PivImageRasterLayer cqTransfImage_;
   PivTransfImageModel mdlTransfImage;
   PivIASAModel mdlIASA;
   PivCntGridModel mdlCntGrid;
   ZModelePointEditable mdlGrid;
+
+  boolean enableEvents_=true;
   
   /**
    * Constructeur.
@@ -126,7 +133,7 @@
     cqGrille_.setDestructible(false);
 
     // Layer de l'image
-    cqTransfImage_ = new ZCalqueImageRaster();
+    cqTransfImage_ = new PivImageRasterLayer();
     cqTransfImage_.setTitle(PivResource.getS("Image ortho"));
     cqTransfImage_.setName("cqTransfImg");
     
@@ -168,13 +175,65 @@
   /**
    * Construction des outils sp\xE9cifiques \xE0 cette vue.
    */
-  private void buildTools() {}
+  private void buildTools() {
+    // La liste d\xE9roulante des images
+    cbImg_ = new BuComboBox();
+    cbImg_.addItemListener(new ItemListener() {
+      
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        if (e.getStateChange()==ItemEvent.SELECTED) {
+          if (!enableEvents_) return;
+          
+          if (cqTransfImage_!=null && cqTransfImage_.getModelImage()!=null) {
+            cqTransfImage_.getModelImage().setImage(cbImg_.getSelectedIndex());
+            // Pour que le calque soit r\xE9affich\xE9.
+            cqTransfImage_.repaint();
+          }
+        }
+      }
+    });
+    cbImg_.setPreferredSize(new Dimension(200, cbImg_.getPreferredSize().height));
+    cbImg_.setMaximumSize(cbImg_.getPreferredSize());
+    cbImg_.setToolTipText(PivResource.getS("Affiche l'image s\xE9lectionn\xE9e"));
+    cbImg_.setEnabled(false);
+  }
 
   /**
    * Mise a jour les outils.
    */
-  private void majTools() {}
+  private void majTools() {
+    enableEvents_=false;
+    
+    // La liste d\xE9roulante des images, avec s\xE9lection d'une image diff\xE9rente si inexistante.
+    Object o=cbImg_.getSelectedItem();
+    cbImg_.removeAllItems();
+    cbImg_.setEnabled(false);
 
+    if (prj_ != null) {
+      for (File f : prj_.getTransfImageFiles()) {
+        cbImg_.addItem(f.getName());
+      }
+      cbImg_.setEnabled(prj_.getTransfImageFiles().length > 0);
+    }
+    
+    boolean found=false;
+    if (o != null) {
+      for (int i=0; i<cbImg_.getItemCount(); i++) {
+        if (cbImg_.getItemAt(i).equals(o)) {
+          cbImg_.setSelectedItem(o);
+          found=true;
+          break;
+        }
+      }
+    }
+    if (!found) {
+      cbImg_.setSelectedItem(cbImg_.getItemCount()==0?-1:0);
+    }
+    
+    enableEvents_=true;
+  }
+
   @Override
   public void projectStateChanged(PivProject _prj, String _prop) {
     if ("transfImages".equals(_prop)) {
@@ -201,7 +260,7 @@
 
   @Override
   public JComponent[] getSpecificTools() {
-    return new JComponent[0];
+    return new JComponent[]{cbImg_};
   }
 
   @Override

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