branch develop updated (c7d4927 -> 7478779)
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 c7d4927 ref #8173, create the first basic export for the cruise new 7478779 ref #8173, continue export models The 1 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 74787799cbd3d8d5e94e2a79c56b9eb05aab7681 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Sep 30 17:01:24 2016 +0200 ref #8173, continue export models Summary of changes: .../atlantos/model/CalibrationExportModel.java | 83 +++++++++++++ .../service/atlantos/model/CruiseExportModel.java | 2 +- .../atlantos/model/DataAcquisitionExportModel.java | 74 +++++++++++ .../atlantos/model/InstrumentExportModel.java | 89 ++++++++++++++ .../service/atlantos/row/CalibrationExportRow.java | 84 +++++++++++++ .../service/atlantos/row/CruiseExportRow.java | 14 +-- .../atlantos/row/DataAcquisitionExportRow.java | 81 +++++++++++++ .../service/atlantos/row/InstrumentExportRow.java | 135 +++++++++++++++++++++ 8 files changed, 552 insertions(+), 10 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CalibrationExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataAcquisitionExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/InstrumentExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CalibrationExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataAcquisitionExportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java -- 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 74787799cbd3d8d5e94e2a79c56b9eb05aab7681 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Sep 30 17:01:24 2016 +0200 ref #8173, continue export models --- .../atlantos/model/CalibrationExportModel.java | 83 +++++++++++++ .../service/atlantos/model/CruiseExportModel.java | 2 +- .../atlantos/model/DataAcquisitionExportModel.java | 74 +++++++++++ .../atlantos/model/InstrumentExportModel.java | 89 ++++++++++++++ .../service/atlantos/row/CalibrationExportRow.java | 84 +++++++++++++ .../service/atlantos/row/CruiseExportRow.java | 14 +-- .../atlantos/row/DataAcquisitionExportRow.java | 81 +++++++++++++ .../service/atlantos/row/InstrumentExportRow.java | 135 +++++++++++++++++++++ 8 files changed, 552 insertions(+), 10 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CalibrationExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CalibrationExportModel.java new file mode 100644 index 0000000..fe4f583 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CalibrationExportModel.java @@ -0,0 +1,83 @@ +package fr.ifremer.echobase.services.service.atlantos.model; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AcousticInstrument; +import fr.ifremer.echobase.entities.references.Calibration; +import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; +import fr.ifremer.echobase.services.service.atlantos.row.CalibrationExportRow; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.nuiton.csv.ext.AbstractExportModel; + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class CalibrationExportModel extends AbstractExportModel<CalibrationExportRow> { + + public CalibrationExportModel(char separator) { + super(separator); + newColumnForExport("Calibration", CalibrationExportRow.PROPERTY_ENTITY); + newColumnForExport("Header", CalibrationExportRow.PROPERTY_HEADER); + newColumnForExport("CalibrationDate", CalibrationExportRow.PROPERTY_DATE, EchoBaseCsvUtil.ISO8611_DATE_FORMATTER); + newColumnForExport("CalibrationAcquisitionMethod", CalibrationExportRow.PROPERTY_ACQUISITION_METHOD); + newColumnForExport("CalibrationProcessingMethod", CalibrationExportRow.PROPERTY_PROCESSING_METHOD); + newColumnForExport("CalibrationAccuracyEstimate", CalibrationExportRow.PROPERTY_ACCURACY_ESTIMATE); + newColumnForExport("CalibrationReport", CalibrationExportRow.PROPERTY_REPORT); + newColumnForExport("CalibrationComments", CalibrationExportRow.PROPERTY_COMMENTS); + newColumnForExport("CalibrationID", CalibrationExportRow.PROPERTY_ID); + } + + public List<CalibrationExportRow> prepareRows(Voyage voyage) { + List<CalibrationExportRow> rows = new ArrayList<CalibrationExportRow>(); + + Collection<Transit> transits = voyage.getTransit(); + for (Transit transit : transits) { + + Collection<Transect> transects = transit.getTransect(); + for (Transect transect : transects) { + + Collection<DataAcquisition> dataAcquisitions = transect.getDataAcquisition(); + for (DataAcquisition dataAcquisition : dataAcquisitions) { + + AcousticInstrument acousticInstrument = dataAcquisition.getAcousticInstrument(); + Collection<Calibration> calibrations = acousticInstrument.getCalibration(); + for (Calibration calibration : calibrations) { + + CalibrationExportRow row = new CalibrationExportRow(); + row.setCalibration(calibration); + rows.add(row); + } + } + } + } + + return rows; + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CruiseExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CruiseExportModel.java index a5a9e38..84d62ca 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CruiseExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CruiseExportModel.java @@ -36,7 +36,7 @@ public class CruiseExportModel extends AbstractExportModel<CruiseExportRow> { public CruiseExportModel(char separator) { super(separator); - newColumnForExport("Cruise", CruiseExportRow.PROPERTY_CRUISE); + newColumnForExport("Cruise", CruiseExportRow.PROPERTY_ENTITY); newColumnForExport("Header", CruiseExportRow.PROPERTY_HEADER); newColumnForExport("CruiseSurvey", CruiseExportRow.PROPERTY_SURVEY); newColumnForExport("CruiseCountry", CruiseExportRow.PROPERTY_COUNTRY); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataAcquisitionExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataAcquisitionExportModel.java new file mode 100644 index 0000000..5a87e9b --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataAcquisitionExportModel.java @@ -0,0 +1,74 @@ +package fr.ifremer.echobase.services.service.atlantos.model; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.service.atlantos.row.DataAcquisitionExportRow; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.nuiton.csv.ext.AbstractExportModel; + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class DataAcquisitionExportModel extends AbstractExportModel<DataAcquisitionExportRow> { + + public DataAcquisitionExportModel(char separator) { + super(separator); + newColumnForExport("DataAcquisition", DataAcquisitionExportRow.PROPERTY_ENTITY); + newColumnForExport("Header", DataAcquisitionExportRow.PROPERTY_HEADER); + newColumnForExport("DataAcquisitionSoftwareName", DataAcquisitionExportRow.PROPERTY_SOFTWARE_NAME); + newColumnForExport("DataAcquisitionSoftwareVersion", DataAcquisitionExportRow.PROPERTY_SOFTWARE_VERSION); + newColumnForExport("DataAcquisitionStoredDataFormat", DataAcquisitionExportRow.PROPERTY_STORED_DATA_FORMAT); + newColumnForExport("DataAcquisitionPingDutyCycle", DataAcquisitionExportRow.PROPERTY_PING_DUTY_CYCLE); + newColumnForExport("DataAcquisitionComments", DataAcquisitionExportRow.PROPERTY_COMMENTS); + newColumnForExport("DataAcquisitionID", DataAcquisitionExportRow.PROPERTY_ID); + } + + public List<DataAcquisitionExportRow> prepareRows(Voyage voyage) { + List<DataAcquisitionExportRow> rows = new ArrayList<DataAcquisitionExportRow>(); + + Collection<Transit> transits = voyage.getTransit(); + for (Transit transit : transits) { + + Collection<Transect> transects = transit.getTransect(); + for (Transect transect : transects) { + + Collection<DataAcquisition> dataAcquisitions = transect.getDataAcquisition(); + for (DataAcquisition dataAcquisition : dataAcquisitions) { + + DataAcquisitionExportRow row = new DataAcquisitionExportRow(); + row.setDataAcquisition(dataAcquisition); + rows.add(row); + } + } + } + + return rows; + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/InstrumentExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/InstrumentExportModel.java new file mode 100644 index 0000000..79fedc4 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/InstrumentExportModel.java @@ -0,0 +1,89 @@ +package fr.ifremer.echobase.services.service.atlantos.model; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AcousticInstrument; +import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; +import fr.ifremer.echobase.services.service.atlantos.row.InstrumentExportRow; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.nuiton.csv.ext.AbstractExportModel; + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class InstrumentExportModel extends AbstractExportModel<InstrumentExportRow> { + + public InstrumentExportModel(char separator) { + super(separator); + newColumnForExport("Instrument", InstrumentExportRow.PROPERTY_ENTITY); + newColumnForExport("Header", InstrumentExportRow.PROPERTY_HEADER); + newColumnForExport("InstrumentFrequency", InstrumentExportRow.PROPERTY_FREQUENCY, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransducerLocation", InstrumentExportRow.PROPERTY_TRANSDUCER_LOCATION); + newColumnForExport("InstrumentTransducerManufacturer", InstrumentExportRow.PROPERTY_TRANSDUCER_MANUFACTURER); + newColumnForExport("InstrumentTransducerModel", InstrumentExportRow.PROPERTY_TRANSDUCER_MODEL); + newColumnForExport("InstrumentTransducerSerial", InstrumentExportRow.PROPERTY_TRANSDUCER_SERIAL); + newColumnForExport("InstrumentTransducerBeamType", InstrumentExportRow.PROPERTY_TRANSDUCER_BEAM_TYPE); + newColumnForExport("InstrumentTransducerDepth", InstrumentExportRow.PROPERTY_TRANSDUCER_DEPTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransducerOrientation", InstrumentExportRow.PROPERTY_TRANSDUCER_ORIENTATION, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransducerPSI", InstrumentExportRow.PROPERTY_TRANSDUCER_PSI, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransducerBeamAngleMajor", InstrumentExportRow.PROPERTY_TRANSDUCER_BEAM_ANGLE_MAJOR, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransducerBeamAngleMinor", InstrumentExportRow.PROPERTY_TRANSDUCER_BEAM_ANGLE_MINOR, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("InstrumentTransceiverManufacturer", InstrumentExportRow.PROPERTY_TRANSCEIVER_MANUFACTURER); + newColumnForExport("InstrumentTransceiverModel", InstrumentExportRow.PROPERTY_TRANSCEIVER_MODEL); + newColumnForExport("InstrumentTransceiverSerial", InstrumentExportRow.PROPERTY_TRANSDUCER_SERIAL); + newColumnForExport("InstrumentTransceiverFirmware", InstrumentExportRow.PROPERTY_TRANSCEIVER_FIRMWARE); + newColumnForExport("InstrumentComments", InstrumentExportRow.PROPERTY_COMMENTS); + newColumnForExport("InstrumentID", InstrumentExportRow.PROPERTY_ID); + } + + public List<InstrumentExportRow> prepareRows(Voyage voyage) { + List<InstrumentExportRow> rows = new ArrayList<InstrumentExportRow>(); + + Collection<Transit> transits = voyage.getTransit(); + for (Transit transit : transits) { + + Collection<Transect> transects = transit.getTransect(); + for (Transect transect : transects) { + + Collection<DataAcquisition> dataAcquisitions = transect.getDataAcquisition(); + for (DataAcquisition dataAcquisition : dataAcquisitions) { + + AcousticInstrument instrument = dataAcquisition.getAcousticInstrument(); + + InstrumentExportRow row = new InstrumentExportRow(); + row.setInstrument(instrument); + rows.add(row); + } + } + } + + return rows; + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CalibrationExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CalibrationExportRow.java new file mode 100644 index 0000000..ac8db92 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CalibrationExportRow.java @@ -0,0 +1,84 @@ +package fr.ifremer.echobase.services.service.atlantos.row; + +import fr.ifremer.echobase.entities.references.Calibration; +import java.util.Date; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class CalibrationExportRow { + + public static final String PROPERTY_ENTITY = "entity"; + public static final String PROPERTY_HEADER = "header"; + public static final String PROPERTY_DATE = "date"; + public static final String PROPERTY_ACQUISITION_METHOD = "acquisitionMethod"; + public static final String PROPERTY_PROCESSING_METHOD = "processingMethod"; + public static final String PROPERTY_ACCURACY_ESTIMATE = "accuracyEstimate"; + public static final String PROPERTY_REPORT = "report"; + public static final String PROPERTY_COMMENTS = "comments"; + public static final String PROPERTY_ID = "id"; + + protected Calibration calibration; + + public void setCalibration(Calibration calibration) { + this.calibration = calibration; + } + + public String getEntity() { + return "Calibration"; + } + + public String getHeader() { + return "Record"; + } + + public Date getDate() { + return this.calibration.getDate(); + } + + public String getAcquisitionMethod() { + return this.calibration.getAquisitionMethod(); + } + + public String getProcessingMethod() { + return this.calibration.getProcessingMethod(); + } + + public String getAccuracyEstimate() { + return this.calibration.getAccuracyEstimate(); + } + + public String getReport() { + return this.calibration.getReport(); + } + + public String getComments() { + return this.calibration.getComments(); + } + + public String getId() { + return this.calibration.getTopiaId(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CruiseExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CruiseExportRow.java index b4cd84b..e83368c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CruiseExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CruiseExportRow.java @@ -30,7 +30,7 @@ import java.util.Date; */ public class CruiseExportRow { - public static final String PROPERTY_CRUISE = "cruise"; + public static final String PROPERTY_ENTITY = "entity"; public static final String PROPERTY_HEADER = "header"; public static final String PROPERTY_SURVEY = "survey"; public static final String PROPERTY_COUNTRY = "country"; @@ -42,15 +42,11 @@ public class CruiseExportRow { protected Voyage voyage; - public Voyage getVoyage() { - return voyage; - } - public void setVoyage(Voyage voyage) { this.voyage = voyage; } - public String getCruise() { + public String getEntity() { return "Cruise"; } @@ -59,7 +55,7 @@ public class CruiseExportRow { } public String getSurvey() { - return ""; + return "NA"; } public String getCountry() { @@ -67,11 +63,11 @@ public class CruiseExportRow { } public String getOrganisation() { - return ""; + return "NA"; } public String getPlateform() { - return ""; + return "NA"; } public Date getStartDate() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataAcquisitionExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataAcquisitionExportRow.java new file mode 100644 index 0000000..8ec99ce --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataAcquisitionExportRow.java @@ -0,0 +1,81 @@ +package fr.ifremer.echobase.services.service.atlantos.row; + +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.Voyage; +import java.util.Date; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class DataAcquisitionExportRow { + + public static final String PROPERTY_ENTITY = "entity"; + public static final String PROPERTY_HEADER = "header"; + public static final String PROPERTY_SOFTWARE_NAME = "softwareName"; + public static final String PROPERTY_SOFTWARE_VERSION = "softwareVersion"; + public static final String PROPERTY_STORED_DATA_FORMAT = "storedDataFormat"; + public static final String PROPERTY_PING_DUTY_CYCLE = "pingDutyCycle"; + public static final String PROPERTY_COMMENTS = "comments"; + public static final String PROPERTY_ID = "id"; + + protected DataAcquisition dataAcquisition; + + public void setDataAcquisition(DataAcquisition dataAcquisition) { + this.dataAcquisition = dataAcquisition; + } + + public String getEntity() { + return "DataAcquisition"; + } + + public String getHeader() { + return "Record"; + } + + public String getSoftwareName() { + return this.dataAcquisition.getSoftwareName(); + } + + public String getSoftwareVersion() { + return this.dataAcquisition.getAcquisitionSoftwareVersion(); + } + + public String getStoredDataFormat() { + return this.dataAcquisition.getStoredDataFormat(); + } + + public String getPingDutyCycle() { + return this.dataAcquisition.getPingDutyCycle(); + } + + public String getComments() { + return this.dataAcquisition.getComments(); + } + + public String getId() { + return this.dataAcquisition.getTopiaId(); + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java new file mode 100644 index 0000000..8764212 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java @@ -0,0 +1,135 @@ +package fr.ifremer.echobase.services.service.atlantos.row; + +import fr.ifremer.echobase.entities.references.AcousticInstrument; + +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +/** + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4 + */ +public class InstrumentExportRow { + + public static final String PROPERTY_ENTITY = "entity"; + public static final String PROPERTY_HEADER = "header"; + public static final String PROPERTY_FREQUENCY = "frequency"; + public static final String PROPERTY_TRANSDUCER_LOCATION = "transducerLocation"; + public static final String PROPERTY_TRANSDUCER_MANUFACTURER = "transducerManufacturer"; + public static final String PROPERTY_TRANSDUCER_MODEL = "transducerModel"; + public static final String PROPERTY_TRANSDUCER_SERIAL = "transducerSerial"; + public static final String PROPERTY_TRANSDUCER_BEAM_TYPE = "transducerBeamType"; + public static final String PROPERTY_TRANSDUCER_DEPTH = "transducerDepth"; + public static final String PROPERTY_TRANSDUCER_ORIENTATION = "transducerOrientation"; + public static final String PROPERTY_TRANSDUCER_PSI = "transducerPSI"; + public static final String PROPERTY_TRANSDUCER_BEAM_ANGLE_MAJOR = "transducerBeamAngleMajor"; + public static final String PROPERTY_TRANSDUCER_BEAM_ANGLE_MINOR = "transducerBeamAngleMinor"; + public static final String PROPERTY_TRANSCEIVER_MANUFACTURER = "transceiverManufacturer"; + public static final String PROPERTY_TRANSCEIVER_MODEL = "transceiverModel"; + public static final String PROPERTY_TRANSCEIVER_SERIAL = "transceiverSerial"; + public static final String PROPERTY_TRANSCEIVER_FIRMWARE = "transceiverFirmware"; + public static final String PROPERTY_COMMENTS = "comments"; + public static final String PROPERTY_ID = "id"; + + protected AcousticInstrument instrument; + + public void setInstrument(AcousticInstrument instrument) { + this.instrument = instrument; + } + + public String getEntity() { + return "Instrument"; + } + + public String getHeader() { + return "Record"; + } + + public float getFrequency() { + return this.instrument.getTransducerFrequency(); + } + + public String getTransducerLocation() { + return this.instrument.getTransducerLocation(); + } + + public String getTransducerManufacturer() { + return this.instrument.getTransducerBeamManufactuer(); + } + + public String getTransducerModel() { + return this.instrument.getTransducerModel(); + } + + public String getTransducerSerial() { + return this.instrument.getTransducerSerial(); + } + + public String getTransducerBeamType() { + return this.instrument.getTransducerBeams(); + } + + public float getTransducerDepth() { + return this.instrument.getTransducerDepth(); + } + + public float getTransducerOrientation() { + return this.instrument.getTransducerAzimuth(); + } + + public float getTransducerPSI() { + return this.instrument.getTransducerPsi(); + } + + public float getTransducerBeamAngleMajor() { + return this.instrument.getTransducerBeamAngleMajor(); + } + + public float getTransducerBeamAngleMinor() { + return this.instrument.getTransducerBeamAngleMinor(); + } + + public String getTransceiverManufacturer() { + return this.instrument.getTransceiverManufacturer(); + } + + public String getTransceiverModel() { + return this.instrument.getTransceiverModel(); + } + + public String getTransceiverSerial() { + return this.instrument.getTransceiverSerial(); + } + + public String getTransceiverFirmware() { + return this.instrument.getTransceiverFirmware(); + } + + public String getComments() { + return this.instrument.getComments(); + } + + public String getId() { + return this.instrument.getTopiaId(); + } + + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm