PCA, Score Bar Chart: adjust selection, fix list-out-of bound, layout

Signed-off-by: Lorenz Gerber <[email protected]>

Author: lorenzgerber

chemclipse/plugins/org.eclipse.chemclipse.xxd.process.supplier.pca.ui/src/org/eclipse/chemclipse/xxd/process/supplier/pca/ui/swt/ExtendedScorePlotBarChart.java

@@ -126,6 +126,7 @@ private void createToolbarMain(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalAlignment = SWT.END;
+		gridData.widthHint = 300;
 		composite.setLayoutData(gridData);
 		composite.setLayout(new GridLayout(2, false));
 
@@ -303,6 +304,7 @@ public void handleEvent(BaseChart baseChart, Event event) {
 					IResultsMVA results = evaluationPCA.getResults();
 					List<IResultMVA> resultList = results.getPcaResultList();
 					List<SampleScore> sampleScores = new ArrayList<>();
+
 					for(IResultMVA result : resultList) {
 						ISample sample = result.getSample();
 						double[] scoreMatrix = result.getScoreVector();
@@ -314,16 +316,18 @@ public void handleEvent(BaseChart baseChart, Event event) {
 						}
 					}
 					sampleScores.sort(Comparator.comparingDouble(SampleScore::getScore).reversed());
+					if(pXStart < 0 || pXStop < 0 || pXStop > sampleScores.size()) {
+						userSelection.reset();
+						userSelection.setSingleClick(false);
+						return;
+					}
 					List<ISample> samplesHighlighted = evaluationPCA.getHighlightedSamples();
 					for(int i = pXStart; i <= pXStop; i++) {
 						String currentSampleName = sampleScores.get(i).getSampleName();
 						int index = IntStream.range(0, samplesHighlighted.size()).filter(x -> samplesHighlighted.get(x).getSampleName().equals(currentSampleName)).findFirst().orElse(-1);
 						if(index == -1) {
 							samplesHighlighted.add(samples.getSamples().stream().filter(x -> x.getSampleName().equals(currentSampleName)).findFirst().get());
-						} else {
-							samplesHighlighted.remove(index);
 						}
-
 					}
 
 					if(!samplesHighlighted.isEmpty()) {