Skip to content

Commits on Source 6

Show whitespace changes
Inline Side-by-side
README.txt
View file @ d2db9865
......@@ -5,16 +5,14 @@ Qt http://www.qt.io/
Minimum version 4.7.1 or later, preferable 4.8.7
If you insist on using Qt5 (which I don't recommend), it must be version >= 5.9.1.
If you want to use Qt5, it must be version >= 5.9.1.
For info how to compile Qt5 from source, scroll down.
The GCC compiler on Linux or Mingw-w64 on windows. <http://mingw-w64.sourceforge.net/>
http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.8.2/threads-posix/dwarf/i686-4.8.2-release-posix-dwarf-rt_v3-rev3.7z/download
Do not use microsoft tools or compilers.
Do not use microsoft tools or compilers!
Introduction
......@@ -75,7 +73,7 @@ How to compile
Now you can run the program by typing: edfbrowser
In case you insist on using Qt5, the recommended way is not to use the Qt5 libraries that comes with your distro.
In case you want to use Qt5, the recommended way is not to use the Qt5 libraries that comes with your distro.
Instead, download and compile the Qt5 source and use that to compile EDFbrowser.
Here's a step by step list with instructions:
......@@ -143,11 +141,11 @@ In order to reduce the size of the executable, run the following commands:
strip -s edfbrowser
upx edfbrowser
upx edfbrowser (if upx is not recognized as a command, install it using your package manager)
-Requirements on macOS
-Requirements on macOS (warning, I don't have a Mac and I can not support it!)
-=====================
-Development tools from Apple. To get them, run
......
about_dialog.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......@@ -67,7 +67,7 @@ UI_Aboutwindow::UI_Aboutwindow(UI_Mainwindow *mainwindow)
textedit1->setPlainText(
"\n " PROGRAM_NAME " " PROGRAM_VERSION "\n"
"\n This program is made by Teunis van Beelen.\n"
"\n Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen.\n"
"\n Copyright (C) 2007 - 2019 Teunis van Beelen.\n"
"\n Email: teuniz@gmail.com\n"
"\n Disclaimer:\n"
" Despite this software is intend to be useful, there is no warranty, use this software at your own risk!\n"
......
about_dialog.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
active_file_chooser.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2010 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
active_file_chooser.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2010 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
adjustfiltersettings.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2010 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......@@ -534,13 +534,9 @@ void AdjustFilterSettings::update_filter()
if(type < 3)
{
if(frequency1 >= ((signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0))
if(frequency1 >= signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0)
{
frequency1 = (signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0;
frequency1 = signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0;
frequency1 -= freq1box->singleStep();
......@@ -549,13 +545,9 @@ void AdjustFilterSettings::update_filter()
}
else
{
if(frequency2 >= ((signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0))
if(frequency2 >= signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0)
{
frequency2 = (signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0;
frequency2 = signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0;
frequency2 -= freq2box->singleStep();
......@@ -572,9 +564,7 @@ void AdjustFilterSettings::update_filter()
if(type < 3)
{
if(frequency1 >= ((signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0))
if(frequency1 >= signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0)
{
QMessageBox messagewindow(QMessageBox::Critical, "Error",
"The frequency must be less than: samplerate / 2");
......@@ -584,9 +574,7 @@ void AdjustFilterSettings::update_filter()
}
else
{
if(frequency2 >= ((signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record
/ signalcomp->edfhdr->data_record_duration)
/ 2.0))
if(frequency2 >= signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f / 2.0)
{
QMessageBox messagewindow(QMessageBox::Critical, "Error",
"The frequency must be less than: samplerate / 2");
......@@ -683,9 +671,7 @@ void AdjustFilterSettings::update_filter()
fid_run_freebuf(signalcomp->fidbuf[filter_nr]);
fid_run_freebuf(signalcomp->fidbuf2[filter_nr]);
err = fid_parse(((double)(signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].smp_per_record)) / signalcomp->edfhdr->data_record_duration,
&filter_spec,
&signalcomp->fidfilter[filter_nr]);
err = fid_parse(signalcomp->edfhdr->edfparam[signalcomp->edfsignal[0]].sf_f, &filter_spec, &signalcomp->fidfilter[filter_nr]);
if(err != NULL)
{
......
adjustfiltersettings.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2010 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
annotations_dock.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
annotations_dock.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
annotlist_filter_dialog.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2017, 2018 Teunis van Beelen
* Copyright (C) 2017 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
annotlist_filter_dialog.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2017, 2018 Teunis van Beelen
* Copyright (C) 2017 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
ascii2edf.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2008 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
ascii2edf.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2008 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
ascii_export.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
ascii_export.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2007 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
averager_curve_wnd.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2011 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
averager_curve_wnd.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2011 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
averager_dialog.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2011 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
averager_dialog.h
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2011 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......
bdf2edf.cpp
View file @ d2db9865
......@@ -3,7 +3,7 @@
*
* Author: Teunis van Beelen
*
* Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Teunis van Beelen
* Copyright (C) 2009 - 2019 Teunis van Beelen
*
* Email: teuniz@gmail.com
*
......@@ -374,9 +374,7 @@ void UI_BDF2EDFwindow::StartConversion()
annotlist[new_edfsignals] = 0;
filterlist[new_edfsignals] = create_filter(0,
((QDoubleSpinBox *)(SignalsTablewidget->cellWidget(i, 1)))->value(),
1.0 / (edfhdr->data_record_duration / edfhdr->edfparam[i].smp_per_record));
filterlist[new_edfsignals] = create_filter(0, ((QDoubleSpinBox *)(SignalsTablewidget->cellWidget(i, 1)))->value(), edfhdr->edfparam[i].sf_f);
dividerlist[new_edfsignals] = ((QDoubleSpinBox *)(SignalsTablewidget->cellWidget(i, 2)))->value();
......@@ -389,8 +387,8 @@ void UI_BDF2EDFwindow::StartConversion()
annotlist[new_edfsignals] = 1;
filterlist[new_edfsignals] = create_filter(0, 0.01,
1.0 / (edfhdr->data_record_duration / edfhdr->edfparam[i].smp_per_record));
filterlist[new_edfsignals] = create_filter(0, 0.01, edfhdr->edfparam[i].sf_f);
dividerlist[new_edfsignals] = 1.0;
new_edfsignals++;
......