branch develop updated (cbd53e3f -> 25065268)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from cbd53e3f Use target instead of task in maven-antrun-plugin new db2c1c6a :memo: Add Calibration doc, cf #11014 new 25065268 :fire: remove useless code The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 250652680d82097247ac321da3ab4c3c6c11f636 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 4 11:31:29 2021 +0100 :fire: remove useless code commit db2c1c6a03d0322b4f862017434716ee8d82c8f5 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 4 11:30:52 2021 +0100 :memo: Add Calibration doc, cf #11014 Summary of changes: .../actions/ImportCalibrationActionSupport.java | 5 --- src/site/rst/importData.rst | 47 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit db2c1c6a03d0322b4f862017434716ee8d82c8f5 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 4 11:30:52 2021 +0100 :memo: Add Calibration doc, cf #11014 --- src/site/rst/importData.rst | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index aa4234cc..33f85a3e 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -713,6 +713,53 @@ Exemple MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...] 2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1;1 +Calibration +~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + topiaId;accuracyEstimate;aquisitionMethod;comments;date;processingMethod;report;acousticInstrument + +Format des colonnes +------------------- + ++------------------------+------------------------------------------+ +| Colonne | Type | ++========================+==========================================+ +| topiaId |(colonne ignorée) //A | ++------------------------+------------------------------------------+ +| accuracyEstimate |text //B | ++------------------------+------------------------------------------+ +| aquisitionMethod |text //C | ++------------------------+------------------------------------------+ +| comments |text //D | ++------------------------+------------------------------------------+ +| date |(date) //E | ++------------------------+------------------------------------------+ +| processingMethod |text //F | ++------------------------+------------------------------------------+ +| report |text //G | ++------------------------+------------------------------------------+ +| acousticinstrument |FK(AcousticInstrument#id) //H | ++------------------------+------------------------------------------+ + +Notes importantes +----------------- + +- Pour que la calibration soit prise en compte la date doit être comprise entre les dates de début et de fin de voyage. + +Exemple +------- + +:: + + accuracyEstimate;aquisitionMethod;comments;date;processingMethod;report;acousticInstrument + ;0.26;ER60;Mission PELGAS2015 - 30 avril 2015;2015-04-30 07:00:00;ER60;http://madida/madida/documents/etalonnage/TL_EK60_etalonnage_avril2015__v1.h... + + Résultats voyage ================ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 250652680d82097247ac321da3ab4c3c6c11f636 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 4 11:31:29 2021 +0100 :fire: remove useless code --- .../service/importdata/actions/ImportCalibrationActionSupport.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportCalibrationActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportCalibrationActionSupport.java index 16eb1f02..ec0efcb5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportCalibrationActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportCalibrationActionSupport.java @@ -23,8 +23,6 @@ package fr.ifremer.echobase.services.service.importdata.actions; import fr.ifremer.echobase.services.service.importdata.configurations.ImportAcousticsConfiguration; import fr.ifremer.echobase.services.service.importdata.contexts.ImportDataContextSupport; import fr.ifremer.echobase.services.service.importdata.csv.CalibrationImportRow; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 05/12/19. @@ -34,9 +32,6 @@ import org.apache.commons.logging.LogFactory; */ public abstract class ImportCalibrationActionSupport <M extends ImportAcousticsConfiguration, C extends ImportDataContextSupport<M>, E extends CalibrationImportRow> extends ImportDataActionSupport<M, C, E> { - /** Logger. */ - private static final Log log = LogFactory.getLog(VoyageAcousticsCalibrationImportAction.class); - public ImportCalibrationActionSupport(C importDataContext) { super(importDataContext, importDataContext.getConfiguration().getCalibrationsFile()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm