[Tutti-commits] 02/17: mise en page de l'écran refs #6926

29 Feb 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/ecran_obs_individuelles in repository tutti.

See http://git.codelutin.com/tutti.git

commit c8938cb54bd762b60d9ae98b16eb213fc38e0411
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Feb 19 15:09:16 2016 +0100

    mise en page de l'écran
    refs #6926
---
 .../filtered-resources/tutti-help-fr.properties    |   5 +
 .../species/frequency/SpeciesFrequencyUI.jaxx      | 120 +++++---
 .../species/frequency/SpeciesFrequencyUI.jcss      | 311 +++++++++++++--------
 .../resources/i18n/tutti-ui-swing_en_GB.properties |  13 +
 .../resources/i18n/tutti-ui-swing_fr_FR.properties |  15 +-
 5 files changed, 301 insertions(+), 163 deletions(-)

diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties
index 7940240..e3e80af 100644
--- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties
+++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties
@@ -22,6 +22,7 @@
 # #L%
 ###
 #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
+#Fri Feb 19 14:49:02 CET 2016
 tutti.config.help=config.html
 tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -325,6 +326,9 @@ tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#cap
 tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions
 tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.help=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.help=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.help=
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.help=
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields
 tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields
@@ -341,6 +345,7 @@ tutti.editSpeciesFrequencies.field.simpleCountingWeight.help=editFishingOperatio
 tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields
 tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields
 tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields
+tutti.editSpeciesFrequencies.field.useRtp.help=
 tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration
 tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#traitActions
 tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#traitActions
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 d4d6852..486dbd2 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
@@ -85,8 +85,10 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
 
     <row>
 
-      <cell weightx="1">
-        <HBox id='frequencyModePanel' horizontalAlignment='{SwingConstants.LEFT}'>
+      <cell>
+        <HBox id='frequencyModePanel'
+              horizontalAlignment='{SwingConstants.LEFT}'
+              verticalAlignment='{SwingConstants.CENTER}'>
           <JRadioButton id='simpleCountingModeButton'
                         onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.SIMPLE_COUNTING)'/>
           <JRadioButton id='frequencyModeButton'
@@ -94,40 +96,16 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
         </HBox>
       </cell>
 
-      <cell>
-
-        <!-- length step caracteristic -->
-        <HBox id="lengthStepCaracteristicPanel" styleClass="visibleIfFrequencies">
-          <JLabel id='lengthStepCaracteristicLabel'/>
-          <JPanel layout='{new BorderLayout()}'>
-            <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
-                                    constructorParams='this'
-                                    genericType='Caracteristic'
-                                    constraints='BorderLayout.CENTER'/>
-            <JButton id='addLengthStepCaracteristicButton' constraints='BorderLayout.EAST'/>
-          </JPanel>
-          <JLabel id='stepLabel'/>
-          <NumberEditor id='stepField' constructorParams='this'/>
-        </HBox>
-
-      </cell>
-
-      <cell rows="3" weightx="10">
+      <cell rows="2" weightx="1">
         <JPanel id="histogramPanel" layout="{new BorderLayout()}" styleClass="visibleIfFrequencies"/>
       </cell>
     </row>
 
     <row>
-      <cell columns="2">
-        <JSeparator styleClass="visibleIfFrequencies" />
-      </cell>
-    </row>
-
-    <row>
-      <cell columns="2">
+      <cell>
         <Table styleClass="visibleIfFrequencies">
           <row>
-            <cell>
+            <cell rows="2">
               <VBox id='modePanel' verticalAlignment='{SwingConstants.CENTER}'>
                 <JRadioButton id='autoGenModeButton'
                               onActionPerformed='model.setFrequenciesConfigurationMode(FrequencyConfigurationMode.AUTO_GEN)'/>
@@ -136,7 +114,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
               </VBox>
             </cell>
 
-            <cell>
+            <cell rows="2">
               <JPanel id='modeConfigurationPanel'>
                 <Table  id='autoGenModePanel' fill='both' constraints='"autoGenMode"'>
                   <!-- Min step-->
@@ -182,7 +160,40 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
               </JPanel>
             </cell>
 
