X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=qui%2Fseqbrowser%2FSequenceBrowserWidget.cpp;h=7ccf966ab9962ea57cfb663a1ee791c264c5d3a5;hp=c10136ec090c2922029e6366a19beff23f702a53;hb=8b38b5bc63e5c62983d0814aa75d3f88b9116e49;hpb=4b9dd885cdfef6d73c82bae5f112a063588766a9 diff --git a/qui/seqbrowser/SequenceBrowserWidget.cpp b/qui/seqbrowser/SequenceBrowserWidget.cpp index c10136e..7ccf966 100644 --- a/qui/seqbrowser/SequenceBrowserWidget.cpp +++ b/qui/seqbrowser/SequenceBrowserWidget.cpp @@ -70,7 +70,6 @@ QSize SequenceBrowserWidget::sizeHint() const return QSize(width, center.height()); } - void SequenceBrowserWidget::clear() { converted_sequences.clear(); @@ -122,17 +121,17 @@ void SequenceBrowserWidget::copySelectedTracksAsSeqLocation( } void SequenceBrowserWidget::setSequences( - const std::vector >& sequences, - boost::shared_ptr cm) + const std::vector& new_sequences, + AnnotationColorsRef cm) { SequenceBrowser& browser = scrollable_browser->browser(); clear(); - for(Mussa::vector_sequence_type::const_iterator seq_i = sequences.begin(); - seq_i != sequences.end(); + for(Mussa::vector_sequence_type::const_iterator seq_i = new_sequences.begin(); + seq_i != new_sequences.end(); ++seq_i) { // Blech *(*seq_i) is dereferencing the shared_ptr stored in the iterator. - boost::shared_ptr gs(new GlSequence(*(*seq_i), cm)); + boost::shared_ptr gs(new GlSequence(*seq_i, cm)); converted_sequences.push_back(gs); browser.push_sequence(gs); } @@ -142,7 +141,7 @@ void SequenceBrowserWidget::setSequences( // connect the text change signals to each other SequenceBrowserSidebar::collection left = left_sidebar->descriptions; SequenceBrowserSidebar::collection right = right_sidebar->descriptions; - for(size_t i = 0; i != sequences.size() and i != right.size(); ++i) + for(size_t i = 0; i != new_sequences.size() and i != right.size(); ++i) { connect(left[i], SIGNAL(nameChanged(const QString &)), right[i], SLOT(setName(const QString &)));