From 9fb7b1373f1a18bd8efc8c0baed1c8701d99bab1 Mon Sep 17 00:00:00 2001
From: tcarver <tjc>
Date: Fri, 17 Aug 2012 14:30:59 +0100
Subject: [PATCH] updates for base similarity
---
.../sanger/artemis/components/variant/GraphPanel.java | 10 +++++++---
uk/ac/sanger/artemis/components/variant/VCFview.java | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/variant/GraphPanel.java b/uk/ac/sanger/artemis/components/variant/GraphPanel.java
index 654118587..a5a746c39 100644
--- a/uk/ac/sanger/artemis/components/variant/GraphPanel.java
+++ b/uk/ac/sanger/artemis/components/variant/GraphPanel.java
@@ -124,20 +124,24 @@ public class GraphPanel extends JPanel
plot(g2, Color.red, windowSize, plot, pixPerBase, max, -1);
}
+ DecimalFormat df;
final String maxStr;
if(type == 2)
{
if(max == 0)
return;
- DecimalFormat df = new DecimalFormat("0.#");
+ df = new DecimalFormat("0.#");
maxStr = df.format(100 - ((float)max/(float)windowSize *100.f));
}
else
- maxStr = TYPES[type] + " : " + max;
+ {
+ df = new DecimalFormat("0.0###");
+ maxStr = TYPES[type] + ": " + df.format((float)max/(float)windowSize);
+ }
FontMetrics fm = getFontMetrics(getFont());
g2.setColor(Color.black);
- int xpos = getWidth() - fm.stringWidth(maxStr) - 10;
+ int xpos = getWidth() - fm.stringWidth(maxStr) - 8;
g2.drawString(maxStr, xpos,
(type == 2 ? getHeight()-fm.getHeight() : fm.getHeight()));
}
diff --git a/uk/ac/sanger/artemis/components/variant/VCFview.java b/uk/ac/sanger/artemis/components/variant/VCFview.java
index bcd12daa8..dc7dc9316 100644
--- a/uk/ac/sanger/artemis/components/variant/VCFview.java
+++ b/uk/ac/sanger/artemis/components/variant/VCFview.java
@@ -572,7 +572,7 @@ public class VCFview extends JPanel
final JCheckBoxMenuItem graphSNP = new JCheckBoxMenuItem("SNP");
final JCheckBoxMenuItem graphDP = new JCheckBoxMenuItem("Depth (DP)");
- final JCheckBoxMenuItem graphSim = new JCheckBoxMenuItem("Base Similarity");
+ final JCheckBoxMenuItem graphSim = new JCheckBoxMenuItem("Base Similarity (%)");
graph.add(graphSNP);
graphSNP.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e)
--
GitLab