-            <cell weightx="1">
+            <cell>
+              <!-- length step caracteristic -->
+              <Table id="lengthStepCaracteristicPanel"
+                     fill="both"
+                     anchor="west">
+
+                <row>
+                  <cell>
+                    <JLabel id='lengthStepCaracteristicLabel'/>
+                  </cell>
+                  <cell>
+                    <BeanFilterableComboBox id='lengthStepCaracteristicComboBox'
+                                            constructorParams='this'
+                                            genericType='Caracteristic'/>
+                  </cell>
+                  <cell>
+                    <JButton id='addLengthStepCaracteristicButton'/>
+                  </cell>
+                </row>
+                <row>
+                  <cell>
+                    <JLabel id='stepLabel'/>
+                  </cell>
+                  <cell weightx="1" columns="2">
+                    <NumberEditor id='stepField' constructorParams='this'/>
+                  </cell>
+                </row>
+
+              </Table>
+            </cell>
+          </row>
+
+          <row>
+            <cell>
               <JLabel id="samplingWarningLabel"/>
             </cell>
           </row>
@@ -191,23 +202,42 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
     </row>
 
     <row>
-      <cell columns="3">
-        <JSeparator styleClass="visibleIfFrequencies" />
+      <cell columns="2">
+        <JSeparator styleClass="visibleIfFrequencies"/>
       </cell>
     </row>
 
     <row weighty="1">
-      <cell columns="3">
+      <cell columns="2" weightx="1">
         <JPanel id='dataFieldPanel'>
           <JSplitPane constraints='"lengthCaracteristicPmfm"' id="firstSplitPane">
             <JPanel layout="{new BorderLayout()}">
-              <HBox id="lengthstepSettingsBlock" constraints='BorderLayout.NORTH'>
-                <!-- Step -->
+              <Table constraints='BorderLayout.NORTH'
+                     fill="both"
+                     id="lengthstepSettingsBlock">
+                <row>
+                  <cell anchor="east">
                     <JLabel id='totalNumberLabel'/>
+                  </cell>
+                  <cell>
                     <JTextField id='totalNumberField'/>
+                  </cell>
+                  <cell>
+                    <JCheckBox id='useRTPCheckBox' onItemStateChanged='handler.setBoolean(event, "useRTP")'/>
+                  </cell>
+                </row>
+                <row>
+                  <cell>
                     <JLabel id='totalWeightLabel'/>
+                  </cell>
+                  <cell>
                     <ComputableDataEditor id='totalWeightField' genericType="Float" constructorParams='this'/>
-              </HBox>
+                  </cell>
+                  <cell>
+                    <JButton id='graphAverageWeightButton'/>
+                  </cell>
+                </row>
+              </Table>
               <JSplitPane id="secondSplitPane" constraints='BorderLayout.CENTER'>
                 <JScrollPane id='logsScrollPane'>
                   <JXTable id='logsTable'/>
@@ -217,9 +247,19 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
                 </JScrollPane>
               </JSplitPane>
             </JPanel>
-            <JScrollPane id='obsPanel'>
-              <JXTable id='obsTable'/>
-            </JScrollPane>
+            <JPanel layout="{new BorderLayout()}">
+              <HBox id="copyToSizeTablePanel"
+                    verticalAlignment='{SwingConstants.CENTER}'
+                    constraints="BorderLayout.NORTH">
+                <JLabel id='copyToSizeTableLabel'/>
+                <JRadioButton id='copyAllButton'/>
+                <JRadioButton id='copyNothingButton'/>
+                <JRadioButton id='copySizesButton'/>
+              </HBox>
+              <JScrollPane id='obsPanel' constraints="BorderLayout.CENTER">
+                <JXTable id='obsTable'/>
+              </JScrollPane>
+            </JPanel>
           </JSplitPane>
 
           <Table id="simpleCountingNumberPanel" constraints='"noLengthCaracteristicPmfm"' fill='horizontal'>
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 b22a514..2e8efc8 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
@@ -50,70 +50,67 @@ ComputableDataEditor {
   _help: {"tutti.editSpeciesFrequencies.help"};
 }
 
-#stepLabel {
-  text: "tutti.editSpeciesFrequencies.field.step";
-  toolTipText: "tutti.editSpeciesFrequencies.field.step.tip";
-  labelFor: {stepField};
-  enabled: {!model.isSimpleCountingMode()};
-  _help: {"tutti.editSpeciesFrequencies.field.step.help"};
-}
+//configurationPanel
 
