231 |
231 |
|
232 |
232 |
void toggleTreeFlat(boolean isTree, Button btnToggleFlat, Button btnToggleTree, Button btnCollapseAll, Button btnExpandAll, Button btnFreezeSuppInfo) {
|
233 |
233 |
isTreeView = isTree;
|
234 |
|
createTable(isTree, freezeLayer.isFrozen());
|
|
234 |
createTable(isTree, freezeLayer.isFrozen(), true);
|
235 |
235 |
btnToggleFlat.setEnabled(isTree);
|
236 |
236 |
btnToggleTree.setEnabled(!isTree);
|
237 |
237 |
btnCollapseAll.setEnabled(isTree);
|
... | ... | |
242 |
242 |
return isTreeView;
|
243 |
243 |
}
|
244 |
244 |
|
245 |
|
public void createTable(boolean treeView, boolean freezeSupplementalColumns){
|
|
245 |
public void createTable(boolean treeView, boolean freezeSupplementalColumns, boolean isInitialExpandToDeepestTaxonLevel){
|
246 |
246 |
/**
|
247 |
247 |
* layers
|
248 |
248 |
*/
|
... | ... | |
279 |
279 |
natTable.doCommand(new ClientAreaResizeCommand(natTable));
|
280 |
280 |
|
281 |
281 |
// expand all taxa
|
282 |
|
Integer deepestTaxonLevel = treeFormat.getDeepestTaxonLevel();
|
283 |
|
if(deepestTaxonLevel!=null){
|
284 |
|
natTable.doCommand(new TreeExpandToLevelCommand(deepestTaxonLevel-2));
|
|
282 |
if(isInitialExpandToDeepestTaxonLevel){
|
|
283 |
Integer deepestTaxonLevel = treeFormat.getDeepestTaxonLevel();
|
|
284 |
if(deepestTaxonLevel!=null){
|
|
285 |
natTable.doCommand(new TreeExpandToLevelCommand(deepestTaxonLevel-2));
|
|
286 |
}
|
285 |
287 |
}
|
286 |
288 |
|
287 |
289 |
// clean up table state
|
... | ... | |
652 |
654 |
propertyToLabelMap.put(property, label);
|
653 |
655 |
}
|
654 |
656 |
|
655 |
|
public void loadDescriptions(UUID descriptiveDataSetUuid) {
|
|
657 |
public void loadDescriptions(UUID descriptiveDataSetUuid, boolean isInitialExpandToDeepestTaxonLevel) {
|
656 |
658 |
UUID monitorUuid = CdmApplicationState.getLongRunningTasksService().monitGetRowWrapper(descriptiveDataSetUuid);
|
657 |
659 |
|
658 |
660 |
final Collection<RowWrapperDTO> wrappers = new ArrayList<>();
|
... | ... | |
704 |
706 |
}
|
705 |
707 |
descriptions.clear();
|
706 |
708 |
wrappers.stream().filter(row->row.getTaxonNode()!=null).forEach(wrapper->CharacterMatrix.this.descriptions.add(wrapper));
|
707 |
|
loadingDone();
|
|
709 |
loadingDone(isInitialExpandToDeepestTaxonLevel);
|
708 |
710 |
});
|
709 |
711 |
}
|
710 |
712 |
});
|
... | ... | |
722 |
724 |
return new StructuredSelection(selectedObjects);
|
723 |
725 |
}
|
724 |
726 |
|
725 |
|
private void loadingDone() {
|
|
727 |
private void loadingDone(boolean isInitialExpandToDeepestTaxonLevel) {
|
726 |
728 |
this.part.loadingDone();
|
727 |
|
createTable(isTreeView, freezeLayer.isFrozen());
|
|
729 |
createTable(isTreeView, freezeLayer.isFrozen(), isInitialExpandToDeepestTaxonLevel);
|
728 |
730 |
}
|
729 |
731 |
|
730 |
732 |
public List<TermDto> getSupportedStatesForCategoricalFeature(Feature feature){
|
ref #8450 Fix initial expansion state when refreshing matrix