remove annot class in favor of SeqSpan

[mussa.git] / alg / glsequence.cpp

diff --git a/alg/glsequence.cpp b/alg/glsequence.cpp
index eb6cfe94574b49496dea22ca11e8498a5585f377..340a9ada0719b475753e9780fb082fbfe974a5d1 100644 (file)
--- a/alg/glsequence.cpp
+++ b/alg/glsequence.cpp
@@ -256,14 +256,14 @@ void GlSequence::draw_annotations(GLfloat left, GLfloat right) const
 {
   // draw annotations
   GLfloat annotation_z = z() + 10.0;
-  const std::list<annot>& annots = Sequence::annotations();
+  const SeqSpanRefList& annots = Sequence::annotations();
   const MotifList& motifs = Sequence::motifs();
-  for (std::list<annot>::const_iterator annot_itor = annots.begin();
+  for (SeqSpanRefList::const_iterator annot_itor = annots.begin();
        annot_itor != annots.end();
        ++annot_itor)
   {
     glColor3f(0.0, 0.8, 0.0);
-    draw_box(left, right, x()+annot_itor->begin, x()+annot_itor->end, 
+    draw_box(left, right, x()+(*annot_itor)->start(), x()+(*annot_itor)->stop(), 
              height(), annotation_z);
   }
   // if motifs?