-#stepField {
-  property: step;
-  numberValue: {model.getStep()};
-  numberPattern: {DECIMAL1_PATTERN};
-  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
-  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.step")};
-  _help: {"tutti.editSpeciesFrequencies.field.step.help"};
+#frequencyModePanel {
+  border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)};
 }
 
-#totalNumberLabel {
-  text: "tutti.editSpeciesFrequencies.field.totalNumber";
-  toolTipText: "tutti.editSpeciesFrequencies.field.totalNumber.tip";
-  labelFor: {totalNumberField};
-  enabled: {!model.isSimpleCountingMode()};
-  _help: {"tutti.editSpeciesFrequencies.field.totalNumber.help"};
+#simpleCountingModeButton {
+  text: "tutti.editSpeciesFrequencies.field.mode.simpleCounting";
+  toolTipText: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.mnemonic";
+  value: "simpleCountingMode";
+  selected: {model.isSimpleCountingMode()};
+  buttonGroup: "mode";
+  _help: {"tutti.editSpeciesFrequencies.field.mode.simpleCounting.help"};
 }
 
-#totalNumberField {
-  text: {getStringValue(model.getTotalNumber())};
-  enabled: false;
-  _computed: true;
-  _help: {"tutti.editSpeciesFrequencies.field.totalNumber.help"};
+#frequencyModeButton {
+  text: "tutti.editSpeciesFrequencies.field.mode.frequencyMode";
+  toolTipText: "tutti.editSpeciesFrequencies.field.mode.frequencyMode.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.mode.frequencyMode.mnemonic";
+  value: "frequenciesMode";
+  selected: {model.isFrequenciesMode()};
+  buttonGroup: "mode";
+  _help: {"tutti.editSpeciesFrequencies.field.mode.frequencyMode.help"};
 }
 
-#totalWeightLabel {
-  text: "tutti.editSpeciesFrequencies.field.totalWeight";
-  toolTipText: "tutti.editSpeciesFrequencies.field.totalWeight.tip";
-  labelFor: {totalWeightField};
-  enabled: {model.getTotalWeight() != null};
-  _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"};
-  _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()};
+//histogramPanel
+
+//modePanel
+
+#autoGenModeButton {
+  text: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen";
+  toolTipText: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.mnemonic";
+  value: "autoGenMode";
+  selected: {model.isAutoGenMode()};
+  buttonGroup: "frequenciesMode";
+  _help: {"tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.help"};
 }
 
-#totalWeightField {
-  bean: {model.getTotalComputedOrNotWeight()};
-  numberValue: {model.getTotalWeight()};
-  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.totalWeight")};
-  _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"};
+#rafaleModeButton {
+  text: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale";
+  toolTipText: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale.mnemonic";
+  value: "rafaleMode";
+  selected: {model.isRafaleMode()};
+  buttonGroup: "frequenciesMode";
+  _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"};
 }
 
-#lengthStepCaracteristicLabel {
-  text: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic";
-  toolTipText: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip";
-  labelFor: {lengthStepCaracteristicComboBox};
-  enabled: {!model.isSimpleCountingMode()};
-  _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"};
+#modeConfigurationPanel {
+  layout: {modeConfigurationLayout};
+  border: { BorderFactory.createTitledBorder(null, null) };
 }
 
-#lengthStepCaracteristicComboBox {
-  property: lengthStepCaracteristic;
-  selectedItem: {model.getLengthStepCaracteristic()};
-  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
-  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")};
-  _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"};
+#modeConfigurationLayout {
+  selected: {String.valueOf(frequenciesMode.getSelectedValue())};
 }
 
+//autoGenModePanel
+
 #minStepLabel {
   text: "tutti.editSpeciesFrequencies.field.minStep";
   toolTipText: "tutti.editSpeciesFrequencies.field.minStep.tip";
@@ -142,6 +139,17 @@ ComputableDataEditor {
   _help: {"tutti.editSpeciesFrequencies.field.maxStep.help"};
 }
 
+#generateButton {
+  action: {generateLengthStepsAction};
+  _help: {"tutti.editSpeciesFrequencies.action.generate.help"};
+}
+
+#generateLengthStepsAction {
+  enabled: {model.isCanGenerate()};
+}
+
+//rafaleModePanel
+
 #rafaleStepLabel {
   text: "tutti.editSpeciesFrequencies.field.rafaleStep";
   toolTipText: "tutti.editSpeciesFrequencies.field.rafaleStep.tip";
