branch feature/8049 created (now 028ab7d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8049 in repository tutti. See http://git.codelutin.com/tutti.git at 028ab7d déplacement de l'éditeur de caractéristiques dans l'ecran des mensurations : il remplace la table des observations individuelles (fixes #8049) This branch includes the following new commits: new 028ab7d déplacement de l'éditeur de caractéristiques dans l'ecran des mensurations : il remplace la table des observations individuelles (fixes #8049) 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 028ab7d807d39e37f0090e9f7a2135b96810f816 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 18:19:52 2016 +0100 déplacement de l'éditeur de caractéristiques dans l'ecran des mensurations : il remplace la table des observations individuelles (fixes #8049) -- 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 feature/8049 in repository tutti. See http://git.codelutin.com/tutti.git commit 028ab7d807d39e37f0090e9f7a2135b96810f816 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 18:19:52 2016 +0100 déplacement de l'éditeur de caractéristiques dans l'ecran des mensurations : il remplace la table des observations individuelles (fixes #8049) --- .../content/operation/catches/EditCatchesUI.jaxx | 6 ----- .../operation/catches/EditCatchesUIHandler.java | 6 ----- .../species/frequency/SpeciesFrequencyUI.jaxx | 22 +++++++++++++---- .../species/frequency/SpeciesFrequencyUI.jcss | 4 +++- .../frequency/SpeciesFrequencyUIHandler.java | 28 ++++++++++++---------- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx index 0bd414d..6a8ff08 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx @@ -142,12 +142,6 @@ public EditCatchesUI(FishingOperationsUI parentUI) { <SpeciesFrequencyUI id='speciesTabFrequencyEditor' constructorParams='speciesTabContent'/> </JXTitledPanel> - <JXTitledPanel id='speciesIndividualObservationCaracteristicMapEditorReminderLabel' - constraints='EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD'> - <CaracteristicMapEditorUI - id='speciesIndividualObservationCaracteristicMapEditor' - constructorParams='speciesTabContent'/> - </JXTitledPanel> </JPanel> </tab> <tab id='benthosTab'> 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 1938c07..3b5a1de 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 @@ -49,8 +49,6 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.table.TableColumn; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -537,10 +535,6 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); - - } else if (EDIT_CARACTERISTICS_CARD.equals(card)) { - titlePanel = ui.getSpeciesIndividualObservationCaracteristicMapEditorReminderLabel(); - title = n("tutti.editCaracteristics.title"); } if (tuttiUi != null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 54ba830..3b859b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -36,6 +36,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.SaveAndContinueSpeciesFrequencyAction fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor jaxx.runtime.swing.CardLayout2Ext @@ -43,6 +44,7 @@ org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable + org.jdesktop.swingx.JXTitledPanel javax.swing.ListSelectionModel javax.swing.SwingConstants @@ -75,6 +77,8 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <CardLayout2Ext id='dataFieldLayout' constructorParams='this, "dataFieldPanel"'/> + <CardLayout2Ext id='obsPanelLayout' constructorParams='this, "obsPanel"'/> + <AddSpeciesFrequencyLengthStepCaracteristicAction id="addLengthStepCaracteristicAction" constructorParams="this"/> <GenerateSpeciesFrequencyLengthStepsAction id="generateLengthStepsAction" constructorParams="this"/> <CancelEditSpeciesFrequencyAction id="cancelAction" constructorParams="this"/> @@ -270,11 +274,19 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <JRadioButton id='copySizesButton' onActionPerformed='model.setCopyIndividualObservationMode(CopyIndividualObservationMode.SIZE)'/> </HBox> - <JScrollPane id='obsPanel' constraints="BorderLayout.CENTER"> - <JXTable id='obsTable' - onMouseClicked='handler.autoSelectRowInTable(event, obsTablePopup)' - onKeyPressed='handler.openRowMenu(event, obsTablePopup)'/> - </JScrollPane> + <JPanel id="obsPanel" constraints="BorderLayout.CENTER"> + <JScrollPane constraints="SpeciesFrequencyUIHandler.OBS_TABLE_CARD"> + <JXTable id='obsTable' + onMouseClicked='handler.autoSelectRowInTable(event, obsTablePopup)' + onKeyPressed='handler.openRowMenu(event, obsTablePopup)'/> + </JScrollPane> + <JXTitledPanel id='obsCaracteristicMapEditorReminderLabel' + constraints='SpeciesFrequencyUIHandler.EDIT_CARACTERISTICS_CARD'> + <CaracteristicMapEditorUI + id='obsCaracteristicCaracteristicMapEditor' + constructorParams='this'/> + </JXTitledPanel> + </JPanel> </JPanel> </JSplitPane> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss index e66d35e..085026f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss @@ -310,7 +310,9 @@ ComputableDataEditor { enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } -//obsPanel +#obsPanel { + layout:{obsPanelLayout}; +} #copyToSizeTablePanel { border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)}; 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 a5e4071..543c2c5 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 @@ -126,6 +126,9 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci /** Logger. */ private static final Log log = LogFactory.getLog(SpeciesFrequencyUIHandler.class); + public static final String OBS_TABLE_CARD = "obsTableCard"; + public static final String EDIT_CARACTERISTICS_CARD = "editCaracteristicsCard"; + private FrequencyCellEditor frequencyEditor; private TaxonCache taxonCache; @@ -256,29 +259,28 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci @Override public CaracteristicMapEditorUI getCaracteristicMapEditor() { - EditCatchesUI parent = getParentContainer(EditCatchesUI.class); - return parent.getSpeciesIndividualObservationCaracteristicMapEditor(); + return ui.getObsCaracteristicCaracteristicMapEditor(); } @Override public void showCaracteristicMapEditor(CaracteristicMapColumnRowModel editRow) { - EditCatchesUI parent = getParentContainer(EditCatchesUI.class); - - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD); - - //FIXME title IndividualObservationBatchRowModel row = (IndividualObservationBatchRowModel) editRow; WeightUnit individualObservationWeightUnit = getConfig().getIndividualObservationWeightUnit(); - String title = parent.getSpeciesTabFrequencyEditorReminderLabel().getTitle() + " - " - + row.getSize() + " - " - + individualObservationWeightUnit.renderWeight(row.getWeight()); - parent.getSpeciesIndividualObservationCaracteristicMapEditorReminderLabel().setTitle(title); + String title = String.format("<html><body style='color:black;'><strong>%s - %s %s - %s %s</strong> - %s</body></html>", + row.getRankOrder(), + row.getSize(), + getModel().getLengthStepCaracteristicUnit(), + individualObservationWeightUnit.renderWeight(row.getWeight()), + individualObservationWeightUnit.getShortLabel(), + t("tutti.editIndividualObservationBatch.table.header.otherCaracteristics")); + ui.getObsCaracteristicMapEditorReminderLabel().setTitle(title); + ui.getObsPanelLayout().setSelected(EDIT_CARACTERISTICS_CARD); + } @Override public void hideCaracteristicMapEditor() { - EditCatchesUI parent = getParentContainer(EditCatchesUI.class); - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); + ui.getObsPanelLayout().setSelected(OBS_TABLE_CARD); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm