From: Diane Trout Date: Fri, 11 Aug 2006 00:20:16 +0000 (+0000) Subject: do a better job of grouping seqbrowser sidebar information. X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=76e6c1a2919259b3d65313edbb72fc27bac86560 do a better job of grouping seqbrowser sidebar information. Add a stretch region so the sequence description information isn't as spread out over the sidebar. --- diff --git a/qui/seqbrowser/SequenceBrowserSidebar.cpp b/qui/seqbrowser/SequenceBrowserSidebar.cpp index 2ac46b1..275b3b4 100644 --- a/qui/seqbrowser/SequenceBrowserSidebar.cpp +++ b/qui/seqbrowser/SequenceBrowserSidebar.cpp @@ -33,6 +33,9 @@ void SequenceBrowserSidebar::setSequences(vector& sequences) //desc->setPosition(track_i->sequence().length()); descriptions.push_back(desc); layout.addWidget(desc); + if ((track_i+1) != sequences.end()) { + layout.addStretch(1); + } } setLayout(&layout); } diff --git a/qui/seqbrowser/SequenceDescription.cpp b/qui/seqbrowser/SequenceDescription.cpp index f62d52b..73efe36 100644 --- a/qui/seqbrowser/SequenceDescription.cpp +++ b/qui/seqbrowser/SequenceDescription.cpp @@ -5,14 +5,14 @@ using namespace std; SequenceDescription::SequenceDescription(QWidget *parent) - : QWidget(parent) + : QFrame(parent) { createWidget(); } SequenceDescription::SequenceDescription(string& name, float length, QWidget *parent) - : QWidget(parent) + : QFrame(parent) { setName(name); setLength(length); @@ -21,8 +21,9 @@ SequenceDescription::SequenceDescription(string& name, float length, void SequenceDescription::createWidget() { + setFrameStyle(QFrame::Panel | QFrame::Sunken); + setLineWidth(1); QLayout *layout = new QVBoxLayout; - layout->setSpacing(2); layout->addWidget(&name_label); layout->addWidget(&length_label); layout->addWidget(&position_label); @@ -32,7 +33,11 @@ void SequenceDescription::createWidget() void SequenceDescription::setLength(float length) { QString s; - if (length > 1000) { + if (length > 1000000) { + length /= 1000000; + s.setNum(length, 'f', 2); + s += "mb"; + } if (length > 1000) { length /= 1000; s.setNum(length, 'f', 2); s += "kb"; diff --git a/qui/seqbrowser/SequenceDescription.hpp b/qui/seqbrowser/SequenceDescription.hpp index 4a2b976..f8a1678 100644 --- a/qui/seqbrowser/SequenceDescription.hpp +++ b/qui/seqbrowser/SequenceDescription.hpp @@ -5,9 +5,9 @@ #include #include -#include +#include -class SequenceDescription : public QWidget +class SequenceDescription : public QFrame { Q_OBJECT