projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix problems with motif changes not showing up in sequencebrowser
[mussa.git]
/
alg
/
glsequence.cpp
diff --git
a/alg/glsequence.cpp
b/alg/glsequence.cpp
index 17fb561c830c5cf3fc241a01e8de2353c4cc8691..eb6cfe94574b49496dea22ca11e8498a5585f377 100644
(file)
--- a/
alg/glsequence.cpp
+++ b/
alg/glsequence.cpp
@@
-257,7
+257,7
@@
void GlSequence::draw_annotations(GLfloat left, GLfloat right) const
// draw annotations
GLfloat annotation_z = z() + 10.0;
const std::list<annot>& annots = Sequence::annotations();
// draw annotations
GLfloat annotation_z = z() + 10.0;
const std::list<annot>& annots = Sequence::annotations();
- const
std::list<motif>
& motifs = Sequence::motifs();
+ const
MotifList
& motifs = Sequence::motifs();
for (std::list<annot>::const_iterator annot_itor = annots.begin();
annot_itor != annots.end();
++annot_itor)
for (std::list<annot>::const_iterator annot_itor = annots.begin();
annot_itor != annots.end();
++annot_itor)
@@
-267,7
+267,7
@@
void GlSequence::draw_annotations(GLfloat left, GLfloat right) const
height(), annotation_z);
}
// if motifs?
height(), annotation_z);
}
// if motifs?
- for (
std::list<motif>
::const_iterator motifs_itor = motifs.begin();
+ for (
MotifList
::const_iterator motifs_itor = motifs.begin();
motifs_itor != motifs.end();
++motifs_itor)
{
motifs_itor != motifs.end();
++motifs_itor)
{
@@
-275,7
+275,6
@@
void GlSequence::draw_annotations(GLfloat left, GLfloat right) const
draw_box(left, right, x()+motifs_itor->begin, x()+motifs_itor->end,
height(), annotation_z+1.0);
}
draw_box(left, right, x()+motifs_itor->begin, x()+motifs_itor->end,
height(), annotation_z+1.0);
}
-
}
// this way of drawing characters, came from the red open gl book
}
// this way of drawing characters, came from the red open gl book