Store Sequence sequence location in a shared_ptr class

[mussa.git] / py / gl.py

diff --git a/py/gl.py b/py/gl.py
index a9d675b7afa5140676cb1d0841d7db43e694bdde..d1e5645fd6506dd9e4cf981b8947ac8959c78ca5 100644 (file)
--- a/py/gl.py
+++ b/py/gl.py
@@ -9,11 +9,21 @@ import mussa
   
 class pyMussaGL:
   def __init__(self):
+    """Initalize our data and our glut window"""
+    # make up a simple sequence
     self.s = "AAGGCCTT" * 5
     self.seq = mussa.Sequence(self.s)
-    self.glseq = mussa.GlSequence(self.seq)
-    print self.glseq.width
 
+    # add our annotation
+    annot = mussa.annot(0, 5, "name", "type")
+    self.seq.add_annotation(annot)
+
+    # AnnotationColors is required, even though it'd be nice
+    # if it were optional
+    self.glseq = mussa.GlSequence(self.seq, mussa.AnnotationColors())
+    assert len(self.s) == self.glseq.size
+
+    # set up opengl buffer
     glutInit(sys.argv)
     glutInitDisplayMode(GLUT_RGBA | GLUT_DEPTH )
     glutCreateWindow('mussa')
@@ -25,8 +35,9 @@ class pyMussaGL:
     print "init done"
   
   def display(self):
+    """Update showing buffer"""
     glClear(GL_COLOR_BUFFER_BIT)
-    self.glseq.draw(-50, self.glseq.width+50)
+    self.glseq.draw(-50, self.glseq.size+50)
     #glutSwapBuffers()
 
 if __name__ == "__main__":