Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6783] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2011-12-04 18:53:59
|
Revision: 6783
http://fudaa.svn.sourceforge.net/fudaa/?rev=6783&view=rev
Author: bmarchan
Date: 2011-12-04 18:53:52 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Refactor setImage()
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/PivRealView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivAbstractImageModel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOriginalImageModel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivRealImageModel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransfImageModel.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-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -148,7 +148,7 @@
if (!enableEvents_) return;
if (cqOriginalImg_!=null && cqOriginalImg_.getModelImage()!=null) {
- cqOriginalImg_.getModelImage().setImage(cbImg_.getSelectedIndex());
+ cqOriginalImg_.getModelImage().setSelectedImage(cbImg_.getSelectedIndex());
// Pour que le calque soit r\xE9affich\xE9.
cqOriginalImg_.repaint();
}
@@ -202,7 +202,7 @@
public void projectStateChanged(PivProject _prj, String _prop) {
if("pgmImages".equals(_prop)) {
majTools();
- mdlOriginalImage.setImage(cbImg_.getSelectedIndex());
+ mdlOriginalImage.setSelectedImage(cbImg_.getSelectedIndex());
}
else if("orthoPoints".equals(_prop)) {
mdlOrthoPoints.update();
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 2011-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -396,7 +396,7 @@
private void setSelectedImage(int _ind) {
if (cqRealImg_!=null && cqRealImg_.getModelImage()!=null) {
- cqRealImg_.getModelImage().setImage(_ind);
+ cqRealImg_.getModelImage().setSelectedImage(_ind);
// Pour que le calque soit r\xE9affich\xE9.
cqRealImg_.repaint();
}
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-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -195,7 +195,7 @@
if (!enableEvents_) return;
if (cqTransfImage_!=null && cqTransfImage_.getModelImage()!=null) {
- cqTransfImage_.getModelImage().setImage(cbImg_.getSelectedIndex());
+ cqTransfImage_.getModelImage().setSelectedImage(cbImg_.getSelectedIndex());
// Pour que le calque soit r\xE9affich\xE9.
cqTransfImage_.repaint();
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivAbstractImageModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivAbstractImageModel.java 2011-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivAbstractImageModel.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -11,7 +11,7 @@
/**
* Un modele pour un calque image.
* @author Bertrand Marchand (mar...@de...)
- * @version $Id:$
+ * @version $Id$
*/
public abstract class PivAbstractImageModel extends ZModeleStatiqueImageRaster {
@@ -21,9 +21,9 @@
public abstract PivProject getProject();
/**
- * Definit l'image du projet a afficher.
+ * S\xE9lectionne l'image du projet a afficher.
* @param _idx L'index de l'image dans la liste des images, -1 si aucune image \xE0 afficher.
*/
- public abstract void setImage(int _idx);
+ public abstract void setSelectedImage(int _idx);
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOriginalImageModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOriginalImageModel.java 2011-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOriginalImageModel.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -47,7 +47,7 @@
* Met a jour le mod\xE8le en fonction de la premi\xE8re image reconditionn\xE9e.
*/
public void update() {
- setImage(0);
+ setSelectedImage(0);
}
/**
@@ -55,7 +55,7 @@
* @param _idx L'index de l'image dans le projet.
*/
@Override
- public void setImage(int _idx) {
+ public void setSelectedImage(int _idx) {
File[] srcFiles=prj_.getSrcImageFiles();
// Si l'indice d'image est bien dans les images disponibles
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivRealImageModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivRealImageModel.java 2011-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivRealImageModel.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -45,7 +45,7 @@
* Met a jour le mod\xE8le en fonction de la premi\xE8re image transform\xE9e.
*/
public void update() {
- setImage(0);
+ setSelectedImage(0);
}
/**
@@ -53,7 +53,7 @@
* @param _idx L'index de l'image dans le projet.
*/
@Override
- public void setImage(int _idx) {
+ public void setSelectedImage(int _idx) {
File[] imgFiles=prj_.getTransfImageFiles();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransfImageModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransfImageModel.java 2011-12-04 18:32:38 UTC (rev 6782)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransfImageModel.java 2011-12-04 18:53:52 UTC (rev 6783)
@@ -45,7 +45,7 @@
* Met a jour le mod\xE8le en fonction de la premi\xE8re image transform\xE9e.
*/
public void update() {
- setImage(0);
+ setSelectedImage(0);
}
/**
@@ -53,7 +53,7 @@
* @param _idx L'index de l'image dans le projet.
*/
@Override
- public void setImage(int _idx) {
+ public void setSelectedImage(int _idx) {
File[] imgFiles=prj_.getTransfImageFiles();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
