X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=qui%2Fseqbrowser%2FSequenceBrowser.cpp;h=efb0245493400e53c69d08fa7c3ed6c5d7358ca1;hp=0927cfd137ea144c5082370e84922b5c09466022;hb=7d16486e23b3d94c49986b082b9de1b508fd6183;hpb=4e0002d11a79e4646d15513042996c3df5e35457 diff --git a/qui/seqbrowser/SequenceBrowser.cpp b/qui/seqbrowser/SequenceBrowser.cpp index 0927cfd..efb0245 100644 --- a/qui/seqbrowser/SequenceBrowser.cpp +++ b/qui/seqbrowser/SequenceBrowser.cpp @@ -23,23 +23,32 @@ SequenceBrowser::SequenceBrowser(QWidget *parent) popupMenu(0), copySelectedSequenceAsFastaAction(0), copySelectedSequenceAsStringAction(0), - editSequencePropertiesAction(0) + editSequencePropertiesAction(0), + clearSelectionAction(0) { popupMenu = new QMenu(this); copySelectedSequenceAsFastaAction = new QAction(tr("&Copy as Fasta"), this); - copySelectedSequenceAsStringAction = new QAction(tr("&Copy Sequence"), this); - editSequencePropertiesAction = new QAction(tr("Sequence &Properties"), this); - connect(copySelectedSequenceAsFastaAction, SIGNAL(triggered()), this, SLOT(copySelectedSequenceAsFasta())); popupMenu->addAction(copySelectedSequenceAsFastaAction); + + copySelectedSequenceAsStringAction = new QAction(tr("&Copy Sequence"), this); copySelectedSequenceAsStringAction->setShortcut(Qt::CTRL | Qt::Key_C); connect(copySelectedSequenceAsStringAction, SIGNAL(triggered()), this, SLOT(copySelectedSequenceAsString())); popupMenu->addAction(copySelectedSequenceAsStringAction); + // connect edit properties action + editSequencePropertiesAction = new QAction(tr("Sequence &Properties"), this); connect(editSequencePropertiesAction, SIGNAL(triggered()), this, SLOT(editSequenceProperties())); + + clearSelectionAction = new QAction(tr("Clear Selection"), this); + clearSelectionAction->setShortcut(Qt::Key_Escape); + connect(clearSelectionAction, SIGNAL(triggered()), + this, SLOT(clearSelection())); + this->addAction(clearSelectionAction); + } SequenceBrowser::SequenceBrowser(const SequenceBrowser& sb, QWidget *parent) @@ -47,7 +56,10 @@ SequenceBrowser::SequenceBrowser(const SequenceBrowser& sb, QWidget *parent) GlSeqBrowser(sb), rubberBand(sb.rubberBand), popupMenu(sb.popupMenu), - copySelectedSequenceAsFastaAction(sb.copySelectedSequenceAsFastaAction) + copySelectedSequenceAsFastaAction(sb.copySelectedSequenceAsFastaAction), + copySelectedSequenceAsStringAction(sb.copySelectedSequenceAsStringAction), + editSequencePropertiesAction(sb.editSequencePropertiesAction), + clearSelectionAction(sb.clearSelectionAction) { resize(sb.width(), sb.height()); setZoom(sb.zoom()); @@ -262,3 +274,12 @@ void SequenceBrowser::stopSelecting(QMouseEvent *e) selectedCanvasRegion = r; } } + +void SequenceBrowser::clearSelection() +{ + GlSeqBrowser::clearSelection(); + if (rubberBand and rubberBand->isVisible()) { + rubberBand->hide(); + } + updateGL(); +} \ No newline at end of file