Skip to content

Commit 00e4323

Browse files
committed
Fix broken paired end alignment popup text. Fixes igvteam#1003
1 parent 16b25d8 commit 00e4323

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/main/java/org/broad/igv/sam/Alignment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ default void setHaplotypeName(String hap) {}
133133

134134
default Map<Integer, BaseModification> getBaseModificationMap() { return null;}
135135

136-
default String getValueString(double position, int mouseX, AlignmentTrack.RenderOptions renderOptions) {
136+
default String getAlignmentValueString(double position, int mouseX, AlignmentTrack.RenderOptions renderOptions) {
137137
return getValueString(position, mouseX, (WindowFunction) null);
138138
}
139139
}

src/main/java/org/broad/igv/sam/AlignmentTrack.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,8 @@ private void copyToClipboard(final TrackClickEvent e, Alignment alignment, doubl
812812
if (alignment != null) {
813813
StringBuilder buf = new StringBuilder();
814814
buf.append(alignment.getClipboardString(location, mouseX)
815+
.replace("<b>", "")
816+
.replace("</b>", "")
815817
.replace("<br>", "\n")
816818
.replace("<br/>", "\n")
817819
.replace("<hr>", "\n------------------\n")
@@ -964,7 +966,7 @@ public String getValueStringAt(String chr, double position, int mouseX, int mous
964966
} else {
965967
Alignment feature = getAlignmentAt(position, mouseY, frame);
966968
if (feature != null) {
967-
return feature.getValueString(position, mouseX, renderOptions);
969+
return feature.getAlignmentValueString(position, mouseX, renderOptions);
968970
}
969971
}
970972

src/main/java/org/broad/igv/sam/PairedAlignment.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import org.broad.igv.feature.LocusScore;
2929
import org.broad.igv.feature.Strand;
30-
import org.broad.igv.track.WindowFunction;
3130

3231
import java.awt.*;
3332
import java.util.List;
@@ -178,20 +177,20 @@ public byte getPhred(double position) {
178177
* does not "know" from what window function it was derived
179178
*
180179
* @param mouseX
181-
* @param windowFunction
180+
* @param renderOptions
182181
* @return
183182
*/
184-
public String getValueString(double position, int mouseX, WindowFunction windowFunction) {
183+
public String getAlignmentValueString(double position, int mouseX, AlignmentTrack.RenderOptions renderOptions) {
185184
StringBuffer buf = new StringBuffer();
186185
if (secondAlignment != null) {
187186
buf.append("<table><tr><td valign=\"top\">");
188187
}
189188
buf.append("<b>Left alignment</b><br/>");
190-
buf.append(firstAlignment.getValueString(position, mouseX, windowFunction));
189+
buf.append(firstAlignment.getAlignmentValueString(position, mouseX, renderOptions));
191190
if (secondAlignment != null) {
192191
buf.append("</td><td valign=\"top\">");
193192
buf.append("<b>Right alignment</b><br/>");
194-
buf.append(secondAlignment.getValueString(position, mouseX, windowFunction));
193+
buf.append(secondAlignment.getAlignmentValueString(position, mouseX, renderOptions));
195194
buf.append("</td></tr></table>");
196195
}
197196
return buf.toString();

src/main/java/org/broad/igv/sam/SAMAlignment.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.broad.igv.feature.genome.GenomeManager;
4040
import org.broad.igv.prefs.Constants;
4141
import org.broad.igv.prefs.PreferencesManager;
42-
import org.broad.igv.track.WindowFunction;
4342
import org.broad.igv.ui.color.ColorUtilities;
4443

4544
import java.awt.*;
@@ -573,11 +572,11 @@ private static List<CigarOperator> buildOperators(String cigarString) {
573572

574573

575574
public String getClipboardString(double location, int mouseX) {
576-
return getValueString(location, mouseX, (AlignmentTrack.RenderOptions) null);
575+
return getAlignmentValueString(location, mouseX, (AlignmentTrack.RenderOptions) null);
577576
}
578577

579578

580-
public String getValueString(double position, int mouseX, AlignmentTrack.RenderOptions renderOptions) {
579+
public String getAlignmentValueString(double position, int mouseX, AlignmentTrack.RenderOptions renderOptions) {
581580

582581
boolean truncate = renderOptions != null;
583582
int basePosition = (int) position;

0 commit comments

Comments
 (0)