diff --git a/uk/ac/sanger/artemis/components/alignment/BamView.java b/uk/ac/sanger/artemis/components/alignment/BamView.java index b489c8b0963725ee79ce5b18d8e614dcc289f976..6f11ad392c7a2995ff6f9dc6490ba4097f71c1db 100644 --- a/uk/ac/sanger/artemis/components/alignment/BamView.java +++ b/uk/ac/sanger/artemis/components/alignment/BamView.java @@ -2181,7 +2181,12 @@ public class BamView extends JPanel Box yBox = Box.createVerticalBox(); yBox.add(overlap); yBox.add(spliced); - JOptionPane.showMessageDialog(null, yBox, "Read Count Option", JOptionPane.INFORMATION_MESSAGE); + + final ReadCountDialog opts = new ReadCountDialog(new JFrame(), + "Read Count Options", feature_display, yBox); + if(opts.getStatus() == -1) + return; + //JOptionPane.showMessageDialog(null, yBox, "Read Count Option", JOptionPane.INFORMATION_MESSAGE); new MappedReads(features, (String)combo.getSelectedItem(), samFileReaderHash, bamList, seqNames, offsetLengths, concatSequences, seqLengths, @@ -2211,9 +2216,12 @@ public class BamView extends JPanel if(seqLengths.size() > 1) yBox.add(allRefSeqs); - - JOptionPane.showMessageDialog(null, yBox, "Read Count Option", JOptionPane.INFORMATION_MESSAGE); - + + final ReadCountDialog opts = new ReadCountDialog(new JFrame(), + "RPKM Options", feature_display, yBox); + if(opts.getStatus() == -1) + return; + int seqlen = 0; if(feature_display != null) seqlen = feature_display.getSequenceLength(); diff --git a/uk/ac/sanger/artemis/components/alignment/MappedReads.java b/uk/ac/sanger/artemis/components/alignment/MappedReads.java index 4ff56d52196b3154365893cb94e2ce9d791b1f15..577a64d9d1ebbdeea57eaae4767de056cc44daaf 100644 --- a/uk/ac/sanger/artemis/components/alignment/MappedReads.java +++ b/uk/ac/sanger/artemis/components/alignment/MappedReads.java @@ -220,7 +220,7 @@ public class MappedReads sampleCounts.add(cnt); } - featureReadCount.put(f.getSystematicName(), sampleCounts); + featureReadCount.put(ReadCountDialog.getFeatureName(f), sampleCounts); } return null; }