better sidebar rendering

This should fix the problems with the sidebar's output getting messed up,
(ala ticket:39) also it outputs the species name

diff --git a/alg/sequence.cpp b/alg/sequence.cpp
index 4e0b4789e81784bbfbb7200ebda4d7e2078e846f..439fcb9ecf53ee17196547de4d559692f47493e9 100644 (file)
--- a/alg/sequence.cpp
+++ b/alg/sequence.cpp
@@ -302,6 +302,11 @@ Sequence::load_annot(string file_path, int start_index, int end_index)
   }
 }
 
+const std::string& Sequence::get_species() const
+{
+  return species;
+}
+
 bool Sequence::empty() const
 {
   return (size() == 0);

diff --git a/alg/sequence.hpp b/alg/sequence.hpp
index bd2b864df124fd0ce72db5fbfc6f00adf9188017..85fd692fa02475d9c369cd1dcb836500ad3d1966 100644 (file)
--- a/alg/sequence.hpp
+++ b/alg/sequence.hpp
@@ -91,6 +91,7 @@ class Sequence
     void load_annot(const std::string file_path, int start_index, int end_index);
     const std::list<annot>& annotations() const;
     const std::list<motif>& motifs() const;
+    const std::string& get_species() const;
 
     // simple access functions
     void set_seq(const std::string& a_seq);

diff --git a/qui/seqbrowser/SequenceBrowserSidebar.cpp b/qui/seqbrowser/SequenceBrowserSidebar.cpp
index b09a8589c210c292cd7a9532de562b78e81b89e7..2ac46b1dcbd23de5091932da8b4be9fafff47b99 100644 (file)
--- a/qui/seqbrowser/SequenceBrowserSidebar.cpp
+++ b/qui/seqbrowser/SequenceBrowserSidebar.cpp
@@ -15,6 +15,7 @@ void SequenceBrowserSidebar::clear()
        ++desc_i)
   {
     layout.removeWidget(*desc_i);
+    delete *desc_i;
   }
   descriptions.clear();
 }
@@ -27,7 +28,7 @@ void SequenceBrowserSidebar::setSequences(vector<GlSequence>& sequences)
        ++track_i)
   {
     SequenceDescription *desc = new SequenceDescription(this);
-    //disc->setName(track_i->sequence().name());
+    desc->setName(track_i->sequence().get_species());
     desc->setLength(track_i->sequence().length());
     //desc->setPosition(track_i->sequence().length());
     descriptions.push_back(desc);

diff --git a/qui/seqbrowser/SequenceDescription.hpp b/qui/seqbrowser/SequenceDescription.hpp
index 88e01efde8b940d9a64c878984474c44323f974d..4a2b9766479d5c669c5be2899127dbbf2a3ab3b6 100644 (file)
--- a/qui/seqbrowser/SequenceDescription.hpp
+++ b/qui/seqbrowser/SequenceDescription.hpp
@@ -15,7 +15,7 @@ public:
   SequenceDescription(QWidget *parent=0);
   SequenceDescription(std::string& name, float length, QWidget *parent=0);
 
-  void setName(std::string& name) { name_label.setText(name.c_str()); }
+  void setName(const std::string& name) { name_label.setText(name.c_str()); }
   void setLength(float length);
   void setPosition(int pos) { QString s; position_label.setText(s.setNum(pos));}