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 0b0fe184db70772d80dc26ecf43f81c2edadc217 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 12:01:02 2016 +0100 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 --- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 3 --- .../species/frequency/actions/ResetSpeciesFrequencyAction.java | 4 ++-- 2 files changed, 2 insertions(+), 5 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 7b93051..e7989b2 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 @@ -1006,9 +1006,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci chartPanel.setMouseZoomable(false); chartPanel.setPopupMenu(null); - JPanel histogramPanel = ui.getHistogramPanel(); - histogramPanel.add(chartPanel, BorderLayout.CENTER); - averageWeightsHistogramPopup.getContentPane().add(chartPanel); averageWeightsHistogramPopup.pack(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java index 8b72765..4a3f8a5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac */ import com.google.common.collect.Lists; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import jaxx.runtime.SwingUtil; @@ -61,7 +60,8 @@ public class ResetSpeciesFrequencyAction extends AbstractAction { public void actionPerformed(ActionEvent e) { // remove all frequencies - ui.getModel().setRows(Lists.<SpeciesFrequencyRowModel>newArrayList()); + ui.getModel().setRows(Lists.newArrayList()); + ui.getModel().setIndividualObservationRows(Lists.newArrayList()); } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.