test MotifModel and MotifElement

[mussa.git] / qui / motif_editor / MotifModel.cpp

diff --git a/qui/motif_editor/MotifModel.cpp b/qui/motif_editor/MotifModel.cpp
index 81bd954c5fc02a42cd2b4407c18761588a615976..d07798abd3f1241591b5892aa60ecf265f6cab89 100644 (file)
--- a/qui/motif_editor/MotifModel.cpp
+++ b/qui/motif_editor/MotifModel.cpp
@@ -2,25 +2,29 @@
 
 #include <QColor>
 
+const size_t MotifModel::model_column_size = 4;
+
 MotifModel::MotifModel(MussaRef m, QObject *parent) 
-  : QAbstractTableModel(parent)
+  : analysis(m),
+    QAbstractTableModel(parent)
 {
   const std::set<Sequence>& motif_set = m->motifs();
   boost::shared_ptr<AnnotationColors> cm = m->colorMapper();
   
-  if (motif_set.size() == 0) {
-    push_empty();
-  } else {
-    std::set<Sequence>::const_iterator motif_i;
-    for(motif_i = motif_set.begin();
-        motif_i != motif_set.end();
-        ++motif_i)
-    {
-      // ideally we'd know what the motif color was?
-      MotifElement new_element(*motif_i, cm->lookup("motif", motif_i->get_sequence()));
-      push_back(new_element);
-    }
+  std::set<Sequence>::const_iterator motif_i;
+  for(motif_i = motif_set.begin();
+      motif_i != motif_set.end();
+      ++motif_i)
+  {
+    // ideally we'd know what the motif color was?
+    MotifElement new_element(*motif_i, cm->lookup("motif", motif_i->get_sequence()));
+    push_back(new_element);
   }
+  push_empty();
+}
+
+const MussaRef MotifModel::getAnalysis() const {
+  return analysis;
 }
 
 void MotifModel::assign(
@@ -122,7 +126,7 @@ MotifModel::rowCount( const QModelIndex& parent) const
 int 
 MotifModel::columnCount(const QModelIndex& parent) const
 {
-  return 4;
+  return model_column_size;
 }
 
 QVariant 
@@ -134,7 +138,7 @@ MotifModel::data(const QModelIndex &index, int role) const
   if (index.row() >= motifs.size())
     return QVariant();
 
-  if (index.column() >= 4)
+  if (index.column() >= model_column_size)
     return QVariant();
 
   const MotifElement& motif = motifs[index.row()];