Skip to content

Commit

Permalink
Version update info
Browse files Browse the repository at this point in the history
  • Loading branch information
smarsland committed Sep 14, 2020
1 parent f66f594 commit 926f778
Show file tree
Hide file tree
Showing 17 changed files with 97 additions and 58 deletions.
6 changes: 3 additions & 3 deletions AviaNZ.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# This is the script that starts AviaNZ. It processes command line options
# and then calls either part of the GUI, or runs on the command line directly.

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
11 changes: 5 additions & 6 deletions AviaNZ_batch.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

# AviaNZ_batch.py
#
# This is the proceesing class for the batch AviaNZ interface
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# This is the processing class for the batch AviaNZ interface

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
21 changes: 21 additions & 0 deletions AviaNZ_batch_GUI.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# This contains all the GUI parts for batch running of AviaNZ.

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

from PyQt5.QtGui import QIcon, QPixmap, QColor
from PyQt5.QtWidgets import QMessageBox, QMainWindow, QLabel, QPlainTextEdit, QPushButton, QRadioButton, QTimeEdit, QSpinBox, QDesktopWidget, QApplication, QComboBox, QLineEdit, QSlider, QListWidgetItem, QCheckBox, QGroupBox, QGridLayout, QHBoxLayout, QVBoxLayout, QFrame, QProgressDialog
from PyQt5.QtCore import Qt, QDir
Expand Down
9 changes: 5 additions & 4 deletions AviaNZ_manual.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# This is the main class for the AviaNZ interface
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# This is the main class for the AviaNZ interface.

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
6 changes: 3 additions & 3 deletions CNN.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
#
# CNN for the AviaNZ program

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
6 changes: 3 additions & 3 deletions Clustering.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
#
# Cluster segments

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
8 changes: 4 additions & 4 deletions Dialogs.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

#
# This is part of the AviaNZ interface
# Holds most of the code for the various dialog boxes
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
7 changes: 4 additions & 3 deletions DialogsTraining.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@

# This is part of the AviaNZ interface
# Holds most of the code for the various dialog boxes
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
7 changes: 3 additions & 4 deletions Segment.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

# Segment.py
#
# A variety of segmentation algorithms for AviaNZ

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
7 changes: 3 additions & 4 deletions SignalProc.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

# SignalProc.py
#
# A variety of signal processing algorithms for AviaNZ.

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
21 changes: 21 additions & 0 deletions SplitAnnotations.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,27 @@
# Wrapper script to SplitWav audio splitter.
# Splits wavs, and AviaNZ-format annotation files.

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti
# This file: Julius Juodakis

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.


from PyQt5.QtWidgets import QApplication, QMainWindow, QLabel, QFileDialog, QPushButton, QPlainTextEdit, QWidget, QGridLayout, QSpinBox, QGroupBox, QSizePolicy, QSpacerItem, QLayout, QProgressDialog, QStyle
from PyQt5.QtCore import QDir, Qt
from PyQt5.QtGui import QIcon
Expand Down
7 changes: 3 additions & 4 deletions SupportClasses.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

# SupportClasses.py

# Support classes for the AviaNZ program

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
9 changes: 4 additions & 5 deletions SupportClasses_GUI.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@

# SupportClasses_GUI.py

# Support classes for the AviaNZ program
# Mostly subclassed from pyqtgraph

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -786,7 +785,7 @@ def __init__(self, type, title, text):
# Easy way to set ABOUT text here:
self.setIconPixmap(QPixmap("img/AviaNZ.png"))
self.setText("The AviaNZ Program, v3.0-beta2 (September 2020)")
self.setInformativeText("By Stephen Marsland, Victoria University of Wellington. With code by Nirosha Priyadarshani and Julius Juodakis, and input from Isabel Castro, Moira Pryde, Stuart Cockburn, Rebecca Stirnemann, Sumudu Purage, Virginia Listanti, and Rebecca Huistra. \n [email protected]")
self.setInformativeText("By Stephen Marsland, Victoria University of Wellington. With code by Nirosha Priyadarshani, Julius Juodakis, and Virginia Listanti. Input from Isabel Castro, Moira Pryde, Stuart Cockburn, Rebecca Stirnemann, Sumudu Purage, and Rebecca Huistra. \n [email protected]")
elif (type=="o"):
self.setIconPixmap(QPixmap("img/AviaNZ.png"))

Expand Down
7 changes: 4 additions & 3 deletions Training.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@

# This is part of the AviaNZ interface
# Holds most of the code for training CNNs
# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
7 changes: 3 additions & 4 deletions WaveletFunctions.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

# WaveletFunctions.py
#
# Class containing wavelet specific methods

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
7 changes: 3 additions & 4 deletions WaveletSegment.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# WaveletSegment.py
#
# Wavelet Segmentation

# Version 2.0 18/11/19
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis
# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
9 changes: 5 additions & 4 deletions colourMaps.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@

# colourMaps.py

# Version 2.0 18/11/19
# Set of colour maps for the AviaNZ interface.

# Version 3.0 14/09/20
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis, Virginia Listanti

# These were made using cmaps.py in test
# Authors: Stephen Marsland, Nirosha Priyadarshani, Julius Juodakis

# AviaNZ bioacoustic analysis program
# Copyright (C) 2017--2019
# Copyright (C) 2017--2020

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down

0 comments on commit 926f778

Please sign in to comment.