test motif editor

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

diff --git a/qui/motif_editor/MotifEditor.cpp b/qui/motif_editor/MotifEditor.cpp
index e5e559eeb04bcbea5b5abe51be3ac5491993d5c6..acde2d3af74c8a756bb9e05f4855748215f69138 100644 (file)
--- a/qui/motif_editor/MotifEditor.cpp
+++ b/qui/motif_editor/MotifEditor.cpp
@@ -9,19 +9,21 @@ using namespace std;
 MotifEditor::MotifEditor(MussaRef m, QWidget *parent)
   : QWidget(parent),
     analysis(m),
-    editor_layout(new QVBoxLayout(parent)),
-    button_layout(new QHBoxLayout(parent)),
-    table(new QTableView(this)),
-    delegate(new MotifEditorDelegate(this)),
-    applyButton(new QPushButton("apply")),
+    editor_layout(0),
+    button_layout(0),
+    table(0),
+    delegate(0),
+    applyButton(0),
     model(0)
 {
+  setupWidgets();
+  
   assert (m != 0);
   const set<Sequence> &motif = analysis->motifs();
   vector<Sequence> motif_seq(motif.begin(), motif.end());
 
   applyButton->setFocusPolicy(Qt::StrongFocus);
-  connect(applyButton, SIGNAL(clicked()), this, SLOT(updateMotifs()));
+  connect(applyButton, SIGNAL(clicked()), this, SLOT(updateAnalysisMotifs()));
   button_layout->addStretch();
   button_layout->addWidget(applyButton);
   
@@ -35,23 +37,35 @@ MotifEditor::MotifEditor(MussaRef m, QWidget *parent)
   updateModel();
 }
 
-void MotifEditor::updateModel()
+void MotifEditor::setupWidgets()
 {
-  MotifModel *new_model = new MotifModel();
-   
-  new_model->push_empty();
+  editor_layout = new QVBoxLayout(this);
+  button_layout = new QHBoxLayout(this);
+  table = new QTableView(this);
+  delegate = new MotifEditorDelegate(this);
+  applyButton = new QPushButton("apply");
+}
 
-  // if there was an old model, delete it
-  if (model) {
+void MotifEditor::updateModel()
+{
+  // if our current analysis doesn't match the one in our
+  // model, we probalby changed the analysis.
+  // so delete and restart
+  // DET 2007mar30 (can this if statement ever be true? it doesn't look 
+  //                like there's a way to change the analysis?)
+  if (model and model->getAnalysis() != analysis) {
     delete model;
   }
-  // update the QTableView
-  model = new_model;  
+
+  // if we don't have a model, create a new one
+  if (not model) {
+    model = new MotifModel(analysis);
+  }
   table->setModel(model);
   updateView();
 }
 
-void MotifEditor::updateMotifs()
+void MotifEditor::updateAnalysisMotifs()
 {
   // This function is _sooo_ not thread safe
   // erase motifs
@@ -79,10 +93,11 @@ void MotifEditor::updateMotifs()
 
 void MotifEditor::updateTitle() 
 {
-  QString title("Motif Editor: ");
-  title.append(analysis->get_name().c_str());
-  setWindowTitle(title);
-  
+  std::string title("Motif Editor: ");
+  if (analysis) {
+    title += analysis->get_title();
+  }
+  setWindowTitle(title.c_str());
 }
 
 void MotifEditor::updateView()