@@ -155,47 +163,113 @@ ComputableDataEditor {
   _help: {"tutti.editSpeciesFrequencies.field.rafaleStep.help"};
 }
 
-#samplingWarningLabel {
-  foreground: {Color.RED};
-  text: "Prélèvement";
+#lengthStepCaracteristicPanel {
+  border: { BorderFactory.createTitledBorder(null, null) };
 }
 
-#configurationPanel {
-  border: {new TitledBorder(null, null)};
+#lengthStepCaracteristicLabel {
+  text: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic";
+  toolTipText: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip";
+  labelFor: {lengthStepCaracteristicComboBox};
+  enabled: {!model.isSimpleCountingMode()};
+  _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"};
 }
 
-#modeConfigurationLayout {
-  selected: {String.valueOf(frequenciesMode.getSelectedValue())};
+#lengthStepCaracteristicComboBox {
+  property: lengthStepCaracteristic;
+  selectedItem: {model.getLengthStepCaracteristic()};
+  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
+  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")};
+  _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"};
 }
 
-#modeConfigurationPanel {
-  layout: {modeConfigurationLayout};
-  border: {new TitledBorder(null, null)};
+#addLengthStepCaracteristicButton {
+  action: {addLengthStepCaracteristicAction};
+  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
+  _help: {"tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help"};
 }
 
-#simpleCountingModeLabel {
-  text: "tutti.editSpeciesFrequencies.label.no.configuration";
-  horizontalAlignment: {JLabel.CENTER};
-  enabled: false;
+#stepLabel {
+  text: "tutti.editSpeciesFrequencies.field.step";
+  toolTipText: "tutti.editSpeciesFrequencies.field.step.tip";
+  labelFor: {stepField};
+  enabled: {!model.isSimpleCountingMode()};
+  _help: {"tutti.editSpeciesFrequencies.field.step.help"};
 }
 
-#lengthstepSettingsBlock {
-  visible: {!model.isSimpleCountingMode()};
+#stepField {
+  property: step;
+  numberValue: {model.getStep()};
+  numberPattern: {DECIMAL1_PATTERN};
+  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
+  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.step")};
+  _help: {"tutti.editSpeciesFrequencies.field.step.help"};
 }
 
-#dataFieldLayout {
-  selected: {model.isSimpleCountingMode() ? "noLengthCaracteristicPmfm" : "lengthCaracteristicPmfm"};
+#samplingWarningLabel {
+  foreground: {Color.RED};
+  text: "Prélèvement";
 }
 
 #dataFieldPanel {
   layout: {dataFieldLayout};
 }
 
+#dataFieldLayout {
+  selected: {model.isSimpleCountingMode() ? "noLengthCaracteristicPmfm" : "lengthCaracteristicPmfm"};
+}
+
 #firstSplitPane {
   oneTouchExpandable: true;
   resizeWeight: 0.6;
 }
 
+#lengthstepSettingsBlock {
+  border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)};
+}
+
+#totalNumberLabel {
+  text: "tutti.editSpeciesFrequencies.field.totalNumber";
+  toolTipText: "tutti.editSpeciesFrequencies.field.totalNumber.tip";
+  labelFor: {totalNumberField};
+  enabled: {!model.isSimpleCountingMode()};
+  _help: {"tutti.editSpeciesFrequencies.field.totalNumber.help"};
+}
+
+#totalNumberField {
+  text: {getStringValue(model.getTotalNumber())};
+  enabled: false;
+  _computed: true;
+  _help: {"tutti.editSpeciesFrequencies.field.totalNumber.help"};
+}
+
+#totalWeightLabel {
+  text: "tutti.editSpeciesFrequencies.field.totalWeight";
+  toolTipText: "tutti.editSpeciesFrequencies.field.totalWeight.tip";
+  labelFor: {totalWeightField};
+  enabled: {model.getTotalWeight() != null};
+  _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"};
+  _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()};
+}
+
+#totalWeightField {
+  bean: {model.getTotalComputedOrNotWeight()};
+  numberValue: {model.getTotalWeight()};
+  _validatorLabel: {t("tutti.editSpeciesFrequencies.field.totalWeight")};
+  _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"};
+}
+
+#useRTPCheckBox {
+  text: "tutti.editSpeciesFrequencies.field.useRtp";
+  toolTipText: "tutti.editSpeciesFrequencies.field.useRtp.tip";
+  _help: {"tutti.editSpeciesFrequencies.field.useRtp.help"};
+}
+
+#graphAverageWeightButton {
+  text: "tutti.editSpeciesFrequencies.field.graphAverageWeight";
+  _skipAction: true;
+}
+
 #secondSplitPane {
   oneTouchExpandable: true;
   resizeWeight: 0.1;
