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 ce7349df6a8f0eeb06cc460d25b42ea1d8ce8299 Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 5 11:00:25 2019 +0100 fixes #9739 : Importe les données "ChannelID", "Bandwidth", "Frequency", "TransceiverPower" et "TransmitPulseLength" --- .../actions/ImportAcousticsActionSupport.java | 11 ++++++++- .../importdata/csv/AcousticImportExportModel.java | 8 +++---- .../service/importdata/csv/AcousticImportRow.java | 26 +++++++++++++++++++++- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java index cb89458d..c54296d6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java @@ -729,7 +729,6 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf dataProcessing.setSoundSpeedCalculations(soundSpeedCalculations); // fill from csv file - float transceiverAcquisitionAbsorption = row.getTransceiverAcquisitionAbsorption(); float transducerAcquisitionBeamAngleAthwartship = row.getTransducerAcquisitionBeamAngleAthwartship(); float transducerAcquisitionBeamAngleAlongship = row.getTransducerAcquisitionBeamAngleAlongship(); @@ -738,6 +737,11 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf float transceiverAcquisitionSacorrection = row.getTransceiverAcquisitionSacorrection(); int eIThresholdLow = row.geteIThresholdLow(); int eIThresholdHigh = row.geteIThresholdHigh(); + float pulseLength = row.getTransceiverAcquisitionPulseLength(); + float transceiverPower = row.getTransceiverAcquisitionPower(); + String channelId = row.getAcousticInstrument().getId(); + float bandwidth = row.getBandwidth(); + float frequency = row.getFrequency(); dataProcessing.seteIThresholdLow(eIThresholdLow); dataProcessing.seteIThresholdHigh(eIThresholdHigh); @@ -747,6 +751,11 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf dataProcessing.setTransducerProcessingPsi(transducerAcquisitionPsi); dataProcessing.setTransducerProcessingBeamAngleAthwartship(transducerAcquisitionBeamAngleAthwartship); dataProcessing.setTransducerProcessingBeamAngleAlongship(transducerAcquisitionBeamAngleAlongship); + dataProcessing.setTransmitPulseLength(pulseLength); + dataProcessing.setTransceiverPower(transceiverPower); + dataProcessing.setChannelId(channelId); + dataProcessing.setBandWith(bandwidth); + dataProcessing.setFrequency(frequency); return dataProcessing; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportExportModel.java index 77f8fe8a..18200e28 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportExportModel.java @@ -54,7 +54,7 @@ public class AcousticImportExportModel extends EchoBaseImportExportModelSupport< model.newIgnoredColumn("MOVIES_EILayer\\sndset\\channelName");//F model.newIgnoredColumn("MOVIES_EILayer\\sndset\\dataType");//G model.newIgnoredColumn("MOVIES_EILayer\\sndset\\beamType");//H - model.newIgnoredColumn("MOVIES_EILayer\\sndset\\acousticFrequency");//I + model.newMandatoryColumn("MOVIES_EILayer\\sndset\\acousticFrequency", AcousticImportRow.PROPERTY_FREQUENCY, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//I model.newIgnoredColumn("MOVIES_EILayer\\sndset\\startSample");//J model.newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle");//K model.newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle");//L @@ -74,7 +74,7 @@ public class AcousticImportExportModel extends EchoBaseImportExportModelSupport< model.newIgnoredColumn("MOVIES_EILayer\\sndset\\AthwartTXRXWeightId");//Z model.newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId");//AA model.newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId");//AB - model.newIgnoredColumn("MOVIES_EILayer\\sndset\\bandWidth");//AC + model.newMandatoryColumn("MOVIES_EILayer\\sndset\\bandWidth", AcousticImportRow.PROPERTY_BANDWIDTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AC model.newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgminrange");//AD model.newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgmaxrange");//AE model.newMandatoryColumn("MOVIES_EILayer\\sndset\\pulseduration", AcousticImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AF @@ -142,7 +142,7 @@ public class AcousticImportExportModel extends EchoBaseImportExportModelSupport< // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\channelName");//F // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\dataType");//G // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\beamType");//H -// model.newIgnoredColumn("MOVIES_EILayer\\sndset\\acousticFrequency");//I + model.newColumnForExport("MOVIES_EILayer\\sndset\\acousticFrequency", AcousticImportRow.PROPERTY_FREQUENCY, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//I // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\startSample");//J // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle");//K // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle");//L @@ -162,7 +162,7 @@ public class AcousticImportExportModel extends EchoBaseImportExportModelSupport< // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\AthwartTXRXWeightId");//Z // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId");//AA // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId");//AB -// model.newIgnoredColumn("MOVIES_EILayer\\sndset\\bandWidth");//AC + model.newColumnForExport("MOVIES_EILayer\\sndset\\bandWidth", AcousticImportRow.PROPERTY_BANDWIDTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AC // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgminrange");//AD // model.newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgmaxrange");//AE model.newColumnForExport("MOVIES_EILayer\\sndset\\pulseduration", AcousticImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AF diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java index 5377f1bb..b36e37f7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java @@ -34,7 +34,7 @@ import java.util.Date; import java.util.Optional; /** - * Bean of a row for {@link MooringAcousticImportExportModel} import. + * Bean of a row for {@link AcousticImportExportModel} import. * * @author Julien Ruchaud - ruchaud@codelutin.com * @since 4.0 @@ -99,6 +99,10 @@ public class AcousticImportRow { public static final String PROPERTY_LABEL = "label"; + public static final String PROPERTY_BANDWIDTH = "bandwidth"; + + public static final String PROPERTY_FREQUENCY = "frequency"; + protected String eiLayer; protected String esduCellDataDepth; @@ -145,6 +149,10 @@ public class AcousticImportRow { protected float transducerAcquisitionPsi; + protected float bandwidth; + + protected float frequency; + protected int eIThresholdLow; protected int eIThresholdHigh; @@ -491,4 +499,20 @@ public class AcousticImportRow { public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } + + public float getBandwidth() { + return bandwidth; + } + + public void setBandwidth(float bandwidth) { + this.bandwidth = bandwidth; + } + + public float getFrequency() { + return frequency; + } + + public void setFrequency(float frequency) { + this.frequency = frequency; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.