Commit 4ac48100 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.71+dfsg

parent 46634823

README.txt

+8 −8
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ openSUSE: sudo zypper install -t pattern devel_basis 
#                                                                                           #

# This will not mess with your system libraries. The new compiled libraries will be stored  #

#                                                                                           #

# in a new and separate directory: /usr/local/Qt-5.12.3-static                              #

# in a new and separate directory: /usr/local/Qt-5.12.6-static                              #

#                                                                                           #

# It will not interfere with other Qt programs.                                             #

#                                                                                           #
@@ -101,28 +101,28 @@ mkdir Qt5-source 


cd Qt5-source



wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.12/5.12.3/single/qt-everywhere-src-5.12.3.tar.xz

wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.12/5.12.6/single/qt-everywhere-src-5.12.6.tar.xz



here is a list of download mirrors: https://download.qt.io/static/mirrorlist/

The Qt source package you are going to need is: qt-everywhere-src-5.12.3.tar.xz

The Qt source package you are going to need is: qt-everywhere-src-5.12.6.tar.xz



tar -xvf qt-everywhere-src-5.12.3.tar.xz

tar -xvf qt-everywhere-src-5.12.6.tar.xz



cd qt-everywhere-src-5.12.3

cd qt-everywhere-src-5.12.6



./configure -v -prefix /usr/local/Qt-5.12.3-static -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -qt-zlib -no-mtdev -no-journald -qt-libpng -qt-libjpeg -system-freetype -qt-harfbuzz -no-openssl -no-libproxy -no-glib -nomake examples -nomake tests -no-compile-examples -cups -no-evdev -no-dbus -no-eglfs -qreal double -no-opengl -skip qtlocation -skip qtsensors -skip qtwayland -skip qtgamepad -skip qtserialbus -skip qt3d -skip qtpurchasing -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech -skip qtwebengine

./configure -v -prefix /usr/local/Qt-5.12.6-static -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -qt-zlib -no-mtdev -no-journald -qt-libpng -qt-libjpeg -system-freetype -qt-harfbuzz -no-openssl -no-libproxy -no-glib -nomake examples -nomake tests -no-compile-examples -cups -no-evdev -no-dbus -no-eglfs -qreal double -no-opengl -skip qtlocation -skip qtsensors -skip qtwayland -skip qtgamepad -skip qtserialbus -skip qt3d -skip qtpurchasing -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech -skip qtwebengine



(takes about 2 minutes)



make -j6  (change option -j according to number of available cpu cores e.g -j4 or -j8)



(takes about 11 minutes)

(takes about 12 minutes)



sudo make install



Now go to the directory that contains the EDFbrowser sourcecode and enter the following commands:



/usr/local/Qt-5.12.3-static/bin/qmake

/usr/local/Qt-5.12.6-static/bin/qmake



make -j6  (change option -j according to number of available cpu cores e.g -j4 or -j8)

doc/manual.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <meta name="description" content="EDFbrowser manual">

</head><body>



<h1>EDFbrowser 1.70 manual</h1>

<h1>EDFbrowser 1.71 manual</h1>



<p><br></p>

edfbrowser.pro

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ HEADERS += fft_wrap.h 
HEADERS += ecg_statistics.h

HEADERS += fir_filter.h

HEADERS += fir_filter_dialog.h

HEADERS += ishne2edf.h



HEADERS += third_party/fidlib/fidlib.h

HEADERS += third_party/fidlib/fidmkf.h
@@ -240,6 +241,7 @@ SOURCES += fft_wrap.c 
SOURCES += ecg_statistics.c

SOURCES += fir_filter.c

SOURCES += fir_filter_dialog.cpp

SOURCES += ishne2edf.cpp



SOURCES += third_party/fidlib/fidlib.c

fft_wrap.c

+14 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct fft_wrap_settings_struct * fft_wrap_create(double *buf, int buf_size, int 
  if(buf_size < 4)  return NULL;

  if(dft_size < 4)  return NULL;

  if(dft_size & 1)  dft_size--;

  if((window_type < 0) || (window_type > 7))  return NULL;

  if((window_type < 0) || (window_type > 8))  return NULL;

  if((overlap < 1) || (overlap > 5))  return NULL;



  st = (struct fft_wrap_settings_struct *)calloc(1, sizeof(struct fft_wrap_settings_struct));
@@ -291,6 +291,14 @@ static void window_func(const double *src, double *dest, double *coef, int sz, i 
                    - (0.324954578e-2 * cos((14.0 * M_PI * i) / (sz - 1))) + (0.13801040e-3 * cos((16.0 * M_PI * i) / (sz - 1))) - (0.132725e-5 * cos((18.0 * M_PI * i) / (sz - 1)));  /* 9-term HFT223D */

                  }

                }

                else if(type == FFT_WNDW_TYPE_HFT95)

                  {  /* Spectrum and spectral density estimation by the Discrete Fourier transform (DFT), including a comprehensive list of window functions and some new at-top windows Max Planck Institute */

                    for(i=0; i<sz2; i++)

                    {

                      coef[i] = 1.0 - (1.9383379 * cos((2.0 * M_PI * i) / (sz - 1))) + (1.3045202 * cos((4.0 * M_PI * i) / (sz - 1)))

                      - (0.4028270 * cos((6.0 * M_PI * i) / (sz - 1))) + (0.0350665 * cos((8.0 * M_PI * i) / (sz - 1)));

                    }

                  }

                  else

                  {

                    for(i=0; i<sz2; i++)

fft_wrap.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define FFT_WNDW_TYPE_NUTTALL4C               5

#define FFT_WNDW_TYPE_HANN                    6

#define FFT_WNDW_TYPE_HFT223D                 7

#define FFT_WNDW_TYPE_HFT95                   8





#ifdef __cplusplus