tagged release_1.0_rc3

diff --git a/qui/MussaWindow.cpp b/qui/MussaWindow.cpp
index 72829c9aa4ef43329cd09e6b84626987e250bff1..1a7c355dad75b3f9df71bdb26e16a0ab748612be 100644 (file)
--- a/qui/MussaWindow.cpp
+++ b/qui/MussaWindow.cpp
@@ -130,10 +130,11 @@ void MussaWindow::setupActions()
   connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
   closeAction->setIcon(QIcon(":/icons/exit.png"));
   
-  createNewAnalysisAction = new QAction(tr("Create Analysis"), this);
+  createNewAnalysisAction = new QAction(tr("Create &New Analysis"), this);
   connect(createNewAnalysisAction, SIGNAL(triggered()), 
           this, SLOT(createNewAnalysis()));
   createNewAnalysisAction->setIcon(QIcon(":/icons/filenew.png"));
+  createNewAnalysisAction->setShortcut(Qt::CTRL | Qt::Key_N);
   
   createSubAnalysisAction = new QAction(tr("Add to Subanalysis"), this);
   connect(createSubAnalysisAction, SIGNAL(triggered()), 
@@ -143,6 +144,7 @@ void MussaWindow::setupActions()
   connect(saveAnalysisAction, SIGNAL(triggered()), 
           this, SLOT(saveAnalysis()));
   saveAnalysisAction->setIcon(QIcon(":/icons/filesave.png"));
+  saveAnalysisAction->setShortcut(Qt::CTRL | Qt::Key_S);
 
   saveAnalysisAsAction = new QAction(tr("Save Analysis &As"), this);
   connect(saveAnalysisAsAction, SIGNAL(triggered()), 
@@ -152,7 +154,7 @@ void MussaWindow::setupActions()
   editMotifsAction = new QAction(tr("Edit Motifs"), this);;
   connect(editMotifsAction, SIGNAL(triggered()), this, SLOT(editMotifs()));
   
-  loadMotifListAction = new QAction(tr("Load Motif List"), this);
+  loadMotifListAction = new QAction(tr("Open Motif List"), this);
   connect(loadMotifListAction, SIGNAL(triggered()), 
           this, SLOT(loadMotifList()));
   loadMotifListAction->setIcon(QIcon(":/icons/fileopen.png"));
@@ -162,10 +164,11 @@ void MussaWindow::setupActions()
           this, SLOT(loadMupa()));
   loadMupaAction->setIcon(QIcon(":/icons/fileopen.png"));
 
-  loadSavedAnalysisAction = new QAction(tr("Load Existing &Analysis"), this);
+  loadSavedAnalysisAction = new QAction(tr("&Open Existing &Analysis"), this);
   connect(loadSavedAnalysisAction, SIGNAL(triggered()), 
           this, SLOT(loadSavedAnalysis()));
   loadSavedAnalysisAction->setIcon(QIcon(":/icons/fileopen.png"));
+  loadSavedAnalysisAction->setShortcut(Qt::CTRL | Qt::Key_O);
 
   mussaManualAssistantAction = new QAction(tr("Mussagl Manual..."), this);
   mussaManualAssistantAction->setIcon(QIcon(":/icons/contents.png"));

diff --git a/qui/test/TestColorSharing.cpp b/qui/test/TestColorSharing.cpp
index 5730aca373ccad816af2a7e0a1d0c694e12b3e36..6f61d5996f131bcc8a44ce40a99665bdd7dcf83b 100644 (file)
--- a/qui/test/TestColorSharing.cpp
+++ b/qui/test/TestColorSharing.cpp
@@ -1,30 +1,3 @@
-#include <QtGui>
-#include <QtTest/QtTest>
+#include "TestColorSharing.hpp"
 
-#include "alg/mussa.hpp"
-#include "alg/color.hpp"
-#include "qui/MussaWindow.hpp"
-
-//! do our colors get shared correctly between different windows?
-class TestColorSharing : public QObject
-{
-  Q_OBJECT
-
-private slots:
-
-  void simple2sequence() {
-    Color green(0.0, 1.0, 0.0);
-    Mussa m;
-    m.append_sequence("AAGGCCTT");
-    m.append_sequence("GGTTCCAA");
-    m.set_window(2);
-    m.set_threshold(2);
-    m.analyze();
-
-    //MussaWindow mw(&m);
-    m.add_motif("GG", green);
-  }
-};
-
-QTEST_MAIN(TestColorSharing)
-#include "moc_TestColorSharing.cxx"
+QTEST_APPLESS_MAIN(TestColorSharing)

diff --git a/qui/test/TestSequenceBrowser.cpp b/qui/test/TestSequenceBrowser.cpp
index eb09d6abb27e5f7d8bb3560d1cbae5d5458ec536..e549db8f4bd45324b39f2406ce7a807195eedcd7 100644 (file)
--- a/qui/test/TestSequenceBrowser.cpp
+++ b/qui/test/TestSequenceBrowser.cpp
@@ -1,50 +1,4 @@
-#include <QtGui>
-#include <QtTest/QtTest>
-
-#include "alg/sequence.hpp"
-#include "qui/seqbrowser/SequenceBrowser.hpp"
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <boost/assign.hpp>
-#include <boost/shared_ptr.hpp>
-using namespace boost::assign;
-
-
-class TestSequenceBrowser : public QObject
-{
-  Q_OBJECT
-
-private slots:
-
-  void testSimplePushSequence() {
-    boost::shared_ptr<Sequence> seq1(new Sequence("AAGGCCTT"));
-    boost::shared_ptr<Sequence> seq2(new Sequence("GGCCTTAA"));
-
-    SequenceBrowser browser;
-    QVERIFY(browser.sequences().size() == 0);
-    browser.push_sequence(seq1);
-    browser.push_sequence(seq2);
-    QVERIFY(browser.sequences().size() == 2);
-    browser.clear();
-    QVERIFY(browser.sequences().size() == 0);
-  }
-
-  void testSelect() {
-    boost::shared_ptr<Sequence> seq1(new Sequence("AAGGCCTT"));
-    boost::shared_ptr<Sequence> seq2(new Sequence("GGCCTTAA"));
-
-    SequenceBrowser browser;
-    browser.push_sequence(seq1);
-    browser.push_sequence(seq2);
-    std::vector<int> path; path += 1,1;
-    std::vector<bool> rc; rc += false, false;
-    browser.link(path, rc, 2);
-
-  }
-};
+#include "TestSequenceBrowser.hpp"
 
 QTEST_MAIN(TestSequenceBrowser)
-#include "moc_TestSequenceBrowser.cxx"
+

diff --git a/qui/test/TestSequenceDescription.cpp b/qui/test/TestSequenceDescription.cpp
index 81be6dca85a2e0e0ad3f72fa69a65b85e4f5c4ae..72840b6b3b50632d44c0fbd62951432c1252066e 100644 (file)
--- a/qui/test/TestSequenceDescription.cpp
+++ b/qui/test/TestSequenceDescription.cpp
@@ -1,49 +1,3 @@
-#include <QtGui>
-#include <QtTest/QtTest>
-
-#include "alg/sequence.hpp"
-#include "alg/glsequence.hpp"
-#include "alg/annotation_colors.hpp"
-#include "qui/seqbrowser/SequenceDescription.hpp"
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-class TestSequenceDescription : public QObject
-{
-  Q_OBJECT
-
-private slots:
-  void testSimple() {
-    boost::shared_ptr<Sequence> seq1(new Sequence("AAGGCCTT"));
-    seq1->set_species("foo");
-    boost::shared_ptr<AnnotationColors> cm(new AnnotationColors);
-    boost::shared_ptr<GlSequence> glseq1(new GlSequence(seq1, cm));
-
-    SequenceDescription sd(glseq1, 0);
-    QVERIFY(sd.glsequence() == glseq1);
-    QVERIFY(sd.glsequence()->sequence()->get_species() == seq1->get_species());
-    sd.setName(std::string("bar"));
-    QVERIFY(sd.glsequence()->sequence()->get_species() == seq1->get_species());
-    QVERIFY(seq1->get_species() == "bar");
-  }
-  void testDeletedPointer() {
-    SequenceDescription sd;
-
-    { 
-      boost::shared_ptr<Sequence> seq1(new Sequence("AAGGCCTT"));
-      Sequence m("AAGG");
-      seq1->find_motif(m);
-      seq1->set_species("foo");
-      boost::shared_ptr<AnnotationColors> cm(new AnnotationColors);
-      boost::shared_ptr<GlSequence> glseq1(new GlSequence(seq1, cm));
-      sd.setGlSequence(glseq1);
-    }
-
-    QVERIFY(sd.name() == "foo");
-  }
-};
+#include "TestSequenceDescription.hpp"
 
 QTEST_MAIN(TestSequenceDescription)
-#include "moc_TestSequenceDescription.cxx"

diff --git a/qui/test/TestSequenceLocationModel.cpp b/qui/test/TestSequenceLocationModel.cpp
index 6a05b5028baaf5cc75369dbfb1c45a8a099b7e6b..31cc92cba9bb4909f4fa18b45470d52b0a3e18c3 100644 (file)
--- a/qui/test/TestSequenceLocationModel.cpp
+++ b/qui/test/TestSequenceLocationModel.cpp
@@ -1,38 +1,3 @@
-#include "qui/SequenceLocationModel.hpp"
-#include "alg/sequence_location.hpp"
-#include "alg/sequence.hpp"
+#include "TestSequenceLocationModel.hpp"
 
-#include <QtTest/QtTest>
-
-class TestSequenceLocationModel : public QObject
-{
-  Q_OBJECT
-
-private slots:
-
-  void testAddSequences() {
-    Sequence seq1("AAGGCCTT");
-    Sequence seq2("GGCCTTAA");
-
-    SequenceLocation loc1(seq1, 0, 2);
-    SequenceLocation loc2(seq2, 3, 3);
-
-    SequenceLocationModel slm;
-    QVERIFY(slm.size() == 0);
-    slm.push_back(loc1);
-    slm.push_back(loc2);
-
-    QVERIFY(slm.rowCount() == 2);
-    QVERIFY(slm.rowCount() == slm.size());
-
-  }
-
-  void testColumn() {
-    SequenceLocationModel slm;
-    QVERIFY(slm.columnCount() == 3);
-  }
-};
-
-
-QTEST_MAIN(TestSequenceLocationModel)
-#include "moc_TestSequenceLocationModel.cxx"
+QTEST_APPLESS_MAIN(TestSequenceLocationModel)