Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
dridk committed Jan 31, 2018
2 parents a63627a + 5b4db2b commit 859bf2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
7 changes: 7 additions & 0 deletions src/gui/traceview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -529,17 +529,24 @@ void TraceView::search(const QString &expression)
//-------------------------------------------------------------------------------
void TraceView::selectNextSearch()
{
if (mMatchList.isEmpty())
return;

if (mMatchIndex < mMatchList.size() - 1)
mMatchIndex++;

QRegularExpressionMatch match = mMatchList[mMatchIndex];
setSelection(match.capturedStart(), match.capturedLength());



}
//-------------------------------------------------------------------------------
void TraceView::selectPreviousSearch()
{
if (mMatchList.isEmpty())
return;

if (mMatchIndex > 0)
mMatchIndex--;

Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ int main(int argc, char *argv[])
app.setApplicationName("CutePeaks");
app.setOrganizationName("Labsquare");
app.setOrganizationDomain("Labsquare.org");
app.setApplicationVersion("0.2.2");
app.setApplicationVersion("0.2.3");

QString locale = QLocale::system().name().section('_', 0, 0);
QTranslator translator;
Expand Down
3 changes: 3 additions & 0 deletions src/resources/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/)

=======
## [0.2.3] - 2018-01-30
- [Hotfix] Fixed crash #67

## [0.2.2] - 2018-01-30
- [Hotfix] Fixed wrong amino acid translation #66

Expand Down

0 comments on commit 859bf2f

Please sign in to comment.