Commit 01a5716d authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.65+dfsg

parent 7d59e47a

README.txt

+43 −7
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ How to compile 
  mkdir EDFbrowser_git

  cd EDFbrowser_git

  git init

  git pull https://github.com/Teuniz/EDFbrowser

  git pull https://gitlab.com/Teuniz/EDFbrowser



- Create the makefile:

  Linux Mint 18: qmake
@@ -97,7 +97,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.9.5                                      #

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

#                                                                                           #

# It will not interfere with other Qt programs.                                             #

#                                                                                           #
@@ -107,14 +107,14 @@ mkdir Qt5-source 


cd Qt5-source



wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.5/single/qt-everywhere-opensource-src-5.9.5.tar.xz

wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.6/single/qt-everywhere-opensource-src-5.9.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-opensource-src-5.9.5.tar.xz

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



tar -xvf qt-everywhere-opensource-src-5.9.5.tar.xz

tar -xvf qt-everywhere-opensource-src-5.9.6.tar.xz



cd qt-everywhere-opensource-src-5.9.5

cd qt-everywhere-opensource-src-5.9.6



./configure -v -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -no-qml-debug -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
@@ -128,7 +128,7 @@ sudo make install 


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



/usr/local/Qt-5.9.5/bin/qmake

/usr/local/Qt-5.9.6/bin/qmake



make -j8
@@ -147,3 +147,39 @@ upx edfbrowser 






-Requirements on macOS

-=====================



-Development tools from Apple. To get them, run

-

-xcode-select --install

-

-QT >= 5.9.1

-One of the ways to get QT on macOS is to install it via homebrew:

-

-brew install qt

-

-Note: after installing, qmake will likely not be in your $PATH, so you need to invoke it using its full path.

-

-Build on macOS

-==============

-

-In the directory where you extracted sourcefile or cloned git repo, first run qmake, then make:

-

-/usr/local/Cellar/qt/<your.qt.version>/bin/qmake

-make

-

-You can also build it in a dedicated subdirectory:

-

-mkdir build

-cd build

-/usr/local/Cellar/qt/<your.qt.version>/bin/qmake .. //note the double dot at the end

-make //make as usual

-

-

-This will create the app bundle in the current directory, which you can then move to /Applications/ if desired.

annotations_dock.cpp

+4 −18
Original line number Diff line number Diff line
@@ -778,11 +778,9 @@ void UI_Annotationswindow::hide_editdock(bool visible) 


void UI_Annotationswindow::updateList(void)

{

  char str[MAX_ANNOTATION_LEN + 32],

       *str_tmp;

  char str[MAX_ANNOTATION_LEN + 32];



  int i, j,

      len,

  int j,

      sz,

      jump=0,

      modified=0;
@@ -838,20 +836,6 @@ void UI_Annotationswindow::updateList(void) 
      continue;

    }



    string = QString::fromUtf8(annot->annotation);



    str_tmp = string.toUtf8().data();



    len = 0;

    for(i=0; ; i++)

    {

      if(str_tmp[i]==0)  break;



      if(((((unsigned char *)str_tmp)[i])&224)==192)  len++;

    }



    for(i=0; i<len; i++)  string.append(' ');



    if(relative)

    {

      if((annot->onset - mainwindow->edfheaderlist[file_num]->starttime_offset) < 0LL)
@@ -884,6 +868,8 @@ void UI_Annotationswindow::updateList(void) 


    remove_trailing_zeros(str);



    string = QString::fromUtf8(annot->annotation);



    if(string.size() < 20)

    {

      string = string.leftJustified(20, ' ');

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.64 manual</h1>

<h1>EDFbrowser 1.65 manual</h1>



<p><br></p>

global.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#endif



#define PROGRAM_NAME "EDFbrowser"

#define PROGRAM_VERSION "1.64"

#define PROGRAM_VERSION "1.65"

#define MINIMUM_QT4_VERSION 0x040701

#define MINIMUM_QT5_VERSION 0x050901

#define MAXFILES 32

images/splash.png

+74 B (9.08 KiB)
Loading image diff...