Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9020] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2015-02-16 11:08:46
|
Revision: 9020
http://sourceforge.net/p/fudaa/svn/9020
Author: bmarchan
Date: 2015-02-16 11:08:44 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Gestion interactive de la constitution des points de grille
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/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/action/PivComputeGridDefinitionAction.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/io/PivExeLauncher.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.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 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -770,7 +770,7 @@
mn.addSeparator(PivResource.getS("Analyse LSPIV"));
mn.add(new PivComputeParamAction(this));
- sm=new BuMenu(PivResource.getS("Grille"),"mnGRP");
+ sm=new BuMenu(PivResource.getS("Points de grille"),"mnGRP");
bt=get2dFrame().getVisuPanel().getComputeGridDefinitionAction().buildMenuItem(EbliComponentFactory.INSTANCE);
bt.setText(PivResource.getS("D\xE9finir..."));
sm.add(bt);
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-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -682,7 +682,7 @@
mdlInstantVelFltResults=new PivVelResultsModel(prj_.getInstantFilteredResults());
}
else {
- mdlInstantResults=null;
+ mdlInstantFltResults=null;
mdlInstantVelFltResults=null;
}
cqInstantFltIso_.setModele(mdlInstantFltResults);
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 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -257,7 +257,10 @@
mdlCntGrid.update();
}
else if("computeGrid".equals(_prop)) {
- cqGrille_.setModele(new ZModelePointEditable(prj_.getComputeGrid()));
+ if (prj_.getComputeGrid()==null)
+ cqGrille_.setModele(new ZModelePointEditable());
+ else
+ cqGrille_.setModele(new ZModelePointEditable(prj_.getComputeGrid()));
}
pnLayers_.getVueCalque().repaint();
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 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -148,7 +148,7 @@
* @param _pn Le panneau des calques.
*/
public PivComputeGridDefinitionAction(PivVisuPanel _pn) {
- super(PivResource.getS("D\xE9finition de la grille..."), null, "DEFINE_GRID");
+ super(PivResource.getS("D\xE9finition des points de grille..."), null, "DEFINE_GRID");
pnCalques_=_pn;
controller_=new EditionController();
setCalqueInteraction(_pn.getEditionLayer());
@@ -170,20 +170,15 @@
public void changeAction() {
if (isSelected())
pnCalques_.setViewMode(PivVisuPanel.MODE_TRANSF_VIEW);
+ pnCalques_.getProject().setComputeCntGrid(null);
- // Modification du contour : On le supprime au pr\xE9alable, et affichage de la palette.
- if (pnCalques_.getProject().getComputeCntGrid()==null ||
+ if (pnCalques_.getProject().getComputeGrid()==null ||
pnCalques_.getCtuluUI().question(
- PivResource.getS("Modification du contour de grille"),
- PivResource.getS("Voulez-vous au pr\xE9alable modifier le contour de grille ?"))) {
- pnCalques_.getProject().setComputeCntGrid(null);
+ PivResource.getS("D\xE9finition des points de grille"),
+ PivResource.getS("Des points de grille existent d\xE9j\xE0.\nVoulez-vous les supprimer avant ajout des nouveaux ?"))) {
+ pnCalques_.getProject().setComputeGrid(null);
+ }
super.changeAction();
- }
- // Pas de modification du contour.
- else {
- setSelected(false);
- showPanelParameters();
- }
}
@@ -234,16 +229,33 @@
*/
public void showPanelParameters() {
final PivCntGrid params=pnCalques_.getProject().getComputeCntGrid();
+ final PivGrid oldGrid=pnCalques_.getProject().getComputeGrid();
PivComputeGridDefinitionPanel pn=new PivComputeGridDefinitionPanel() {
@Override
public void apply() {
retrieveParams(params);
PivGrid grid=PivGrid.computeFromShape(params.getContour(), params.getNbXPoints(), params.getNbYPoints());
- pnCalques_.getProject().setComputeCntGrid(params);
+ grid.merge(oldGrid);
pnCalques_.getProject().setComputeGrid(grid);
+
}
+
+ @Override
+ public boolean cancel() {
+ pnCalques_.getProject().setComputeGrid(oldGrid);
+ pnCalques_.getProject().setComputeCntGrid(null);
+ return super.cancel();
+ }
+
+ @Override
+ public boolean ok() {
+ pnCalques_.getProject().setComputeCntGrid(null);
+ return super.ok();
+ }
+
+
};
pn.setParams(params);
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 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -36,7 +36,7 @@
* @param _impl L'implementation.
*/
public PivImportGridAction(PivImplementation _impl) {
- super(PivResource.getS("Import d'une grille..."), null, "IMPORT_GRID");
+ super(PivResource.getS("Import des points de grille..."), null, "IMPORT_GRID");
impl=_impl;
setEnabled(false);
@@ -55,9 +55,9 @@
boolean keepPreviousGrid=false;
if (impl.getCurrentProject().getComputeGrid()!=null) {
- keepPreviousGrid=impl.question(
- PivResource.getS("Import d'une grille"),
- PivResource.getS("Une grille existe d\xE9j\xE0.\nVoulez vous ajouter les points de la nouvelle grille \xE0 la pr\xE9c\xE9dente ?"));
+ keepPreviousGrid=!impl.question(
+ PivResource.getS("Import des points de grille"),
+ PivResource.getS("Des points de grille existent d\xE9j\xE0.\nVoulez-vous les supprimer avant import des nouveaux ?"));
}
// Selection du fichier
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -449,7 +449,6 @@
if (_ana.containsErrorOrFatalError()) {
_prj.setInstantResults(null);
- _prj.setAverageResults(null);
}
}
@@ -931,7 +930,6 @@
}
finally {
_prj.setInstantResults(res);
- _prj.setAverageResults(null);
}
return true;
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-02-13 14:07:57 UTC (rev 9019)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-02-16 11:08:44 UTC (rev 9020)
@@ -1388,6 +1388,10 @@
isModified=true;
fireProjectStateChanged("instantResults");
+
+ // Les r\xE9sultats instantan\xE9s ont chang\xE9, les autres r\xE9sultats sont r\xE9initialis\xE9s
+ setInstantFilteredResults(null);
+ setAverageResults(null);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
