dont draw sequence box when we can see sequence text

[mussa.git] / alg / glsequence.hpp

diff --git a/alg/glsequence.hpp b/alg/glsequence.hpp
index 190401a956644ddc3aed36af42857be5bba7715f..a2b5704a66024f0e6b61f7749d6126b4e9e8fffe 100644 (file)
--- a/alg/glsequence.hpp
+++ b/alg/glsequence.hpp
@@ -36,7 +36,15 @@ public:
   static DrawableRef copy_drawable(DrawableRef s);
   
   //! search through sequence and add an annotation highlighting all the non AGCT characters
-  void add_annotations_for_undefined_sequence(Drawable::draw_func_ptr draw=0);
+  void add_annotations_for_defined_sequence(Drawable::draw_func_ptr draw=0);
+  /**!search through our annotations and set the draw function for a particular "type"
+   * this is really a temporary solution to configuring annotation display styles
+   */
+  void update_annotation_draw_function(
+         std::string type, 
+         Drawable::draw_func_ptr draw, 
+         ColorRef color
+       );
   //! set our starting x (horizontal) coordinate
   void setX(float x);
   //! get our starting x (horizontal) coordinate
@@ -56,6 +64,11 @@ public:
   const ColorRef color() const;
   //! return our draw color
   ColorRef color();
+  //! return default gene color
+  static ColorRef default_gene_color();
+  //! return default track color
+  static ColorRef default_track_color();
+  
   //! return our annotation color mapper
   AnnotationColorsRef colorMapper() { return color_mapper; }
 
@@ -63,7 +76,8 @@ public:
   static
   void draw_box(GLfloat world_left, GLfloat world_right, 
                 GLfloat left, GLfloat right, GLfloat height,
-                GLfloat y, GLfloat z);
+                GLfloat y, GLfloat z,
+                GLint primitive=GL_QUADS);
   //! draw a track 
   /*! left and right are the edges of the current viewport
    */
@@ -96,7 +110,7 @@ public:
   static GLfloat pixelWidth(GLfloat, GLfloat, int);
 
   //! are we close enough that it would make sense to view the base pairs?
-  bool is_sequence_renderable(GLfloat left, GLfloat right) const;
+  static bool is_sequence_renderable(GLfloat left, GLfloat right);
   //! are we close enough that it would make sense to view the base pairs?
   /*! though we don't actually check to see if there's sequence in our
    *  view, just that there's enough pixels to render something if 
@@ -106,19 +120,20 @@ public:
    *             coordinates
    *  \param[in] pixel_width allow setting the current viewport pixel width
    */
-  bool is_sequence_renderable(GLfloat, GLfloat, int) const;
+  static bool is_sequence_renderable(GLfloat, GLfloat, int);
 
   friend bool operator==(const GlSequence &left, const GlSequence &right);
 
 protected:
   AnnotationColorsRef color_mapper;
-  const GLfloat char_pix_per_world_unit;
 
   //! initalize a SeqSpanRef covering start, count
-  SeqSpanRef make_undefined_sequence_annotation(
+  SeqSpanRef make_drawable_annotation(
     Drawable::draw_func_ptr draw,
+    std::string name,
     size_type start,
-    size_type count);
+    size_type count,
+    ColorRef color);
 
   //! draw sequence as a bar
   void draw_track(GLfloat, GLfloat) const;
@@ -129,5 +144,8 @@ protected:
   void draw_sequence(GLfloat, GLfloat) const;
 };
 
+//! draw sequence track when we're far enough out not to see the AGCTs. 
+void draw_summarized_track(SeqSpanRef ref, float left, float right);
+//! draw a 1/4 width centered track 
 void draw_narrow_track(SeqSpanRef ref, float left, float right);
 #endif