Author: kmorin Date: 2013-03-14 15:45:03 +0100 (Thu, 14 Mar 2013) New Revision: 619 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/619 Log: - refs #2104 pas de la classe de taille absent du protocole - debug selection after row deletion Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-14 14:45:03 UTC (rev 619) @@ -105,21 +105,21 @@ handler.collectChildren(selectedBatch, rowToRemove); + table.clearSelection(); + // remove all rows from the model getModel().getRows().removeAll(rowToRemove); + // refresh table from parent batch row index to the end + tableModel.fireTableDataChanged(); + if (!getModel().getRows().isEmpty()) { // select first row AbstractSelectTableAction.doSelectCell(table, 0, 0); - } else { - table.clearSelection(); } - // refresh table from parent batch row index to the end - tableModel.fireTableDataChanged(); - if (table.isEditing()) { // but no edit it Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-14 14:45:03 UTC (rev 619) @@ -78,6 +78,8 @@ handler.collectChildren(parentBatch, rowToRemove); + table.clearSelection(); + // remove all rows from the model getModel().getRows().removeAll(rowToRemove); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-14 14:45:03 UTC (rev 619) @@ -201,12 +201,20 @@ } + Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); initBeanFilterableComboBox(ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, - model.getLengthStepCaracteristic()); + modelCaracteristic); - //TODO Should it come from PROTOCOL or config ? - model.setStep(.5f); + // get precision from the pmfm + Float precision = null; + if (modelCaracteristic != null) { + precision = model.getLengthStepCaracteristic().getPrecision(); + } + if (precision == null) { + precision = .5f; + } + model.setStep(precision); model.setMinStep(10f); model.setMaxStep(20f); @@ -235,6 +243,15 @@ Caracteristic newValue = (Caracteristic) evt.getNewValue(); for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); + // get precision from the pmfm + Float precision = null; + if (newValue != null) { + precision = newValue.getPrecision(); + } + if (precision == null) { + precision = .5f; + } + getModel().setStep(precision); recomputeRowValidState(rowModel); } ui.getValidator().doValidate();