Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6376] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2011-09-08 08:36:46
|
Revision: 6376
http://fudaa.svn.sourceforge.net/fudaa/?rev=6376&view=rev
Author: bmarchan
Date: 2011-09-08 08:36:39 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Remplacement signature PivFille2d.getPivVisuPanel() -> getVisuPanel()
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/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeParamAction.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/PivOriginalViewAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.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/PivSelectImagesAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowVelocityAction.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-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFille2d.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -43,8 +43,9 @@
* Retourne le panneau interne des calques.
* @return Le panneau des calques.
*/
- public final PivVisuPanel getPivVisuPanel() {
- return (PivVisuPanel)getVisuPanel();
+ @Override
+ public PivVisuPanel getVisuPanel() {
+ return (PivVisuPanel)super.getVisuPanel();
}
/**
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 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -213,7 +213,7 @@
*/
void update2dFrame(String _prop) {
if (piv2dFrame==null) return;
- piv2dFrame.getPivVisuPanel().refresh(_prop);
+ piv2dFrame.getVisuPanel().refresh(_prop);
}
/**
@@ -367,7 +367,7 @@
*/
public void open2dFrame() {
if (project==null) return;
- piv2dFrame.getPivVisuPanel().setProjet(project);
+ piv2dFrame.getVisuPanel().setProjet(project);
addInternalFrame(piv2dFrame);
// Pas indispensable, mais permet \xE0 la colonne de droite
@@ -376,7 +376,7 @@
public void run() {
try {
piv2dFrame.setMaximum(true);
- piv2dFrame.getPivVisuPanel().restaurer();
+ piv2dFrame.getVisuPanel().restaurer();
}
catch (PropertyVetoException ex) {
}
@@ -638,21 +638,21 @@
BuMenu mn=new BuMenu(PivResource.getS("LSPIV"),"mnPROJECT");
mn.add(new PivSelectImagesAction(this));
mn.addSeparator(PivResource.getS("Orthorectification"));
- mn.add(get2dFrame().getPivVisuPanel().getOrthoGRPAction());
+ mn.add(get2dFrame().getVisuPanel().getOrthoGRPAction());
mn.add(new PivOrthoVerifyGRPAction(this));
mn.add(new PivOrthoParamAction(this));
mn.add(new PivOrthoLaunchAction(this));
mn.addSeparator(PivResource.getS("Analyse LSPIV"));
mn.add(new PivComputeParamAction(this));
- mn.add(get2dFrame().getPivVisuPanel().getComputeGridDefinitionAction());
+ mn.add(get2dFrame().getVisuPanel().getComputeGridDefinitionAction());
mn.add(new PivComputeLaunchAction(this));
mn.addSeparator(PivResource.getS("R\xE9sultats"));
- mn.add(get2dFrame().getPivVisuPanel().getShowVelocitiesAction().buildMenuItem(EbliComponentFactory.INSTANCE));
+ mn.add(get2dFrame().getVisuPanel().getShowVelocitiesAction().buildMenuItem(EbliComponentFactory.INSTANCE));
mn.addSeparator(PivResource.getS("Vue"));
ButtonGroup bg=new ButtonGroup();
- AbstractButton itOriginalView=get2dFrame().getPivVisuPanel().getOriginalViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
- AbstractButton itRealView=get2dFrame().getPivVisuPanel().getRealViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
- AbstractButton itTransfView=get2dFrame().getPivVisuPanel().getTransfViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ AbstractButton itOriginalView=get2dFrame().getVisuPanel().getOriginalViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ AbstractButton itRealView=get2dFrame().getVisuPanel().getRealViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ AbstractButton itTransfView=get2dFrame().getVisuPanel().getTransfViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
bg.add(itTransfView);
bg.add(itRealView);
bg.add(itOriginalView);
@@ -660,7 +660,7 @@
mn.add(itRealView);
mn.add(itTransfView);
mn.addSeparator();
- mn.add(get2dFrame().getPivVisuPanel().getEditAction());
+ mn.add(get2dFrame().getVisuPanel().getEditAction());
mn.setVisible(true);
return mn;
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 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -138,7 +138,7 @@
*/
@Override
public void apply() {
- impl_.get2dFrame().getPivVisuPanel().setControlPointsLayerVisible(false);
+ impl_.get2dFrame().getVisuPanel().setControlPointsLayerVisible(false);
}
/**
@@ -147,7 +147,7 @@
*/
@Override
public boolean cancel() {
- impl_.get2dFrame().getPivVisuPanel().setControlPointsLayerVisible(false);
+ impl_.get2dFrame().getVisuPanel().setControlPointsLayerVisible(false);
return super.cancel();
}
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -101,8 +101,8 @@
}
impl.message(PivResource.getS("Calcul termin\xE9"), PivResource.getS("Le calcul s'est termin\xE9 avec succ\xE8s"), false);
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
- impl.get2dFrame().getPivVisuPanel().setVelocitiesLayerVisible(true);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setVelocitiesLayerVisible(true);
}
};
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeParamAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeParamAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeParamAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -35,7 +35,7 @@
* @param _e L'evenement pour l'action.
*/
public void actionPerformed(final ActionEvent _e) {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
PivComputeParamPanel pn=new PivComputeParamPanel();
PivComputeParameters params=impl.getCurrentProject().getComputeParameters();
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 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -72,7 +72,7 @@
PivOrthoPoint[] pts=(PivOrthoPoint[])ret.getSource();
impl.getCurrentProject().setOrthoPoints(pts);
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
}
/**
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 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -83,7 +83,7 @@
}
impl.getCurrentProject().setComputeGrid(newGrid);
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
}
/**
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-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOriginalViewAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -56,7 +56,7 @@
@Override
public void changeAction() {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
impl.updateActionsState();
}
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -43,7 +43,7 @@
* @param _e L'evenement pour l'action.
*/
public void actionPerformed(final ActionEvent _e) {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
PivOrthoParamPanel pnParams=new PivOrthoParamPanel(impl);
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -48,7 +48,7 @@
return;
}
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
if (!impl.getLauncher().areExeOK()) {
PivExePanel pnExe = new PivExePanel();
@@ -75,7 +75,7 @@
}
PivOrthoVerifyGRPPanel pn=new PivOrthoVerifyGRPPanel(impl);
- impl.get2dFrame().getPivVisuPanel().setControlPointsLayerVisible(true);
+ impl.get2dFrame().getVisuPanel().setControlPointsLayerVisible(true);
pn.affiche(impl.getFrame(),PivResource.getS("V\xE9rification des points de r\xE9f\xE9rence"), CtuluDialog.OK_OPTION);
}
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-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivRealViewAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -77,7 +77,7 @@
@Override
public void changeAction() {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
impl.updateActionsState();
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -110,7 +110,7 @@
diProgress_.dispose();
}
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
impl.message(PivResource.getS("{0} images ont \xE9t\xE9 reconditionn\xE9es avec succ\xE8s",impl.getCurrentProject().getPgmImageFiles().length));
}
};
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowVelocityAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowVelocityAction.java 2011-09-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowVelocityAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -42,8 +42,8 @@
public void changeAction() {
// On bascule dans la bonne vue.
if (isSelected()) {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
}
- impl.get2dFrame().getPivVisuPanel().setVelocitiesLayerVisible(isSelected());
+ impl.get2dFrame().getVisuPanel().setVelocitiesLayerVisible(isSelected());
}
}
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-08 08:20:24 UTC (rev 6375)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransfViewAction.java 2011-09-08 08:36:39 UTC (rev 6376)
@@ -76,7 +76,7 @@
@Override
public void changeAction() {
- impl.get2dFrame().getPivVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
impl.updateActionsState();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
