This is an automated email from the git hooks/post-receive script. New commit to branch feature/7206 in repository tutti. See http://git.codelutin.com/tutti.git commit d4752f9e810d858a13b792562d962f8d31dd4163 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 24 12:30:41 2015 +0100 ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) --- .../operation/catches/EditCatchesSvgHandler.java | 63 +++++-- .../operation/catches/EditCatchesUIHandler.java | 4 + tutti-ui-swing/src/main/resources/EcranResume.svg | 202 ++++++++++++++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 5 files changed, 238 insertions(+), 40 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index cef11c3..17f702d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -186,15 +186,43 @@ public class EditCatchesSvgHandler { initSvgField(n("tutti.editCatchBatch.field.speciesTotalSampleSortedComputedWeight"), CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, speciesWeightUnit, speciesColor); + initSvgField(n("tutti.editCatchBatch.field.speciesTotalInertWeight"), + CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, + CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_COMPUTED_WEIGHT, + model.getSpeciesTotalInertComputedOrNotWeight(), + speciesWeightUnit, + null); + initSvgField(n("tutti.editCatchBatch.field.speciesTotalLivingNotItemizedWeight"), + CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, + model.getSpeciesTotalLivingNotItemizedComputedOrNotWeight(), + speciesWeightUnit, + null); + initSvgField(n("tutti.editCatchBatch.field.benthosTotalSortedWeight"), CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, model.getBenthosTotalSortedComputedOrNotWeight(), benthosWeightUnit, benthosColor); + initSvgField(n("tutti.editCatchBatch.field.benthosTotalSampleSortedComputedWeight"), CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit, benthosColor); + initSvgField(n("tutti.editCatchBatch.field.benthosTotalInertWeight"), + CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, + CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, + model.getBenthosTotalInertComputedOrNotWeight(), + benthosWeightUnit, + null); + + initSvgField(n("tutti.editCatchBatch.field.benthosTotalLivingNotItemizedWeight"), + CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, + model.getBenthosTotalLivingNotItemizedComputedOrNotWeight(), + benthosWeightUnit, + null); + initSvgField(n("tutti.editCatchBatch.field.catchTotalUnsortedComputedWeight"), CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, catchWeightUnit, catchColor); initSvgField(n("tutti.editCatchBatch.field.speciesTotalUnsortedComputedWeight"), @@ -368,9 +396,12 @@ public class EditCatchesSvgHandler { if (computableData == null) { style.setProperty("font-style", "italic", null); } - int colorBrightness = TuttiUIUtil.getColorBrightness(bgColor); - String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; - style.setProperty("fill", textColor, null); + + if (bgColor != null) { + int colorBrightness = TuttiUIUtil.getColorBrightness(bgColor); + String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; + style.setProperty("fill", textColor, null); + } labelElement.setTextContent(weightUnit.decorateLabel(t(label))); bbox = labelElement.getBBox(); @@ -378,22 +409,24 @@ public class EditCatchesSvgHandler { float width = Math.abs(x - labelX) + 10; SVGOMRectElement labelRectElement = (SVGOMRectElement) svgDocument.getElementById(notNullProperty + "LabelRect"); - float actualWidth = Math.abs(labelRectElement.getBBox().getX() - labelX) + 10; + if (labelRectElement != null) { + float actualWidth = Math.abs(labelRectElement.getBBox().getX() - labelX) + 10; - if (actualWidth < width) { - labelRectElement.setAttribute("width", Float.toString(width)); - labelRectElement.setAttribute("x", String.valueOf(labelX - 10)); + if (actualWidth < width) { + labelRectElement.setAttribute("width", Float.toString(width)); + labelRectElement.setAttribute("x", String.valueOf(labelX - 10)); - for (String id : idsInGroup) { - Element el = svgDocument.getElementById(id + "LabelRect"); - el.setAttribute("width", Float.toString(width)); - el.setAttribute("x", String.valueOf(labelX - 10)); + for (String id : idsInGroup) { + Element el = svgDocument.getElementById(id + "LabelRect"); + el.setAttribute("width", Float.toString(width)); + el.setAttribute("x", String.valueOf(labelX - 10)); + } } - } - style = labelRectElement.getStyle(); - String hexaColor = "#" + Integer.toHexString(bgColor.getRGB()).substring(2); - style.setProperty("fill", hexaColor, null); + style = labelRectElement.getStyle(); + String hexaColor = "#" + Integer.toHexString(bgColor.getRGB()).substring(2); + style.setProperty("fill", hexaColor, null); + } Float value; boolean computed; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index 313ff78..e90ee55 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -167,7 +167,11 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi Sets.newHashSet(EditCatchesUIModel.PROPERTY_CATCH_TOTAL_WEIGHT, EditCatchesUIModel.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT)); //FIXME Can't use it with thoses tabs, because of crazy listener usage, the scheme is not clear at all diff --git a/tutti-ui-swing/src/main/resources/EcranResume.svg b/tutti-ui-swing/src/main/resources/EcranResume.svg index f146399..5fa8e87 100644 --- a/tutti-ui-swing/src/main/resources/EcranResume.svg +++ b/tutti-ui-swing/src/main/resources/EcranResume.svg @@ -7,15 +7,39 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" x="0px" y="0px" width="800" - height="500" - viewport="0 0 1000 500" - viewBox="0 0 1000 500" + height="570" + viewport="0 0 1000 570" + viewBox="0 0 1000 570" id="svg2985" - preserveAspectRatio="xMidYMid"> + preserveAspectRatio="xMidYMid" + inkscape:version="0.48.5 r10040" + sodipodi:docname="EcranResume.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1049" + id="namedview116" + showgrid="false" + inkscape:zoom="1.888" + inkscape:cx="403.60114" + inkscape:cy="130.63896" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="benthosTotalLivingNotItemizedWeight" /> <defs id="defs3092" /> <metadata @@ -32,13 +56,13 @@ </metadata> <g id="layer1" - transform="translate(-254.46719,246.05856)" + transform="matrix(1,0,0,1.1067402,-254.46719,272.32289)" style="display:inline"> <rect style="opacity:0.8;fill:#d6d9df;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3782" width="1000" - height="500" + height="600" x="254.46719" y="-246.05853" /> </g> @@ -55,7 +79,7 @@ <path style="fill:none;stroke:#666666;stroke-width:2.61584902;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 446.39162,-110.04153 -0.0269,-26.32879 270.09991,0.37888 -0.0561,-32.10216 0.18047,32.10978 304.18952,0.2893 -0.1568,25.73169" - id="path3976"/> + id="path3976" /> <g id="catchTotalWeight" transform="translate(79.772074,10.565548)"> @@ -162,7 +186,7 @@ transform="translate(577.09077,-191.97031)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" id="path4089" - style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <g id="g4803" transform="translate(335.03938,136.55489)"> @@ -326,7 +350,7 @@ transform="matrix(1.045689,0,0,0.98527645,134.89943,-69.246104)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" id="path4204" - style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <g id="g4695" transform="translate(57.66879,100.74152)"> @@ -413,7 +437,7 @@ transform="matrix(1.045689,0,0,0.98527645,9.1169726,24.559611)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" id="path4238" - style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4240" @@ -457,7 +481,7 @@ transform="matrix(1.045689,0,0,0.98527645,261.91047,103.63003)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" id="path4256" - style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/> + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <g id="g4673" transform="translate(57.66879,119.1263)"> @@ -608,27 +632,31 @@ <text xml:space="preserve" style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="473.72079" - y="231.39528" - id="speciesDistinctSortedSpeciesCountLabel">Nombre d'espèces :</text> + x="474.6571" + y="296.00116" + id="speciesDistinctSortedSpeciesCountLabel" + sodipodi:linespacing="125%">Nombre d'espèces :</text> <text xml:space="preserve" style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="727.25415" - y="232.02028" - id="benthosDistinctSortedSpeciesCountLabel">Nombre d'espèces :</text> + x="728.65869" + y="297.09433" + id="benthosDistinctSortedSpeciesCountLabel" + sodipodi:linespacing="125%">Nombre d'espèces :</text> <text xml:space="preserve" - style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;" - x="477.60803" - y="231.57071" - id="speciesDistinctSortedSpeciesCountValue">123465</text> + style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans" + x="479.01248" + y="296.64474" + id="speciesDistinctSortedSpeciesCountValue" + sodipodi:linespacing="125%">123465</text> <text xml:space="preserve" - style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;" - x="730.47382" - y="232.45459" - id="benthosDistinctSortedSpeciesCountValue">123465</text> + style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans" + x="733.75098" + y="297.06049" + id="benthosDistinctSortedSpeciesCountValue" + sodipodi:linespacing="125%">123465</text> <text xml:space="preserve" x="454.94089" @@ -653,5 +681,129 @@ x="606.9054" xml:space="preserve" style="font-size:11px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;">123456.789 kg</text> + <text + xml:space="preserve" + style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="895.47925" + y="56.935696" + id="speciesTotalUnsortedSpeciesCountLabel" + sodipodi:linespacing="125%" + inkscape:label="#benthosDistinctSortedSpeciesCountLabel-1">Nombre d'espèces :</text> + <text + xml:space="preserve" + style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="1146.8804" + y="57.403851" + id="benthosTotalUnsortedSpeciesCountLabel" + sodipodi:linespacing="125%" + inkscape:label="#benthosDistinctSortedSpeciesCountLabel-2">Nombre d'espèces :</text> + <text + xml:space="preserve" + style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans" + x="900.18506" + y="56.976437" + id="speciesTotalUnsortedSpeciesCountValue" + sodipodi:linespacing="125%" + inkscape:label="#benthosDistinctSortedSpeciesCountValue-9">123465</text> + <text + xml:space="preserve" + style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans" + x="1150.1818" + y="57.444588" + id="benthosTotalUnsortedSpeciesCountValue" + sodipodi:linespacing="125%" + inkscape:label="#benthosDistinctSortedSpeciesCountValue-6">123465</text> + <g + id="speciesTotalInertWeight"> + <text + xml:space="preserve" + style="font-size:8px;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="467.58231" + y="236.24045" + id="speciesTotalInertWeightLabel" + sodipodi:linespacing="125%">Inerte trié</text> + <rect + y="221.2793" + x="473.04526" + height="22.7103" + width="52.85368" + id="speciesTotalInertWeightRect" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.32118207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <text + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial" + id="speciesTotalInertWeightValue" + y="235.63155" + x="478.35089" + xml:space="preserve">123456.789 kg</text> + </g> + <g + id="benthosTotalInertWeight"> + <text + xml:space="preserve" + style="font-size:8px;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="722.00348" + y="236.51572" + id="benthosTotalInertWeightLabel" + sodipodi:linespacing="125%">Inerte trié</text> + <rect + y="222.96565" + x="726.84039" + height="22.7103" + width="52.85368" + id="benthosTotalInertWeightRect" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.32118207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <text + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial" + id="benthosTotalInertWeightValue" + y="237.01041" + x="731.99011" + xml:space="preserve">123456.789 kg</text> + </g> + <g + id="speciesTotalLivingNotItemizedWeight"> + <text + xml:space="preserve" + style="font-size:8px;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="468.42825" + y="267.30063" + id="speciesTotalLivingNotItemizedWeightLabel" + sodipodi:linespacing="125%">Vivant non détaillé</text> + <rect + y="253.39594" + x="473.09842" + height="22.7103" + width="52.85368" + id="speciesTotalLivingNotItemizedWeightRect" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.32118207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <text + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial" + id="speciesTotalLivingNotItemizedWeightValue" + y="268.37701" + x="478.71631" + xml:space="preserve">123456.789 kg</text> + </g> + <g + id="benthosTotalLivingNotItemizedWeight"> + <text + xml:space="preserve" + style="font-size:8px;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="721.36859" + y="269.40045" + id="benthosTotalLivingNotItemizedWeightLabel" + sodipodi:linespacing="125%">Vivant non détaillé</text> + <rect + y="254.80046" + x="726.84039" + height="22.7103" + width="52.85368" + id="benthosTotalLivingNotItemizedWeightRect" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.32118207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <text + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial" + id="benthosTotalLivingNotItemizedWeightValue" + y="269.78152" + x="732.45831" + xml:space="preserve">123456.789 kg</text> + </g> </g> </svg> diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index a10b6a5..699db4c 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -647,6 +647,8 @@ tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch= tutti.editCatchBatch.field.= tutti.editCatchBatch.field.benthosDistinctSortedSpeciesCount= tutti.editCatchBatch.field.benthosTotalComputedWeight= +tutti.editCatchBatch.field.benthosTotalInertWeight= +tutti.editCatchBatch.field.benthosTotalLivingNotItemizedWeight= tutti.editCatchBatch.field.benthosTotalSampleSortedComputedWeight= tutti.editCatchBatch.field.benthosTotalSampleSortedWeight= tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= @@ -675,8 +677,11 @@ tutti.editCatchBatch.field.catchTotalWeight.tip= tutti.editCatchBatch.field.marineLitterTotalWeight= tutti.editCatchBatch.field.marineLitterTotalWeight.tip= tutti.editCatchBatch.field.speciesDistinctSortedSpeciesCount= +tutti.editCatchBatch.field.speciesInertWeight= tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed= tutti.editCatchBatch.field.speciesTotalComputedWeight= +tutti.editCatchBatch.field.speciesTotalInertWeight= +tutti.editCatchBatch.field.speciesTotalLivingNotItemizedWeight= tutti.editCatchBatch.field.speciesTotalSampleSortedComputedWeight= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 671ebc0..03633dd 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -618,6 +618,8 @@ tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées tutti.editCatchBatch.field.benthosDistinctSortedSpeciesCount=Nombre de taxons \: tutti.editCatchBatch.field.benthosTotalComputedWeight=Total Benthos +tutti.editCatchBatch.field.benthosTotalInertWeight=Inerte trié +tutti.editCatchBatch.field.benthosTotalLivingNotItemizedWeight=Vivant nont détaillé tutti.editCatchBatch.field.benthosTotalSampleSortedComputedWeight=Vrac observé tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip=Poids du VRAC trié dans le benthos @@ -648,6 +650,8 @@ tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro dé tutti.editCatchBatch.field.speciesDistinctSortedSpeciesCount=Nombre de taxons \: tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed=poids non calculable dans ce contexte tutti.editCatchBatch.field.speciesTotalComputedWeight=Total Espèces +tutti.editCatchBatch.field.speciesTotalInertWeight=Inerte trié +tutti.editCatchBatch.field.speciesTotalLivingNotItemizedWeight=Vivant nont détaillé tutti.editCatchBatch.field.speciesTotalSampleSortedComputedWeight=Vrac observé tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.