README.txt

@@ -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

@@ -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, ' ');

debian/changelog

+edfbrowser (1.65+dfsg-1) unstable; urgency=medium
+
+  * New upstream version
+  * Standards-Version: 4.1.5
+
+ -- Andreas Tille <tille@debian.org>  Tue, 17 Jul 2018 21:01:03 +0200
+
 edfbrowser (1.64+dfsg-1) unstable; urgency=medium
 
   * New upstream version

debian/control

@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~),
                libqt5opengl5-dev,
                qttools5-dev-tools,
                libedf-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/med-team/edfbrowser
 Vcs-Git: https://salsa.debian.org/med-team/edfbrowser.git
 Homepage: http://www.teuniz.net/edfbrowser/

doc/manual.html

@@ -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

@@ -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

mainwindow.cpp

@@ -1388,7 +1388,7 @@ void UI_Mainwindow::open_new_file()
 
   struct edfhdrblock *edfhdr=NULL;
 
-  if(edflib_version() != 113)  return;
+  if(edflib_version() != 114)  return;
 
   if(annot_editor_active && files_open)
   {

mainwindow_constr.cpp

@@ -1066,7 +1066,7 @@ UI_Mainwindow::UI_Mainwindow()
     messagewindow.exec();
   }
 
-  if(edflib_version() != 113)
+  if(edflib_version() != 114)
   {
     QMessageBox messagewindow(QMessageBox::Critical, "Error", "There's a version problem with EDFlib.\n"
                                                               "Can not continue.");

spectrumanalyzer.cpp

@@ -1040,10 +1040,10 @@ void UI_FreqSpectrumWindow::update_curve()
     return;
   }
 
-  dftsz_spinbox->setMaximum(samples);
-
   busy = 1;
 
+  dftsz_spinbox->setMaximum(samples);
+
   malloc_err = 0;
 
   curve1->setUpdatesEnabled(false);

version.txt

 
+ version 1.65      July 17, 2018
+ --------------
+
+ - WAV to EDF/BDF converter: fixed a bug that caused a wrong conversion in case of 24-bit wave files.
+
+ - Videoplayer: make it work on MAC OS
+
+ - EDFlib: Fixed a bug that could cause not to write the obligatory space between the subfields of patient name and patient additional.
+
+ - Annotations: fixed a bug that caused a wrong background color rendering for the duration of an annotation.
+
+ - Spectrumanalyzer: solved a bug that could cause the mouse cursor to show a "waiting" cursor forever.
+
+
+
  version 1.64      June 2, 2018
  --------------
 

videoplayer.cpp

@@ -94,9 +94,8 @@ void UI_Mainwindow::start_stop_video()
     return;
   }
 
-  strcpy(videopath, QFileDialog::getOpenFileName(this, "Select video", QString::fromLocal8Bit(recent_opendir),
-                                                 "Video files (*.ogv *.OGV *.ogg *.OGG *.mkv *.MKV *.avi *.AVI"
-                                                 " *.mp4 *.MP4 *.mpeg *.MPEG *.mpg *.MPG *.wmv *.WMV)").toLocal8Bit().data());
+  strcpy(videopath, QFileDialog::getOpenFileName(this, "Select media file", QString::fromLocal8Bit(recent_opendir),
+                                                 "Video and audio files (*)").toLocal8Bit().data());
 
   if(!strcmp(videopath, ""))
   {
@@ -192,7 +191,11 @@ void UI_Mainwindow::start_stop_video()
 #else
     arguments << "-I" << "rc" << "--rc-host" << str << "--video-on-top" << "--width" << "150" << "--height" << "150" << "--ignore-config";
 
+#ifdef Q_OS_MAC
+    video_process->start("/Applications/VLC.app/Contents/MacOS/VLC", arguments);
+#else
     video_process->start("vlc", arguments);
+#endif
 
     if(video_process->waitForStarted(5000) == false)
     {
@@ -303,9 +306,14 @@ void UI_Mainwindow::start_stop_video()
                    "  \n Check if VLC is installed in C:\\Program Files\\VideoLAN\\VLC\\ \n "
                    "  or\n "
                    "  \n C:\\Program Files (x86)\\VideoLAN\\VLC\\\n ");
+#else
+#ifdef Q_OS_MAC
+    msgbox.setText("  \n Cannot start the video player. \n  "
+                   "  \n Check if VLC is installed in /Applications/. \n  ");
 #else
     msgbox.setText("  \n Cannot start the video player. \n  "
                    "  \n Check your installation of VLC. \n  ");
+#endif
 #endif
     msgbox.setStandardButtons(QMessageBox::Close);
     msgbox.exec();

viewcurve.cpp

@@ -1429,7 +1429,7 @@ void ViewCurve::print_to_image(int w_img, int h_img)
 
 void ViewCurve::drawCurve_stage_2(QPainter *painter, int w_width, int w_height, int print_linewidth)
 {
-  int i, j, x_pix=0,
+  int i, j, x_pix=0, x_tmp,
       signalcomps,
       baseline,
       m_pagetime,
@@ -1537,8 +1537,22 @@ void ViewCurve::drawCurve_stage_2(QPainter *painter, int w_width, int w_height,
 
             marker_x2 = (int)((((double)w) / mainwindow->pagetime) * annot->long_duration);
 
-            if(marker_x2 > w)  marker_x2 = w;
+            if(marker_x < 0)
+            {
+              marker_x2 += marker_x;
+
+              marker_x = 0;
+            }
+
+            if((marker_x + marker_x2) > w)
+            {
+              x_tmp = marker_x + marker_x2 - w;
 
+              marker_x2 -= x_tmp;
+            }
+
+            if((marker_x < w) && (marker_x2 > 0))
+            {
               if(mainwindow->annotations_duration_background_type == 0)
               {
                 painter->fillRect(marker_x, 0, marker_x2, h, annot_duration_color);
@@ -1552,6 +1566,7 @@ void ViewCurve::drawCurve_stage_2(QPainter *painter, int w_width, int w_height,
         }
       }
     }
+  }
 
   m_pagetime = (int)(mainwindow->pagetime / TIME_DIMENSION);
 

wav2edf.cpp

@@ -640,7 +640,7 @@ unsigned int fmt_chunk_offset,
       {
         for(j=0; j<edfsignals; j++)
         {
-          var.two[0] = *((unsigned short *)(readbuf + (i * edfsignals) + (j * 3)));
+          var.two[0] = *((unsigned short *)(readbuf + (i * edfsignals * 3) + (j * 3)));
 
           var.four[2] = *((unsigned char *)(readbuf + (i * edfsignals * 3) + (j * 3) + 2));