New upstream version 1.66+dfsg (d1b7712c) · Commits · Debian Med / edfbrowser

README.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -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.6 #
		# in a new and separate directory: /usr/local/Qt-5.9.7-static #
		# #
		# It will not interfere with other Qt programs. #
		# #
		@@ -107,16 +107,16 @@ mkdir Qt5-source

		cd Qt5-source

		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
		wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.7/single/qt-everywhere-opensource-src-5.9.7.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.6.tar.xz
		The Qt source package you are going to need is: qt-everywhere-opensource-src-5.9.7.tar.xz

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

		cd qt-everywhere-opensource-src-5.9.6
		cd qt-everywhere-opensource-src-5.9.7

		./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
		./configure -v -prefix /usr/local/Qt-5.9.7-static -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

		(takes about 1.5 minutes)

		@@ -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.6/bin/qmake
		/usr/local/Qt-5.9.7-static/bin/qmake

		make -j8

annotations_dock.cpp

+45 −3

Original line number	Diff line number	Diff line
		@@ -83,6 +83,9 @@ UI_Annotationswindow::UI_Annotationswindow(int file_number, QWidget *w_parent)
		checkbox2->setTristate(false);
		checkbox2->setCheckState(Qt::Unchecked);

		more_button = new QPushButton("More");
		more_button->setMaximumWidth(40);

		list = new QListWidget(dialog1);
		list->setFont(*mainwindow->monofont);
		list->setAutoFillBackground(true);
		@@ -123,6 +126,7 @@ UI_Annotationswindow::UI_Annotationswindow(int file_number, QWidget *w_parent)
		h_layout->addWidget(label1);
		h_layout->addWidget(lineedit1);
		h_layout->addWidget(checkbox2);
		h_layout->addWidget(more_button);

		v_layout = new QVBoxLayout(dialog1);
		v_layout->addLayout(h_layout);
		@@ -137,6 +141,7 @@ UI_Annotationswindow::UI_Annotationswindow(int file_number, QWidget *w_parent)
		QObject::connect(docklist, SIGNAL(visibilityChanged(bool)), this, SLOT(hide_editdock(bool)));
		QObject::connect(checkbox1, SIGNAL(stateChanged(int)), this, SLOT(checkbox1_clicked(int)));
		QObject::connect(checkbox2, SIGNAL(stateChanged(int)), this, SLOT(checkbox2_clicked(int)));
		QObject::connect(more_button, SIGNAL(clicked(bool)), this, SLOT(more_button_clicked(bool)));
		QObject::connect(hide_annot_act, SIGNAL(triggered(bool)), this, SLOT(hide_annot(bool)));
		QObject::connect(unhide_annot_act, SIGNAL(triggered(bool)), this, SLOT(unhide_annot(bool)));
		QObject::connect(hide_same_annots_act, SIGNAL(triggered(bool)), this, SLOT(hide_same_annots(bool)));
		@@ -154,8 +159,18 @@ UI_Annotationswindow::UI_Annotationswindow(int file_number, QWidget *w_parent)
		}


		void UI_Annotationswindow::more_button_clicked(bool)
		{
		QMessageBox messagewindow(QMessageBox::Information, "Info", "Right-click on an annotation for more options.");
		messagewindow.exec();
		return;
		}


		void UI_Annotationswindow::show_stats(bool)
		{
		char str[4096]="";

		struct annotation_list *annot_list;

		struct annotationblock *annot;
		@@ -169,7 +184,6 @@ void UI_Annotationswindow::show_stats(bool)
		{
		QMessageBox messagewindow(QMessageBox::Critical, "Error", "Close the annotation editor and try again.");
		messagewindow.exec();

		return;
		}

		@@ -179,10 +193,24 @@ void UI_Annotationswindow::show_stats(bool)
		}

		annot_list = &mainwindow->edfheaderlist[file_num]->annot_list;
		if(annot_list == NULL)
		{
		sprintf(str, "Nullpointer returned: file: %s line %i", __FILE__, __LINE__);
		QMessageBox messagewindow(QMessageBox::Critical, "Error", str);
		messagewindow.exec();
		return;
		}

		annot = edfplus_annotation_get_item_visible_only(annot_list, list->currentRow());
		if(annot == NULL)
		{
		sprintf(str, "Nullpointer returned: file: %s line %i", __FILE__, __LINE__);
		QMessageBox messagewindow(QMessageBox::Critical, "Error", str);
		messagewindow.exec();
		return;
		}

		UI_StatisticWindow stats_wndw(NULL, 0LL, annot_list, annot);
		UI_StatisticWindow stats_wndw(NULL, 0LL, mainwindow, annot_list, annot);
		}


		@@ -389,6 +417,15 @@ void UI_Annotationswindow::filter_edited(const QString text)
		{
		annot->hided_in_list = 1;

		if(mainwindow->annot_filter->hide_in_list_only)
		{
		annot->hided = 0;
		}
		else
		{
		annot->hided = 1;
		}

		n = strlen(annot->annotation) - len + 1;

		for(j=0; j<n; j++)
		@@ -416,6 +453,8 @@ void UI_Annotationswindow::filter_edited(const QString text)
		{
		annot->hided_in_list = 0;

		annot->hided = 0;

		n = strlen(annot->annotation) - len + 1;

		for(j=0; j<n; j++)
		@@ -424,7 +463,10 @@ void UI_Annotationswindow::filter_edited(const QString text)
		{
		annot->hided_in_list = 1;

		if(!mainwindow->annot_filter->hide_in_list_only)
		{
		annot->hided = 1;
		}

		break;
		}

annotations_dock.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#include <QAction>
		#include <QMessageBox>
		#include <QVariant>
		#include <QPushButton>

		#include <stdio.h>
		#include <stdlib.h>
		@@ -108,6 +109,8 @@ private:

		QLineEdit *lineedit1;

		QPushButton *more_button;

		QAction *show_between_act,
		*average_annot_act,
		*hide_annot_act,
		@@ -128,6 +131,7 @@ private slots:
		void hide_editdock(bool);
		void checkbox1_clicked(int);
		void checkbox2_clicked(int);
		void more_button_clicked(bool);
		void show_between(bool);
		void average_annot(bool);
		void hide_annot(bool);

averager_curve_wnd.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ void UI_AverageCurveWindow::export_edf(void)
		smpls_left;

		char path[MAX_PATH_LENGTH],
		str[512];
		str[4096];

		double *buf,
		frequency,
		@@ -407,6 +407,11 @@ void UI_AverageCurveWindow::export_edf(void)
		if(p>80) break;
		}

		if(signalcomp->fir_filter)
		{
		p += sprintf(str + p, "FIR ");
		}

		strcat(str, signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].prefilter);
		edf_set_prefilter(edf_hdl, 0, str);
		edf_set_transducer(edf_hdl, 0, signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].transducer);

averager_dialog.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -603,6 +603,16 @@ void UI_AveragerWindow::process_avg(struct signalcompblock *signalcomp)
		dig_value = signalcomp->fidfuncp[k](signalcomp->fidbuf[k], dig_value);
		}

		if(signalcomp->fir_filter != NULL)
		{
		if(s==signalcomp->sample_start)
		{
		fir_filter_restore_buf(signalcomp->fir_filter);
		}

		dig_value = run_fir_filter(dig_value, signalcomp->fir_filter);
		}

		if(signalcomp->plif_ecg_filter)
		{
		if(s==signalcomp->sample_start)