Skip to content

Commit 36aaa92

Browse files
committed
Merge branch 'devel' into htslib
- AbstractSequenceReader have now a virtual constructor - ui accept *.bam and *.ubam file
2 parents a67e566 + 317629c commit 36aaa92

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+502
-623
lines changed

.coveralls.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repo_token: Dj6d3Ke8T5Ikm96bvMvronbJV1AI1Cu9I

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ script:
3737
- cp ./usr/share/icons/hicolor/48x48/apps/fastqt.png .
3838
- cp ./usr/share/applications/fastqt.desktop .
3939
- cd ..
40-
- wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage"
40+
- wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
4141
- chmod a+x linuxdeployqt*.AppImage
4242
- unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
4343
- ./linuxdeployqt*.AppImage ./appdir/usr/bin/* -bundle-non-qt-libs

AUTHORS

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
FastQt is a free software created by labsquare team. Labsquare is a community of developers which aims to develop bioinformatics user interface for clinical usage.
22
Here is the list of authors and contributor of FastQt.
33

4-
Sacha Schutz <sacha@labsquare.org>
5-
Pierre Marijon <pierre@marijon.fr>
6-
Jérémie Roquet <jroquet@arkanosis.net>
4+
## Developers
5+
@dridk Sacha Schutz <sacha@labsquare.org>
6+
@natir Pierre Marijon<pierre@marijon.fr>
7+
@arkanosis Jérémie Roquet<jroquet@arkanosis.net>
78

8-
FastQt is a clone of FastQC. I would like to mention and thanks the author of FastQC Pierre Lindenbaum for his outstanding work.
9+
## Packagers
10+
@StuntsPT Francisco Pina-Martins
11+
@probonopd
12+
13+
## Translators
14+
@JuneBS June Sallou
15+
16+
## Designers
17+
@beardedpayton Payton Burdette
18+
19+
20+
FastQt is a clone of FastQC. I would like to mention and thanks authors of FastQC for their outstanding work.
921

1022
I also thanks the genetics laboratory at Brest hospital for giving me time to develop bioinformatics tools.
1123
https://www.chu-brest.fr/fr/notre-offre-soins/nos-specialites/biologie/genetique-moleculaire-histocompatibilite

CHANGELOG

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/)
6-
.
6+
7+
<<<<<<< HEAD
8+
## [0.2.3] - 2017-14-03
9+
### Changed
10+
- Fix delay time before running. Now analysis doesn't wait to run
11+
- Remove debugging message
12+
- Fix bug when exporting PNG data.
13+
=======
14+
## [0.2.3] - 2017-29-03
15+
### Changed
16+
- Exporting file displays a progress dialog
17+
- Add recent menu
18+
19+
>>>>>>> devel
20+
721
## [0.2.2] - 2017-03-03
822
### Changed
923
- Fix Crash when reading .xz file
@@ -15,7 +29,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
1529
### Changed
1630
- Remove filter of file by extension
1731

18-
1932
## [0.2] - 2017-02-10
2033
### Changed
2134
- Main UI is now a list of analysis

FastQt.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
#-------------------------------------------------
66
QT += core gui concurrent charts svg
77
#QMAKE_CXXFLAGS += -Ofast
8-
QMAKE_CXXFLAGS += -std=c++11
9-
#CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
8+
CONFIG += c++11
9+
10+
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
1011

1112

1213
# METHOD 1 : If KArchive is not installed as a Qt Module then copy to your Qt installation :

QFontIcon/qfonticon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SOFTWARE.
2525
#include "qfonticon.h"
2626
#include <QDebug>
2727
#include <QFontDatabase>
28-
QFontIcon * QFontIcon::mInstance = Q_NULLPTR;
28+
QFontIcon * QFontIcon::mInstance = nullptr;
2929

3030
bool QFontIcon::addFont(const QString &filename)
3131
{

QFontIcon/qfonticon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class QFontIcon : public QObject
6464
static bool addFont(const QString& filename);
6565
static QFontIcon * instance();
6666
// main methods. Return icons from code
67-
static QIcon icon(const QChar& code, const QColor& baseColor = QColor(),const QString& family = QString());
67+
static QIcon icon(const QChar& code, const QColor& baseColor = QColor(),const QString& family = QStringLiteral());
6868
// return added fonts
6969
const QStringList& families() const;
7070

README.md

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
1-
#FastQt ![travis](https://api.travis-ci.org/labsquare/fastQt.svg?branch=master) ![Qt](https://img.shields.io/badge/Qt-qmake-green.svg) [![Gitter](https://badges.gitter.im/labsquare/fastQt.svg)](https://gitter.im/labsquare/fastQt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
1+
# FastQt
2+
3+
![travis](https://api.travis-ci.org/labsquare/fastQt.svg?branch=master) [![Gitter](https://badges.gitter.im/labsquare/fastQt.svg)](https://gitter.im/labsquare/fastQt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build status](https://ci.appveyor.com/api/projects/status/skmgugijflggfq4x?svg=true)](https://ci.appveyor.com/project/dridk/fastqt) [![Coverage Status](https://coveralls.io/repos/github/labsquare/fastQt/badge.svg?branch=master)](https://coveralls.io/github/labsquare/fastQt?branch=master)
4+
25
FastQt is the clone of [FastQC](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/) application ported
36
from Java to [C++/Qt5](https://www.qt.io/)
47

8+
59
![Preview](https://raw.githubusercontent.com/labsquare/fastQt/master/screenshot.gif)
610

7-
##Installation
8-
### Ubuntu
9-
deb package has not yet ready. But An [AppImage](http://appimage.org/) has been made for Linux x86_64 and has been tested on ubuntu 16.04.
10-
You can download it from [here](https://github.com/labsquare/fastQt/releases/download/0.1/fastqt-0.1-linux-x86_64.AppImage) and run it as follow :
11+
## Installation
1112

12-
chmod +x fastqt-0.1-linux-x86_64.AppImage
13-
./fastqt-0.1-linux-x86_64.AppImage
13+
### Linux
14+
An [AppImage](http://appimage.org/) has been created and should work on recent Linux distribution.
15+
Download the last release from [here](https://github.com/labsquare/fastQt/releases/) and run it as follow :
16+
17+
chmod +x fastqt-0.2.3-linux-x86_64.AppImage
18+
./fastqt-0.2.3-linux-x86_64.AppImage
1419

1520
### Archlinux
1621
There is an AUR package for Archlinux. [Just get it from the AUR](https://aur.archlinux.org/packages/fastqt/).
17-
18-
19-
Other package will come soon for Windows and MacOS. You can try to compile it anyway.
20-
22+
23+
### Windows
24+
Windows installer and portable version are avaible [here]( https://github.com/labsquare/fastQt/releases/)
25+
2126
## Compilation
2227
### Prerequisites - Install KArchive
23-
You need to install karchive before compiling FastQt.
28+
On Linux, you need to install karchive before compiling FastQt.
2429
**From ubuntu** >xenial you can install it from repositories :
2530

2631
sudo apt install libkf5archive-dev
2732

28-
**From fedoar** >= 24 you can install it from repositories :
33+
**From fedora** >= 24 you can install it from repositories :
2934

3035
sudo dnf install kf5-karchive-devel
3136

@@ -43,14 +48,17 @@ You need to install karchive before compiling FastQt.
4348
cmake .. -DCMAKE_INSTALL_PREFIX=/usr/
4449
make
4550
sudo make install
51+
52+
** From Windows **
53+
Nothing to do. Compiled library are avaible in win32 directory.
4654

4755
### Install Qt >5.7
4856

4957
**From website** : Download Qt > 5.7 from https://www.qt.io/.
5058
Don't forget to check QtChart module during installation.
5159

5260
**From ubuntu** : Qt 5.7 is not yet avaible with ubuntu. But you can add PPA to your software system.
53-
For exemple for xenial
61+
For exemple from xenial
5462

5563
sudo add-apt-repository ppa:beineri/opt-qt57-xenial
5664
sudo apt-get install qt57base qt57charts-no-lgpl
@@ -61,7 +69,7 @@ For exemple for xenial
6169
sudo dnf install qt5-qtbase-devel qt5-qtcharts-devel
6270

6371
### Compile FastQt
64-
Be sure you have the correct version of Qt (>5.7) by using qmake. You will find qmake in bin folder where you installed Qt. For exemple, if you installed Qt from ppa:beineri, you will find it under /opt/qt57/bin/qmake. Then launch the compilation from FastQC folder as follow.
72+
Be sure you have the correct version of Qt (>5.7) by using qmake --version. For exemple, if you have installed Qt from ppa:beineri, you will find it under /opt/qt57/bin/qmake. Then launch the compilation from FastQC folder as follow.
6573

6674
/opt/qt57/bin/qmake --version
6775
/opt/qt57/bin/qmake
@@ -70,7 +78,14 @@ Be sure you have the correct version of Qt (>5.7) by using qmake. You will find
7078

7179
## Usage
7280

73-
You can use FastQt as GUI application or in Command Line Interface.
81+
FastQt can analyse uncompress and compress fastq files. The following extensions are supported :
82+
83+
- *.fastq
84+
- *.fastq.gz
85+
- *.fastq.xz
86+
- *.fastq.bz2
87+
88+
You can use FastQt as GUI application or as a Command Line Interface.
7489

7590
Some usage example :
7691

@@ -80,3 +95,6 @@ fastqt file1.fastq file2.fastq.gz file3.fastq.bzip # File save in file1 file 2 f
8095
fastqt file1.fastq -o specific_path # Create specific directory for each file in specific_path
8196
fastqt file1.fastq -t 2 # Fastqt run maximal two process this option is valid for GUI too
8297
```
98+
99+
## How to cite FastQt
100+
Labsquare Team, et al (2017). FastQt: a quality control tool for high throughput sequence data. Available online at: https://github.com/labsquare/fastQt

analysis/analysis.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Copyright Copyright 2016-17 Sacha Schutz
2424
Analysis::Analysis(QObject * parent)
2525
:QObject(parent)
2626
{
27-
mParentRunner = Q_NULLPTR;
27+
mParentRunner = nullptr;
2828
}
2929

3030
Analysis::~Analysis()
@@ -36,8 +36,8 @@ void Analysis::save(const QString &path)
3636
{
3737
QString name = metaObject()->className();
3838
QDir dir(path);
39-
QString svgPath = dir.filePath(QString("%1.svg").arg(name));
40-
QString pngPath = dir.filePath(QString("%1.png").arg(name));
39+
QString svgPath = dir.filePath(QStringLiteral("%1.svg").arg(name));
40+
QString pngPath = dir.filePath(QStringLiteral("%1.png").arg(name));
4141

4242
capture(svgPath);
4343
capture(pngPath, ImageFormat::PngFormat);

analysis/analysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Analysis : public QObject
4848
Success , Warning, Error, Unknown
4949
};
5050

51-
Analysis(QObject * parent = Q_NULLPTR);
51+
Analysis(QObject * parent = nullptr);
5252

5353
virtual ~Analysis();
5454
/*!

0 commit comments

Comments
 (0)