Merge branch 'master' of https://github.com/andrasfuchs/EDFbrowser

Author: andrasfuchs

README.md

@@ -1,10 +1,52 @@
-EDFBrowser Pro
+EDFBrowser
 ==============
 
 EDFBrowser is a free, opensource, multiplatform, universal viewer and toolbox intended for, but not limited to, timeseries storage files like EEG, EMG, ECG, BioImpedance, etc.
 
-The original EDFBrowser was created by [Teunis van Beelen](https://www.linkedin.com/in/teunis-van-beelen-a5ab1142/).
+The original EDFBrowser v1 was created by [Teunis van Beelen](https://www.linkedin.com/in/teunis-van-beelen-a5ab1142/) between 2007 and 2015.
+
+This extended v2 version has many new features and bugfixes and it is maintained by [Andras Fuchs](https://www.linkedin.com/in/andrasfuchs).
+
+New features
+-----------
+
+* Software architecture
+  * Added .gitattributes to standardize line endings in files, and .gitignore to avoid personalized config file/temp file/generated file conflicts.
+  * Added multi-target support, so the source can be compiled with Visual Studio 2013 Community Edition and the Visual C compiler.
+  * The compilation with QtCreator is not effected.
+  * All the target-specific definition are now in the multitargersupport.h file.
+  * Moving towards to OOP design
+  * Moving towards the Model-View-Controller design pattern's source code separation
+  * C++ v11
+
+* Power Spectrum
+  * new looks
+  * support for different mouse gestures (dragging (click+move), zoom (mousewheel), reset zoom (double-click))
+  * multi-signal support on one histogram (but it's still backward compatible)
+  * signals are displayed in three different time ranges for comparison
+  * color bar text positioning
+  * support for "blind spots" for unavailable data
+  * values are formatted with a thousand separator char
+  * cursor displays the unit as well
+  * new controls to change the Y-axis, turn the colorbars on/off and for signal selection
+  * calculation of the input signal's on 3 different time-intervals
+  * performance improvements
+
+* real-time playback (Ctrl+Space)
+
+Screenshots
+----------------
+
+![Power Spectrum with multiple signals](https://cloud.githubusercontent.com/assets/910321/11691278/9c44339e-9e9a-11e5-8c9a-213c7ca832c1.png)
+
+![Power Spectrum with multiple signals zoom](https://cloud.githubusercontent.com/assets/910321/11691682/68e58172-9e9c-11e5-95f6-eeeeb3ab4b79.png)
+
+![Power Spectrum controls](https://cloud.githubusercontent.com/assets/910321/11691693/737814d8-9e9c-11e5-9606-afb2d9506cc3.png)
+
+![One signal and the controls](https://cloud.githubusercontent.com/assets/910321/11691377/f5abc636-9e9a-11e5-8aff-a832d7025666.png)
+
+![One signal, the color bars and the controls](https://cloud.githubusercontent.com/assets/910321/11691382/ffa71df2-9e9a-11e5-8b71-301520db2ee5.png)
+
 
-This Pro version is an extended version of the original and maintained by [Andras Fuchs](https://www.linkedin.com/in/andrasfuchs/).
 
 For more information, check out our [Wiki](https://github.com/andrasfuchs/EDFbrowser/wiki)!