Use the right return type

[mussa.git] / alg / glsequence.hpp

diff --git a/alg/glsequence.hpp b/alg/glsequence.hpp
index af1e14c569e3b9dc0359005bfc2d3c8b6e5370e3..8243640ae19544b9b8e2dd1d241e466d84a33050 100644 (file)
--- a/alg/glsequence.hpp
+++ b/alg/glsequence.hpp
@@ -86,7 +86,7 @@ public:
   //! get our right (horizontal) coordinate (size-x)
   float right() const;
   //! how long is our sequence track? (computed from the sequence)
-  GLfloat size() const;
+  Sequence::size_type size() const;
  
   //! return the left (lowest) base index that is fully visible
   Sequence::size_type leftbase(GLfloat left) const;
@@ -110,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 
@@ -120,13 +120,12 @@ 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_drawable_annotation(
@@ -145,6 +144,8 @@ protected:
   void draw_sequence(GLfloat, GLfloat) const;
 };
 
-void draw_track(SeqSpanRef ref, float left, float right);
+//! 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