branch develop updated (1bcc87e -> 7597d7a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 1bcc87e improve pom new 8b04da4 ajout de l'unite de la classe de taille sur l'ecran des especes new 6c50ed3 ajout de l'unite de la classe de taille sur l'ecran des benthos + fix null unit new 691280d ajout des tips new 7597d7a fixes #6369: [CAPTURE] écran mensurations : préciser en face de clas min et class max l'unité (mm ou cm) en fonction du champ "type de mesure" The 4 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 7597d7a59b0c2360d9d6d0105a267214a2f3e3dd Merge: 1bcc87e 691280d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:58:46 2014 +0100 fixes #6369: [CAPTURE] écran mensurations : préciser en face de clas min et class max l'unité (mm ou cm) en fonction du champ "type de mesure" commit 691280d6fd4017920dfcd0c8924a67a5a8c746e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:58:30 2014 +0100 ajout des tips commit 6c50ed33479cf2b0898a99961a0d7404f7bb3d7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:51:25 2014 +0100 ajout de l'unite de la classe de taille sur l'ecran des benthos + fix null unit commit 8b04da4db711c084b61e004942f530f5ca592428 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:39:39 2014 +0100 ajout de l'unite de la classe de taille sur l'ecran des especes Summary of changes: .../frequency/BenthosFrequencyUIHandler.java | 37 ++++++++++++++++++- .../benthos/frequency/BenthosFrequencyUIModel.java | 15 ++++++-- .../frequency/SpeciesFrequencyUIHandler.java | 42 ++++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 11 +++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 6 files changed, 95 insertions(+), 14 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 tutti. See http://git.codelutin.com/tutti.git commit 8b04da4db711c084b61e004942f530f5ca592428 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:39:39 2014 +0100 ajout de l'unite de la classe de taille sur l'ecran des especes --- .../frequency/SpeciesFrequencyUIHandler.java | 28 ++++++++++++++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 11 +++++---- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 5531d70..052f4cb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; * #L% */ -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -62,10 +60,7 @@ import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.NumberTickUnitSource; -import org.jfree.chart.axis.TickUnitSource; import org.jfree.chart.axis.ValueAxis; -import org.jfree.data.general.DatasetChangeEvent; -import org.jfree.data.general.DatasetChangeListener; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -371,7 +366,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGHT_STEP_CARACTERISTIC, new PropertyChangeListener() { + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); @@ -390,6 +385,22 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } }); + // when lengthStepCaracteristicUnit changed, let's updates the label of some fields + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + String unit = (String) evt.getNewValue(); + + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); + getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP).setHeaderValue( + getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + } + }); + // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { @Override @@ -424,7 +435,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci }); // init histogram - final XYSeries series = initHistogram(ui, step); + final XYSeries series = initHistogram(ui, model.getStep()); // init data table @@ -1144,4 +1155,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci logTable.addHighlighter(evenHighlighter); } + protected String getLabelWithUnit(String label, String unit) { + return label + " (" + unit + ")"; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 74e996c..85b71a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -67,7 +67,9 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public static final String PROPERTY_SIMPLE_COUNT = "simpleCount"; - public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT = "lengthStepCaracteristicUnit"; public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; @@ -231,16 +233,17 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public void setLengthStepCaracteristic(Caracteristic lengthStepCaracteristic) { Object oldValue = getLengthStepCaracteristic(); this.lengthStepCaracteristic = lengthStepCaracteristic; - firePropertyChange(PROPERTY_LENGHT_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); firePropertyChange(PROPERTY_CAN_GENERATE, null, isCanGenerate()); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, null, getLengthStepCaracteristicUnit()); } public String getLengthStepCaracteristicUnit() { - return lengthStepCaracteristic.getUnit(); + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getUnit(); } public Float getLengthStepCaracteristicPrecision() { - return lengthStepCaracteristic.getPrecision(); + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getPrecision(); } public Float getMinStep() { -- 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 tutti. See http://git.codelutin.com/tutti.git commit 6c50ed33479cf2b0898a99961a0d7404f7bb3d7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:51:25 2014 +0100 ajout de l'unite de la classe de taille sur l'ecran des benthos + fix null unit --- .../frequency/BenthosFrequencyUIHandler.java | 28 +++++++++++++++++++++- .../benthos/frequency/BenthosFrequencyUIModel.java | 15 ++++++++++-- .../frequency/SpeciesFrequencyUIHandler.java | 5 ++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 7ccff5e..8b36c1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyTableModel; import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.util.Numbers; import org.jdesktop.swingx.decorator.HighlightPredicate; @@ -312,7 +313,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGHT_STEP_CARACTERISTIC, new PropertyChangeListener() { + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); @@ -331,6 +332,27 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth } }); + // when lengthStepCaracteristicUnit changed, let's updates the label of some fields + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + String unit = (String) evt.getNewValue(); + + if (unit == null) { + + unit = t("tutti.editBenthosFrequencies.unkownStepUnit"); + } + + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep"), unit)); + getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP).setHeaderValue( + getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + } + }); + // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { @Override @@ -1017,4 +1039,8 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth getConfig().getColorAlternateRow()); logTable.addHighlighter(evenHighlighter); } + + protected String getLabelWithUnit(String label, String unit) { + return label + " (" + unit + ")"; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index 9f0f219..674d3a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -67,7 +67,9 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa public static final String PROPERTY_SIMPLE_COUNT = "simpleCount"; - public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + + public static final String PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT = "lengthStepCaracteristicUnit"; public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; @@ -231,8 +233,17 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa public void setLengthStepCaracteristic(Caracteristic lengthStepCaracteristic) { Object oldValue = getLengthStepCaracteristic(); this.lengthStepCaracteristic = lengthStepCaracteristic; - firePropertyChange(PROPERTY_LENGHT_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); firePropertyChange(PROPERTY_CAN_GENERATE, null, isCanGenerate()); + firePropertyChange(PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, null, getLengthStepCaracteristicUnit()); + } + + public String getLengthStepCaracteristicUnit() { + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getUnit(); + } + + public Float getLengthStepCaracteristicPrecision() { + return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getPrecision(); } public Float getMinStep() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 052f4cb..fbfef33 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -393,6 +393,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci String unit = (String) evt.getNewValue(); + if (unit == null) { + + unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); + } + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); 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 8e25091..7fa3b46 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 @@ -543,6 +543,7 @@ tutti.editBenthosFrequencies.table.header.lengthStep= tutti.editBenthosFrequencies.table.header.number= tutti.editBenthosFrequencies.title= tutti.editBenthosFrequencies.title.addLengthStepCaracteristic= +tutti.editBenthosFrequencies.unkownStepUnit= tutti.editCaracteristics.title= tutti.editCatchBatch.action.attachments.tip= tutti.editCatchBatch.action.cancelEditCatchBatch= @@ -1245,6 +1246,7 @@ tutti.editSpeciesFrequencies.table.header.number= tutti.editSpeciesFrequencies.table.header.weight= tutti.editSpeciesFrequencies.title= tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic= +tutti.editSpeciesFrequencies.unkownStepUnit= tutti.error.application.already.started= tutti.error.delete.startActionFile=Could not delete start action file %s tutti.error.read.startActionFile=Could not read start action file content %s 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 332b2d7..3b7eb1b 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 @@ -529,6 +529,7 @@ tutti.editBenthosFrequencies.logTable.header.label=Logs tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editBenthosFrequencies.title=Mensuration tutti.editBenthosFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique +tutti.editBenthosFrequencies.unkownStepUnit=NA tutti.editCaracteristics.title=%s - Autres caractéristiques tutti.editCatchBatch.action.attachments.tip=Pièce(s) jointe(s) de la capture tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser @@ -1211,6 +1212,7 @@ tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé tutti.editSpeciesFrequencies.title=Mensuration tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique +tutti.editSpeciesFrequencies.unkownStepUnit=NA tutti.error.application.already.started=<html><body>L'application est déjà démarrée.<br/>Si ce n'était pas le cas, veuillez supprimer le fichier <strong>tutti.lock</strong> présent dans le répertoire de l'outil avant de lancer l'applicatif.</body></html> tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s tutti.error.read.startActionFile=Impossible de lire le contenu du fichier %s -- 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 tutti. See http://git.codelutin.com/tutti.git commit 691280d6fd4017920dfcd0c8924a67a5a8c746e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:58:30 2014 +0100 ajout des tips --- .../benthos/frequency/BenthosFrequencyUIHandler.java | 13 +++++++++++-- .../species/frequency/SpeciesFrequencyUIHandler.java | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 8b36c1b..77a7e7b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -30,6 +30,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.util.Numbers; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; +import org.jdesktop.swingx.table.TableColumnExt; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; @@ -61,6 +62,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import javax.swing.*; +import javax.swing.table.TableColumn; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -346,10 +348,17 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth } getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep"), unit)); + getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep.tip"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep"), unit)); + getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep.tip"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep"), unit)); - getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP).setHeaderValue( - getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep.tip"), unit)); + + TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP); + column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); } }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index fbfef33..9c4516e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -56,6 +56,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.jdesktop.swingx.table.TableColumnExt; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; @@ -72,6 +73,7 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import javax.swing.JTextField; import javax.swing.SwingUtilities; +import javax.swing.table.TableColumn; import java.awt.BorderLayout; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -399,10 +401,17 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); + getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep.tip"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); + getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep.tip"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); - getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP).setHeaderValue( - getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep.tip"), unit)); + + TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP); + column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); } }); -- 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 tutti. See http://git.codelutin.com/tutti.git commit 7597d7a59b0c2360d9d6d0105a267214a2f3e3dd Merge: 1bcc87e 691280d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 19:58:46 2014 +0100 fixes #6369: [CAPTURE] écran mensurations : préciser en face de clas min et class max l'unité (mm ou cm) en fonction du champ "type de mesure" .../frequency/BenthosFrequencyUIHandler.java | 37 ++++++++++++++++++- .../benthos/frequency/BenthosFrequencyUIModel.java | 15 ++++++-- .../frequency/SpeciesFrequencyUIHandler.java | 42 ++++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 11 +++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 6 files changed, 95 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm