projects
/
samtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.1.12a
[samtools.git]
/
bam_tview.c
diff --git
a/bam_tview.c
b/bam_tview.c
index 4c121e7cbfa012ac0c3fa61d574f03c893e6d271..e48afa7bd4add26404fecc04d6548e7b3989927b 100644
(file)
--- a/
bam_tview.c
+++ b/
bam_tview.c
@@
-109,7
+109,7
@@
int tv_pl_func(uint32_t tid, uint32_t pos, int n, const bam_pileup1_t *pl, void
if (tv->is_dot && toupper(c) == toupper(rb)) c = bam1_strand(p->b)? ',' : '.';
}
}
if (tv->is_dot && toupper(c) == toupper(rb)) c = bam1_strand(p->b)? ',' : '.';
}
}
- } else c = '*';
+ } else c =
p->is_refskip? (bam1_strand(p->b)? '<' : '>') :
'*';
} else { // padding
if (j > p->indel) c = '*';
else { // insertion
} else { // padding
if (j > p->indel) c = '*';
else { // insertion
@@
-280,7
+280,7
@@
int tv_draw_aln(tview_t *tv, int tid, int pos)
static void tv_win_goto(tview_t *tv, int *tid, int *pos)
{
static void tv_win_goto(tview_t *tv, int *tid, int *pos)
{
- char str[256];
+ char str[256]
, *p
;
int i, l = 0;
wborder(tv->wgoto, '|', '|', '-', '-', '+', '+', '+', '+');
mvwprintw(tv->wgoto, 1, 2, "Goto: ");
int i, l = 0;
wborder(tv->wgoto, '|', '|', '-', '-', '+', '+', '+', '+');
mvwprintw(tv->wgoto, 1, 2, "Goto: ");
@@
-291,10
+291,18
@@
static void tv_win_goto(tview_t *tv, int *tid, int *pos)
--l;
} else if (c == KEY_ENTER || c == '\012' || c == '\015') {
int _tid = -1, _beg, _end;
--l;
} else if (c == KEY_ENTER || c == '\012' || c == '\015') {
int _tid = -1, _beg, _end;
- bam_parse_region(tv->header, str, &_tid, &_beg, &_end);
- if (_tid >= 0) {
- *tid = _tid; *pos = _beg;
- return;
+ if (str[0] == '=') {
+ _beg = strtol(str+1, &p, 10) - 1;
+ if (_beg > 0) {
+ *pos = _beg;
+ return;
+ }
+ } else {
+ bam_parse_region(tv->header, str, &_tid, &_beg, &_end);
+ if (_tid >= 0) {
+ *tid = _tid; *pos = _beg;
+ return;
+ }
}
} else if (isgraph(c)) {
if (l < TV_MAX_GOTO) str[l++] = c;
}
} else if (isgraph(c)) {
if (l < TV_MAX_GOTO) str[l++] = c;
@@
-351,6
+359,7
@@
void tv_loop(tview_t *tv)
case '?': tv_win_help(tv); break;
case '\033':
case 'q': goto end_loop;
case '?': tv_win_help(tv); break;
case '\033':
case 'q': goto end_loop;
+ case '/':
case 'g': tv_win_goto(tv, &tid, &pos); break;
case 'm': tv->color_for = TV_COLOR_MAPQ; break;
case 'b': tv->color_for = TV_COLOR_BASEQ; break;
case 'g': tv_win_goto(tv, &tid, &pos); break;
case 'm': tv->color_for = TV_COLOR_MAPQ; break;
case 'b': tv->color_for = TV_COLOR_BASEQ; break;