From: Diane Trout <diane@caltech.edu>
Date: Wed, 21 Mar 2007 07:29:39 +0000 (+0000)
Subject: Missed part of "Store Sequence sequence location in a shared_ptr class"
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=b9755e1974201ff513c66b0fd684bde330c6fff6

Missed part of "Store Sequence sequence location in a shared_ptr class"

Bad things happen if you let eclipse refactor your _darcs pristine
repository. Modifications that you made don't get recorded.

This patch should make buildbot happy.
---

diff --git a/alg/glsequence.hpp b/alg/glsequence.hpp
index 01b7e05..62014b4 100644
--- a/alg/glsequence.hpp
+++ b/alg/glsequence.hpp
@@ -65,7 +65,7 @@ public:
   boost::shared_ptr<Color> color();
 
   //! how big is a pixel in world coordinats
-  GLfloat get_pixel_width(GLfloat, GLfloat) const;
+  GLfloat pixelWidth(GLfloat, GLfloat) const;
   //! how big is a pixel in world coordinats (specifying viewport size)
   GLfloat pixelWidth(GLfloat, GLfloat, int) const;
 
diff --git a/alg/test/test_glsequence.cpp b/alg/test/test_glsequence.cpp
index 663cde7..37b76ee 100644
--- a/alg/test/test_glsequence.cpp
+++ b/alg/test/test_glsequence.cpp
@@ -56,8 +56,8 @@ BOOST_AUTO_TEST_CASE( glsequence_renderable )
   // way fewer basepairs than viewport pixel width
   BOOST_CHECK_EQUAL(s.is_sequence_renderable( 0, 10, 500), true);
 
-  BOOST_CHECK_CLOSE((double)s.get_pixel_width(0, 100, 100), 1.0, 1e-6);
-  BOOST_CHECK_CLOSE((double)s.get_pixel_width(0, 1000, 100), 10.0, 1e-6);
+  BOOST_CHECK_CLOSE((double)s.pixelWidth(0, 100, 100), 1.0, 1e-6);
+  BOOST_CHECK_CLOSE((double)s.pixelWidth(0, 1000, 100), 10.0, 1e-6);
 }
 
 BOOST_AUTO_TEST_CASE( glsequence_sequence )