From 90dad57dbc2c2cc8c9c77be3e3e2935fc7d7ecdc Mon Sep 17 00:00:00 2001 From: James Procter Date: Mon, 20 Mar 2023 15:30:39 +0000 Subject: [PATCH] JAL-2349 JAL-4134 Console log messages for contact matrix selection --- src/jalview/gui/AnnotationPanel.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 13c0e5a..eeda585 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -621,12 +621,14 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, { int[] rowIndex = getRowIndexAndOffset(evt.getY(), av.getAlignment().getAlignmentAnnotation()); - int yOffset = rowIndex[1]; - if (rowIndex == null) { - System.err.println("IMPLEMENTATION ERROR: matrix click out of range."); + jalview.bin.Console + .error("IMPLEMENTATION ERROR: matrix click out of range."); + return false; } + int yOffset = rowIndex[1]; + AlignmentAnnotation clicked = av.getAlignment() .getAlignmentAnnotation()[rowIndex[0]]; if (clicked.graph != AlignmentAnnotation.CONTACT_MAP) @@ -1009,12 +1011,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, if (rowIndex == null || toRowIndex == null) { - System.out.println("Drag out of range. needs to be clipped"); + jalview.bin.Console.trace("Drag out of range. needs to be clipped"); } if (rowIndex[0] != toRowIndex[0]) { - System.out.println("Drag went to another row. needs to be clipped"); + jalview.bin.Console.trace("Drag went to another row. needs to be clipped"); } // rectangular selection on matrix style annotation @@ -1041,13 +1043,13 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, rowIndex[1] - deltaY); // mark rectangular region formed by drag - System.err.println("Matrix Selection from last(" + fromXc + ",[" + jalview.bin.Console.trace("Matrix Selection from last(" + fromXc + ",[" + lastXci.cStart + "," + lastXci.cEnd + "]) to cur(" + toXc + ",[" + cXci.cStart + "," + cXci.cEnd + "])"); int fr, to; fr = Math.min(lastXci.cStart, lastXci.cEnd); to = Math.max(lastXci.cStart, lastXci.cEnd); - System.err.println("Marking " + fr + " to " + to); + jalview.bin.Console.trace("Marking " + fr + " to " + to); for (int c = fr; c <= to; c++) { if (cma.sequenceRef != null) @@ -1062,7 +1064,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, } fr = Math.min(cXci.cStart, cXci.cEnd); to = Math.max(cXci.cStart, cXci.cEnd); - System.err.println("Marking " + fr + " to " + to); + jalview.bin.Console.trace("Marking " + fr + " to " + to); for (int c = fr; c <= to; c++) { if (cma.sequenceRef != null) @@ -1078,7 +1080,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, fr = Math.min(lastX, currentX); to = Math.max(lastX, currentX); - System.err.println("Marking " + fr + " to " + to); + jalview.bin.Console.trace("Marking " + fr + " to " + to); for (int c = fr; c <= to; c++) { av.getColumnSelection().addElement(c); -- 1.7.10.2