Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6468] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2011-09-30 12:29:28
|
Revision: 6468
http://fudaa.svn.sourceforge.net/fudaa/?rev=6468&view=rev
Author: bmarchan
Date: 2011-09-30 12:29:21 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Mod : Chgt des noms des actions
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.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/PivOrthoGRPAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.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/PivShowVelocityAction.java
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -208,20 +208,20 @@
setEnabledForAction("ENREGISTRER", bprjMod);
setEnabledForAction("FERMER", bprjOpen);
setEnabledForAction("SELECT_IMAGES", bprjOpen);
- setEnabledForAction("ORTHO_GRP", bprjOpen && bprjHasOriginalImg);
+ setEnabledForAction("CREATE_GRP", bprjOpen && bprjHasOriginalImg);
setEnabledForAction("IMPORT_GRP", bprjOpen && bprjHasOriginalImg);
- setEnabledForAction("ORTHO_VERIFY_GRP", bprjOpen && project.getOrthoPoints()!=null);
- setEnabledForAction("ORTHO_PARAM", bprjOpen && project.getOrthoPoints()!=null);
- setEnabledForAction("ORTHO_COMPUTE", bprjOpen);
- setEnabledForAction("PIV_PARAM", bprjOpen && bprjHasTransfImg);
- setEnabledForAction("PIV_GRID", bprjOpen && bprjHasTransfImg);
+ setEnabledForAction("VERIFY_GRP", bprjOpen && project.getOrthoPoints()!=null);
+ setEnabledForAction("DEFINE_ORTHO_PARAM", bprjOpen && project.getOrthoPoints()!=null);
+ setEnabledForAction("COMPUTE_ORTHO", bprjOpen);
+ setEnabledForAction("DEFINE_PIV_PARAM", bprjOpen && bprjHasTransfImg);
+ setEnabledForAction("DEFINE_GRID", bprjOpen && bprjHasTransfImg);
setEnabledForAction("IMPORT_GRID", bprjOpen && bprjHasTransfImg);
setEnabledForAction("IMPORT_TRANSECT", bprjOpen && bprjHasTransfImg);
setEnabledForAction("CREATE_TRANSECT", bprjOpen && bprjHasTransfImg);
- setEnabledForAction("FLOW_COMPUTE", bprjOpen && project.getVelResults()!=null);
- setEnabledForAction("PIV_COMPUTE", bprjOpen);
+ setEnabledForAction("COMPUTE_FLOW", bprjOpen && project.getVelResults()!=null);
+ setEnabledForAction("COMPUTE_PIV", bprjOpen);
setEnabledForAction("COMPUTE_AVERAGE", bprjOpen);
- setEnabledForAction("RESULTS_SHOW_VELOCITIES", bprjOpen && project.getVelResults()!=null);
+ setEnabledForAction("SHOW_VELOCITIES_RESULTS", bprjOpen && project.getVelResults()!=null);
setEnabledForAction("SHOW_FLOW_RESULTS", bprjOpen && project.getFlowResults()!=null);
refreshTitle();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java 2011-09-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -35,7 +35,7 @@
* @param _impl L'implementation.
*/
public PivComputeFlowAction(PivImplementation _impl) {
- super(PivResource.getS("Calcul du d\xE9bit"), null, "FLOW_COMPUTE");
+ super(PivResource.getS("Calcul du d\xE9bit"), null, "COMPUTE_FLOW");
impl=_impl;
setEnabled(false);
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java 2011-09-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -124,10 +124,12 @@
* principale est r\xE9duite.
*/
class Piv2dFrameListener extends InternalFrameAdapter {
+ @Override
public void internalFrameActivated(final InternalFrameEvent _e) {
if(window_!=null)
window_.setVisible(true);
}
+ @Override
public void internalFrameDeactivated(final InternalFrameEvent _e) {
if(window_!=null)
window_.setVisible(false);
@@ -139,7 +141,7 @@
* @param _pn Le panneau des calques.
*/
public PivComputeGridDefinitionAction(PivVisuPanel _pn) {
- super(PivResource.getS("D\xE9finition de la grille..."), null, "PIV_GRID");
+ super(PivResource.getS("D\xE9finition de la grille..."), null, "DEFINE_GRID");
pnCalques_=_pn;
controller_=new EditionController();
setCalqueInteraction(_pn.getEditionLayer());
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -34,7 +34,7 @@
* @param _impl L'implementation.
*/
public PivComputeLaunchAction(PivImplementation _impl) {
- super(PivResource.getS("Calcul des vitesses instantan\xE9es"), null, "PIV_COMPUTE");
+ super(PivResource.getS("Calcul des vitesses instantan\xE9es"), null, "COMPUTE_PIV");
impl=_impl;
setEnabled(false);
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeParamAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -25,7 +25,7 @@
PivImplementation impl;
public PivComputeParamAction(PivImplementation _impl) {
- super(PivResource.getS("Param\xE8tres de calcul..."), null, "PIV_PARAM");
+ super(PivResource.getS("Param\xE8tres de calcul..."), null, "DEFINE_PIV_PARAM");
impl=_impl;
setEnabled(false);
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java 2011-09-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -182,7 +182,7 @@
* @param _pn Le panneau des calques.
*/
public PivOrthoGRPAction(PivVisuPanel _pn) {
- super(PivResource.getS("Points de r\xE9f\xE9rence..."), null, "ORTHO_GRP");
+ super(PivResource.getS("Points de r\xE9f\xE9rence..."), null, "CREATE_GRP");
pnCalques_=_pn;
controller_=new EditionController();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java 2011-09-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -30,7 +30,7 @@
CtuluDialog diProgress_;
public PivOrthoLaunchAction(PivImplementation _impl) {
- super(PivResource.getS("Transformer les images"), null, "ORTHO_COMPUTE");
+ super(PivResource.getS("Transformer les images"), null, "COMPUTE_ORTHO");
impl=_impl;
setEnabled(false);
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -29,7 +29,7 @@
* @param _impl L'implementation.
*/
public PivOrthoParamAction(PivImplementation _impl) {
- super(PivResource.getS("Param\xE8tres de transformation..."), null, "ORTHO_PARAM");
+ super(PivResource.getS("Param\xE8tres de transformation..."), null, "DEFINE_ORTHO_PARAM");
impl=_impl;
setEnabled(false);
}
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -33,7 +33,7 @@
* @param _impl L'implementation.
*/
public PivOrthoVerifyGRPAction(PivImplementation _impl) {
- super(PivResource.getS("Verification des points de r\xE9f\xE9rence..."), null, "ORTHO_VERIFY_GRP");
+ super(PivResource.getS("Verification des points de r\xE9f\xE9rence..."), null, "VERIFY_GRP");
impl=_impl;
setEnabled(false);
}
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-30 12:02:24 UTC (rev 6467)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowVelocityAction.java 2011-09-30 12:29:21 UTC (rev 6468)
@@ -26,7 +26,7 @@
* @param _impl L'implementation.
*/
public PivShowVelocityAction(PivImplementation _impl) {
- super(PivResource.getS("Voir les vitesses"), null, "RESULTS_SHOW_VELOCITIES");
+ super(PivResource.getS("Voir les vitesses"), null, "SHOW_VELOCITIES_RESULTS");
impl=_impl;
setEnabled(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