@@ -220,8 +294,50 @@ ComputableDataEditor {
   enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f};
 }
 
+//obsPanel
+
+#copyToSizeTablePanel {
+  border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)};
+}
+
+#copyToSizeTableLabel {
+  text: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.label";
+}
+
+#copyAllButton {
+  text: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all";
+  toolTipText: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.mnemonic";
+  value: "all";
+  //selected: {model.isSimpleCountingMode()};
+  buttonGroup: "copyToSizeTableMode";
+  _help: {"tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.help"};
+}
+
+#copyNothingButton {
+  text: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing";
+  toolTipText: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.mnemonic";
+  value: "nothing";
+  //selected: {model.isSimpleCountingMode()};
+  buttonGroup: "copyToSizeTableMode";
+  _help: {"tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.help"};
+}
+
+#copySizesButton {
+  text: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size";
+  toolTipText: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.tip";
+  i18nMnemonic: "tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.mnemonic";
+  value: "size";
+  //selected: {model.isSimpleCountingMode()};
+  buttonGroup: "copyToSizeTableMode";
+  _help: {"tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.help"};
+}
+
+//obsTable
+
 #simpleCountingNumberPanel {
-  border: { new TitledBorder(null, null) };
+  border: { BorderFactory.createTitledBorder(null, null) };
 }
 
 #simpleCountingNumberLabel {
@@ -261,63 +377,14 @@ ComputableDataEditor {
 
 #dataInFrequenciesWarning {
   actionIcon: warning;
-  border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)};
+  border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)};
   text: "tutti.editSpeciesFrequencies.simpleCountingAndFrequencies";
 }
 
-#simpleCountingModeButton {
-  text: "tutti.editSpeciesFrequencies.field.mode.simpleCounting";
-  toolTipText: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip";
-  i18nMnemonic: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.mnemonic";
-  value: "simpleCountingMode";
-  selected: {model.isSimpleCountingMode()};
-  buttonGroup: "mode";
-  _help: {"tutti.editSpeciesFrequencies.field.mode.simpleCounting.help"};
-}
-
-#frequencyModeButton {
-  text: "tutti.editSpeciesFrequencies.field.mode.frequencyMode";
-  toolTipText: "tutti.editSpeciesFrequencies.field.mode.frequencyMode.tip";
-  i18nMnemonic: "tutti.editSpeciesFrequencies.field.mode.frequencyMode.mnemonic";
-  value: "frequenciesMode";
-  selected: {model.isFrequenciesMode()};
-  buttonGroup: "mode";
-  _help: {"tutti.editSpeciesFrequencies.field.mode.frequencyMode.help"};
-}
-
-#autoGenModeButton {
-  text: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen";
-  toolTipText: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.tip";
-  i18nMnemonic: "tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.mnemonic";
-  value: "autoGenMode";
-  selected: {model.isAutoGenMode()};
-  buttonGroup: "frequenciesMode";
-  _help: {"tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.help"};
-}
-
-#rafaleModeButton {
-  text: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale";
-  toolTipText: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale.tip";
-  i18nMnemonic: "tutti.editSpeciesFrequencies.field.frequencyMode.rafale.mnemonic";
-  value: "rafaleMode";
-  selected: {model.isRafaleMode()};
-  buttonGroup: "frequenciesMode";
-  _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"};
-}
-
-#generateLengthStepsAction {
-  enabled: {model.isCanGenerate()};
-}
-
-#generateButton {
-  action: {generateLengthStepsAction};
-  _help: {"tutti.editSpeciesFrequencies.action.generate.help"};
-}
-
-#addLengthStepCaracteristicButton {
-  action: {addLengthStepCaracteristicAction};
-  enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()};
-  _help: {"tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help"};
+#simpleCountingModeLabel {
+  text: "tutti.editSpeciesFrequencies.label.no.configuration";
+  horizontalAlignment: {JLabel.CENTER};
+  enabled: false;
 }
 
 #cancelButton {
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 b5f8ed3..8ffbc39 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
@@ -1446,12 +1446,23 @@ tutti.editSpeciesFrequencies.askBeforeSave.message=
 tutti.editSpeciesFrequencies.askBeforeSave.title=
 tutti.editSpeciesFrequencies.error.itchyometer.bad.record=
 tutti.editSpeciesFrequencies.error.length.doublon=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.mnemonic=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.tip=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.label=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.mnemonic=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.tip=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.mnemonic=
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.tip=
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen=
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.mnemonic=
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.tip=
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale=
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale.mnemonic=
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale.tip=
+tutti.editSpeciesFrequencies.field.graphAverageWeight=
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=
 tutti.editSpeciesFrequencies.field.maxStep=
