Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9021] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2015-02-16 11:45:48
|
Revision: 9021
http://sourceforge.net/p/fudaa/svn/9021
Author: bmarchan
Date: 2015-02-16 11:45:46 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
Chgt CtuluAnalyse par CtuluLog
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.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/PivOrthoVerifyGRPAction.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/io/PivGRPReader.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java 2015-02-16 11:08:44 UTC (rev 9020)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java 2015-02-16 11:45:46 UTC (rev 9021)
@@ -1,10 +1,11 @@
package org.fudaa.fudaa.piv;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import java.awt.Dimension;
-import java.awt.event.ActionListener;
-import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.fudaa.piv.io.PivExeLauncher;
import org.fudaa.fudaa.piv.metier.PivOrthoParameters;
import org.fudaa.fudaa.piv.metier.PivOrthoPoint;
@@ -189,15 +190,15 @@
impl_.getCurrentProject().setOrthoParameters(params);
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
ana.setDesc(PivResource.getS("Pr\xE9visualisation des images transform\xE9es"));
PivExeLauncher.instance().launchOrthoPlan(ana, impl_.getCurrentProject(),null);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl_.error(ana.getResume());
return;
}
PivExeLauncher.instance().launchTransfImg(ana, impl_.getCurrentProject(),true,null);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl_.error(ana.getResume());
return;
}
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 2015-02-16 11:08:44 UTC (rev 9020)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java 2015-02-16 11:45:46 UTC (rev 9021)
@@ -8,14 +8,13 @@
package org.fudaa.fudaa.piv.action;
import java.awt.event.ActionEvent;
-import java.io.File;
-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.io.PivExeLauncher;
@@ -59,15 +58,15 @@
public void act() {
try {
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
ana.setDesc(getName());
PivExeLauncher.instance().launchOrthoPlan(ana, impl.getCurrentProject(), this);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
PivExeLauncher.instance().launchTransfImg(ana, impl.getCurrentProject(), false, 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/PivOrthoVerifyGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java 2015-02-16 11:08:44 UTC (rev 9020)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java 2015-02-16 11:45:46 UTC (rev 9021)
@@ -8,14 +8,13 @@
package org.fudaa.fudaa.piv.action;
import java.awt.event.ActionEvent;
-import java.io.File;
-import org.fudaa.ctulu.CtuluAnalyze;
+
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.fudaa.piv.PivOrthoVerifyGRPPanel;
import org.fudaa.fudaa.piv.PivExePanel;
import org.fudaa.fudaa.piv.PivImplementation;
-import org.fudaa.fudaa.piv.PivPreferences;
+import org.fudaa.fudaa.piv.PivOrthoVerifyGRPPanel;
import org.fudaa.fudaa.piv.PivResource;
import org.fudaa.fudaa.piv.PivVisuPanel;
import org.fudaa.fudaa.piv.io.PivExeLauncher;
@@ -59,15 +58,15 @@
}
}
- CtuluAnalyze ana=new CtuluAnalyze();
+ CtuluLog ana=new CtuluLog();
ana.setDesc(PivResource.getS("V\xE9rification des points d'orthorectification"));
PivExeLauncher.instance().launchOrthoPlan(ana, impl.getCurrentProject(),null);
- if (ana.containsErrorOrFatalError()) {
+ if (ana.containsErrorOrSevereError()) {
impl.error(ana.getResume());
return;
}
PivExeLauncher.instance().launchVerifOrtho(ana, impl.getCurrentProject(),null);
- 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 11:08:44 UTC (rev 9020)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-02-16 11:45:46 UTC (rev 9021)
@@ -12,6 +12,7 @@
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;
@@ -185,7 +186,7 @@
* @param _task La tache en cours d'execution.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchOrthoPlan(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchOrthoPlan(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -237,7 +238,7 @@
* r\xE9el.
* @return true : Tout s'est bien d\xE9roul\xE9.
*/
- public boolean launchTransfImg(CtuluAnalyze _ana, PivProject _prj, boolean _apercu, CtuluTaskOperationGUI _task) {
+ public boolean launchTransfImg(CtuluLog _ana, PivProject _prj, boolean _apercu, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjImgInp=new File(prjRoot,IMG_PGM_DIR);
File prjImgOut=new File(prjRoot,IMG_TRANSF_DIR);
@@ -466,7 +467,7 @@
* @return true : Tout s'est bien d\xE9roul\xE9.
* @see #launchOrthoPlan
*/
- public boolean launchVerifOrtho(CtuluAnalyze _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
+ public boolean launchVerifOrtho(CtuluLog _ana, PivProject _prj, CtuluTaskOperationGUI _task) {
File prjRoot=_prj.getRoot();
File prjOutputs=new File(prjRoot,OUTPUT_DIR);
@@ -491,7 +492,7 @@
// R\xE9cup\xE9ration des donn\xE9es du projet.
File grpFile = new File(prjOutputs, "GRP_test_ortho.dat");
- CtuluIOResult<PivOrthoPoint[]> ret = new PivGRPReader().read(grpFile, null);
+ CtuluIOResult<PivOrthoPoint[]> ret = new PivGRPReader(true).read(grpFile, null);
PivOrthoPoint[] computePts=ret.getSource();
// On conserve les points d'origine, on ne modifie que les points recalcul\xE9s
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGRPReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGRPReader.java 2015-02-16 11:08:44 UTC (rev 9020)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGRPReader.java 2015-02-16 11:45:46 UTC (rev 9021)
@@ -35,6 +35,14 @@
*/
public PivGRPReader() {
}
+
+ /**
+ * Le constructeur, avec le param\xE8etre d\xE9finissant si le format est \xE9tendu ou non.
+ * @param _extendFormat True : Le format est etendu.
+ */
+ public PivGRPReader(boolean _extendFormat) {
+ bextFormat_=_extendFormat;
+ }
/**
* Definit si le fichier est au format etendu.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
