Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9023] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2015-02-16 13:18:17
|
Revision: 9023
http://sourceforge.net/p/fudaa/svn/9023
Author: bmarchan
Date: 2015-02-16 13:18:14 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
ReChgt CtuluAnalyse par CtuluLog
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.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/PivComputeLaunchAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java 2015-02-16 13:13:02 UTC (rev 9022)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java 2015-02-16 13:18:14 UTC (rev 9023)
@@ -9,15 +9,15 @@
import java.awt.event.ActionEvent;
-import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.piv.PivExePanel;
+import org.fudaa.fudaa.piv.PivFilterInstantResultsPanel;
import org.fudaa.fudaa.piv.PivImplementation;
import org.fudaa.fudaa.piv.PivProgressionPanel;
import org.fudaa.fudaa.piv.PivResource;
-import org.fudaa.fudaa.piv.PivFilterInstantResultsPanel;
import org.fudaa.fudaa.piv.PivVisuPanel;
import org.fudaa.fudaa.piv.io.PivExeLauncher;
import org.fudaa.fudaa.piv.metier.PivComputeParameters;
@@ -80,18 +80,18 @@
public void act() {
try {
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
// Filtrage
PivExeLauncher.instance().launchFilterInstantResultats(ana, impl.getCurrentProject(),this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
// Moyenne
PivExeLauncher.instance().launchAverageResults(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
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 2015-02-16 13:13:02 UTC (rev 9022)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java 2015-02-16 13:18:14 UTC (rev 9023)
@@ -11,7 +11,7 @@
import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.ebli.commun.EbliActionSimple;
@@ -72,16 +72,16 @@
@Override
public void act() {
try {
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
ana.setDesc(this.getName());
PivExeLauncher.instance().launchBathyCompute(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
PivExeLauncher.instance().launchQCompute(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
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 2015-02-16 13:13:02 UTC (rev 9022)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java 2015-02-16 13:18:14 UTC (rev 9023)
@@ -8,17 +8,15 @@
package org.fudaa.fudaa.piv.action;
import java.awt.event.ActionEvent;
-import java.io.File;
import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.piv.PivExePanel;
import org.fudaa.fudaa.piv.PivImplementation;
-import org.fudaa.fudaa.piv.PivPreferences;
import org.fudaa.fudaa.piv.PivProgressionPanel;
import org.fudaa.fudaa.piv.PivResource;
import org.fudaa.fudaa.piv.PivVisuPanel;
@@ -68,16 +66,16 @@
public void act() {
try {
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
ana.setDesc(this.getName());
PivExeLauncher.instance().launchPiv(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
PivExeLauncher.instance().launchInstantResults(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
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-16 13:13:02 UTC (rev 9022)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-02-16 13:18:14 UTC (rev 9023)
@@ -9,11 +9,9 @@
import javax.imageio.ImageIO;
-import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOResult;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.fudaa.piv.PivPreferences;
import org.fudaa.fudaa.piv.PivResource;
@@ -351,7 +349,7 @@
* @param _task La tache en cours d'execution.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchPiv(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchPiv(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjImgOut=new File(prjRoot,IMG_TRANSF_DIR);
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -448,7 +446,7 @@
new File(prjImgOut, "image1_transf.pgm").delete();
new File(prjImgOut, "image2_transf.pgm").delete();
- if (_ana.containsErrorOrFatalError()) {
+ if (_ana.containsErrorOrSevereError()) {
_prj.setInstantResults(null);
}
}
@@ -530,7 +528,7 @@
* @param _task La tache en cours d'execution.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchFilterInstantResultats(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchFilterInstantResultats(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
File prjVelFlt=new File(prjRoot,VEL_FILTER_DIR);
@@ -605,7 +603,7 @@
* @return true : Tout s'est bien d\xE9roul\xE9.
* @see #launchFilterVelocities
*/
- public boolean launchAverageResults(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchAverageResults(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -694,7 +692,7 @@
* @param _task La tache en cours d'execution.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchBathyCompute(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchBathyCompute(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -755,7 +753,7 @@
* @param _task La tache en cours d'execution.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchQCompute(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchQCompute(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -838,7 +836,7 @@
* @return true : Tout s'est bien d\xE9roul\xE9.
* @see #launchPiv
*/
- public boolean launchInstantResults(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchInstantResults(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjVelReal=new File(prjRoot, VEL_REAL_DIR);
File prjVelScal=new File(prjRoot, VEL_SCAL_DIR);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