@@ -1485,6 +1496,8 @@ tutti.editSpeciesFrequencies.field.totalNumber=
 tutti.editSpeciesFrequencies.field.totalNumber.tip=
 tutti.editSpeciesFrequencies.field.totalWeight=
 tutti.editSpeciesFrequencies.field.totalWeight.tip=
+tutti.editSpeciesFrequencies.field.useRtp=
+tutti.editSpeciesFrequencies.field.useRtp.tip=
 tutti.editSpeciesFrequencies.ichtyometerConnected=
 tutti.editSpeciesFrequencies.label.no.configuration=
 tutti.editSpeciesFrequencies.logTable.header.date=
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 183512f..4837a22 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
@@ -563,7 +563,7 @@ tutti.editBenthosFrequencies.field.mode.autoGen.tip=Mode où toutes les classes
 tutti.editBenthosFrequencies.field.mode.rafale=Mode "rafale"
 tutti.editBenthosFrequencies.field.mode.rafale.mnemonic=l
 tutti.editBenthosFrequencies.field.mode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...)
-tutti.editBenthosFrequencies.field.mode.simpleCounting=Mode simple dénombrement
+tutti.editBenthosFrequencies.field.mode.simpleCounting=Dénombrement
 tutti.editBenthosFrequencies.field.mode.simpleCounting.mnemonic=b
 tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole
 tutti.editBenthosFrequencies.field.rafaleStep=Classe de taille à incrémenter
@@ -1367,12 +1367,23 @@ tutti.editSpeciesFrequencies.askBeforeSave.message=La saisie comporte des classe
 tutti.editSpeciesFrequencies.askBeforeSave.title=Confirmer l'enregistrement des mensurations
 tutti.editSpeciesFrequencies.error.itchyometer.bad.record=La mesure provenant de l'ichtyomètre n'est pas valide (la donnée est peut-être corrompue) \:<br/><ul><li>Enregistrement \: <strong>%s</strong></li><li>CRC \: <strong>%s</strong></li><li>CRC calculé \: <strong>%s</strong></li></ul>
 tutti.editSpeciesFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations.
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all=Tout
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.mnemonic=T
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.all.tip=Tout recopier (tailles et poids)
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.label=Recopier \:
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing=Rien
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.mnemonic=R
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.nothing.tip=Ne rien recopier
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size=Seulement les tailles
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.mnemonic=T
+tutti.editSpeciesFrequencies.field.copyToSizeTableMode.size.tip=Ne recopier que les tailles, pas les poids
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen=Génération des classes
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.mnemonic=G
 tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.tip=\=Mode où toutes les classes de taille sont générées
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale=Mode "rafale"
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale.mnemonic=l
 tutti.editSpeciesFrequencies.field.frequencyMode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...)
+tutti.editSpeciesFrequencies.field.graphAverageWeight=Graphe Poids moyens
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure
 tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus
 tutti.editSpeciesFrequencies.field.maxStep=Classe max
@@ -1398,6 +1409,8 @@ tutti.editSpeciesFrequencies.field.totalNumber=Nombre total
 tutti.editSpeciesFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides
 tutti.editSpeciesFrequencies.field.totalWeight=Poids total
 tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides
+tutti.editSpeciesFrequencies.field.useRtp=Utiliser les RTP
+tutti.editSpeciesFrequencies.field.useRtp.tip=Utiliser les RTP
 tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration >
 tutti.editSpeciesFrequencies.logTable.header.label=Logs
 tutti.editSpeciesFrequencies.logTable.removeRow.confirm.message=Êtes-vous sûr de vouloir supprimer la mesure %s ?

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 02/17: mise en page de l'écran refs #6926

codelutin.com scm