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

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

Revision: 9022
          http://sourceforge.net/p/fudaa/svn/9022
Author:   bmarchan
Date:     2015-02-16 13:13:02 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
On rend le calque image invisible au moment de v?\195?\169rifier les points GRP

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

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java	2015-02-16 11:45:46 UTC (rev 9021)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java	2015-02-16 13:13:02 UTC (rev 9022)
@@ -25,6 +25,7 @@
 public class PivOrthoVerifyGRPPanel extends CtuluDialogPanel {
   PivOrthoPoint[] pts_;
   PivImplementation impl_;
+  boolean bImgVisible_;
 
   /**
    * Une classe pour le modele de la table affichant les valeurs r\xE9elles et
@@ -118,6 +119,11 @@
   public PivOrthoVerifyGRPPanel(PivImplementation _impl) {
     impl_=_impl;
     pts_=_impl.getCurrentProject().getOrthoPoints();
+    
+    // On efface le calque image, l'image qu'elle contient n'est pas forcement pertinente.
+    bImgVisible_=impl_.get2dFrame().getVisuPanel().isImageLayerVisible();
+    impl_.get2dFrame().getVisuPanel().setImageLayerVisible(false);
+
     customize();
   }
 
@@ -139,6 +145,7 @@
   @Override
   public void apply() {
     impl_.get2dFrame().getVisuPanel().setControlPointsLayerVisible(false);
+    impl_.get2dFrame().getVisuPanel().setImageLayerVisible(bImgVisible_);
   }
 
   /**
@@ -148,6 +155,7 @@
   @Override
   public boolean cancel() {
     impl_.get2dFrame().getVisuPanel().setControlPointsLayerVisible(false);
+    impl_.get2dFrame().getVisuPanel().setImageLayerVisible(bImgVisible_);
     return super.cancel();
   }
 }

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-16 11:45:46 UTC (rev 9021)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2015-02-16 13:13:02 UTC (rev 9022)
@@ -762,6 +762,22 @@
   public void setFlowLayerVisible(boolean _b) {
     cqFlowResults.setVisible(_b);
   }
+
+  /**
+   * Rend visible le calque image.
+   * @param _b True : Le calque est visible.
+   */
+  public void setImageLayerVisible(boolean _b) {
+    cqRealImg_.setVisible(_b);
+  }
+
+  /**
+   * Retourne la visibilit\xE9 du calque image.
+   * @return True : Le calque est visible.
+   */
+  public boolean isImageLayerVisible() {
+    return cqRealImg_.isVisible();
+  }
   
   public ZCalqueLigneBriseeEditable getTransectLayer() {
     return cqTransect_;

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	2015-02-16 11:45:46 UTC (rev 9021)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java	2015-02-16 13:13:02 UTC (rev 9022)
@@ -381,6 +381,22 @@
   }
 
   /**
+   * Rend visible le calque image.
+   * @param _b True : Le calque est visible.
+   */
+  public void setImageLayerVisible(boolean _b) {
+    getRealView().setImageLayerVisible(_b);
+  }
+
+  /**
+   * Retourne la visibilit\xE9 du calque image.
+   * @return True : Le calque est visible.
+   */
+  public boolean isImageLayerVisible() {
+    return getRealView().isImageLayerVisible();
+  }
+
+  /**
    * Retourne le mode de vue.
    * @return Le mode de vue parmi {@link #MODE_ORIGINAL_VIEW},
    * {@link #MODE_REAL_VIEW}, {@link #MODE_TRANSF_VIEW}

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