git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2189 source formatting
[jalview.git]
/
src
/
jalview
/
renderer
/
ScaleRenderer.java
diff --git
a/src/jalview/renderer/ScaleRenderer.java
b/src/jalview/renderer/ScaleRenderer.java
index
7f1e074
..
82536d4
100644
(file)
--- a/
src/jalview/renderer/ScaleRenderer.java
+++ b/
src/jalview/renderer/ScaleRenderer.java
@@
-34,6
+34,22
@@
import java.util.List;
*/
public class ScaleRenderer
{
*/
public class ScaleRenderer
{
+ public final class ScaleMark
+ {
+ public final boolean major;
+
+ public final int column;
+
+ public final String text;
+
+ ScaleMark(boolean isMajor, int col, String txt)
+ {
+ major = isMajor;
+ column = col;
+ text = txt;
+ }
+ }
+
/**
* calculate positions markers on the alignment ruler
*
/**
* calculate positions markers on the alignment ruler
*
@@
-42,15
+58,13
@@
public class ScaleRenderer
* left-most column in visible view
* @param endx
* - right-most column in visible view
* left-most column in visible view
* @param endx
* - right-most column in visible view
- * @return List { Object { .. } } Boolean: true/false for major/minor mark,
- * Integer: marker position in alignment column coords, String: null
- * or a String to be rendered at the position.
+ * @return List of ScaleMark holding boolean: true/false for major/minor mark,
+ * marker position in alignment column coords, a String to be rendered
+ * at the position (or null)
*/
*/
- public static List<Object[]> calculateMarks(AlignViewportI av,
- int startx, int endx)
+ public List<ScaleMark> calculateMarks(AlignViewportI av, int startx,
+ int endx)
{
{
- new ArrayList<Object[]>();
-
int scalestartx = (startx / 10) * 10;
SequenceI refSeq = av.getAlignment().getSeqrep();
int scalestartx = (startx / 10) * 10;
SequenceI refSeq = av.getAlignment().getSeqrep();
@@
-72,13
+86,12
@@
public class ScaleRenderer
{
scalestartx += 5;
}
{
scalestartx += 5;
}
- List<Object[]> marks = new ArrayList<Object[]>();
+ List<ScaleMark> marks = new ArrayList<ScaleMark>();
String string;
int refN, iadj;
// todo: add a 'reference origin column' to set column number relative to
for (int i = scalestartx; i < endx; i += 5)
{
String string;
int refN, iadj;
// todo: add a 'reference origin column' to set column number relative to
for (int i = scalestartx; i < endx; i += 5)
{
- Object[] amark = new Object[3];
if (((i - refSp) % 10) == 0)
{
if (refSeq == null)
if (((i - refSp) % 10) == 0)
{
if (refSeq == null)
@@
-106,18
+119,12
@@
public class ScaleRenderer
string = String.valueOf(refN) + refSeq.getCharAt(iadj);
}
}
string = String.valueOf(refN) + refSeq.getCharAt(iadj);
}
}
- amark[0] = Boolean.TRUE;
- amark[1] = Integer.valueOf(i - startx - 1);
- amark[2] = string;
-
+ marks.add(new ScaleMark(true, i - startx - 1, string));
}
else
{
}
else
{
- amark[0] = Boolean.FALSE;
- amark[1] = Integer.valueOf(i - startx - 1);
- amark[2] = null;
+ marks.add(new ScaleMark(false, i - startx - 1, null));
}
}
- marks.add(amark);
}
return marks;
}
}
return marks;
}