X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=alg%2Fglseqbrowser.hpp;h=dcbf4a653fc946b7c113e0329d004dad8a05d9b6;hp=38ede4bc05476ffa32458850db76aafe9ae1e368;hb=8b38b5bc63e5c62983d0814aa75d3f88b9116e49;hpb=4b9dd885cdfef6d73c82bae5f112a063588766a9 diff --git a/alg/glseqbrowser.hpp b/alg/glseqbrowser.hpp index 38ede4b..dcbf4a6 100644 --- a/alg/glseqbrowser.hpp +++ b/alg/glseqbrowser.hpp @@ -69,7 +69,7 @@ public: void centerOnPath(const std::vector&); void setColorMapper(boost::shared_ptr cm); - const AnnotationColors& colorMapper(); + const AnnotationColorsRef colorMapper(); //! clear our tracks and connections void clear(); @@ -208,13 +208,13 @@ private: //! the center of our current viewport (world coord) (used for scrollbar) float viewport_center; double zoom_level; - boost::shared_ptr color_mapper; + AnnotationColorsRef color_mapper; //! counter for each path added to us via connect int pathid; protected: //! container of all the GlSequences loaded into our scene - std::vector > track_container; + std::vector track_container; //! where to draw our box (world coordinates) rect selectedRegion; //! true if we have a selection