Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
793b6911
by Tony Chemit at 2020-07-10T15:19:26+02:00
-
780acacd
by Tony Chemit at 2020-07-10T15:34:12+02:00
4 changed files:
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss
Changes:
| ... | ... | @@ -82,13 +82,13 @@ public class DataSourceEditorNavigationMenuHandler implements UIHandler<DataSour |
| 82 | 82 |
public void propertyChange(PropertyChangeEvent evt) {
|
| 83 | 83 |
NavigationTreeConfigBean config = ui.getUiModel().getConfig();
|
| 84 | 84 |
boolean withConfig = config != null;
|
| 85 |
- boolean withSeine = withConfig &&config.isShowSeineTrip();
|
|
| 86 |
- boolean withLongline = withConfig &&config.isShowLonglineTrip();
|
|
| 87 |
- |
|
| 88 |
- ui.getMenuNavigationSeine().setEnabled(withSeine && seineEditModel.isEnabled());
|
|
| 89 |
- ui.getMenuNavigationLongline().setEnabled(withLongline && longlineEditModel.isEnabled());
|
|
| 85 |
+ boolean withSeine = withConfig && config.isShowSeineTrip();
|
|
| 86 |
+ boolean withLongline = withConfig && config.isShowLonglineTrip();
|
|
| 90 | 87 |
|
| 91 | 88 |
boolean showReferential = withConfig && config.isShowReferential();
|
| 89 |
+ ui.getMenuNavigationSeine().setEnabled(withSeine && (showReferential || seineEditModel.isEnabled()));
|
|
| 90 |
+ ui.getMenuNavigationLongline().setEnabled(withLongline && (showReferential || longlineEditModel.isEnabled()));
|
|
| 91 |
+ |
|
| 92 | 92 |
ui.getSelectCommonReferential().setEnabled(showReferential);
|
| 93 | 93 |
|
| 94 | 94 |
boolean seineNewValue = showReferential && withSeine;
|
| ... | ... | @@ -39,7 +39,7 @@ |
| 39 | 39 |
layout:{new GridLayout(0,1)};
|
| 40 | 40 |
}
|
| 41 | 41 |
|
| 42 |
-#acquisitionModeIndividualal {
|
|
| 42 |
+#acquisitionModeIndividual {
|
|
| 43 | 43 |
buttonGroup:acquisitionModeGroup;
|
| 44 | 44 |
value:{CatchAcquisitionMode.INDIVIDUAL};
|
| 45 | 45 |
text:{CatchAcquisitionMode.INDIVIDUAL.toString()};
|
| ... | ... | @@ -138,7 +138,7 @@ |
| 138 | 138 |
<cell columns="2">
|
| 139 | 139 |
<!-- acquisition Mode -->
|
| 140 | 140 |
<JPanel id='acquisitionModePanel'>
|
| 141 |
- <JRadioButton id='acquisitionModeIndividualal'/>
|
|
| 141 |
+ <JRadioButton id='acquisitionModeIndividual'/>
|
|
| 142 | 142 |
<JRadioButton id='acquisitionModeGrouped'/>
|
| 143 | 143 |
</JPanel>
|
| 144 | 144 |
</cell>
|
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 |
layout:{new GridLayout(0,1)};
|
| 42 | 42 |
}
|
| 43 | 43 |
|
| 44 |
-#acquisitionModeIndividualal {
|
|
| 44 |
+#acquisitionModeIndividual {
|
|
| 45 | 45 |
buttonGroup:acquisitionModeGroup;
|
| 46 | 46 |
value:{CatchAcquisitionMode.INDIVIDUAL};
|
| 47 | 47 |
text:{CatchAcquisitionMode.INDIVIDUAL.toString()};
|