# Conflicts:
#	README.md

Signed-off-by: Jan Caron <j.caron@fz-juelich.de>

# Conflicts:
#	pyramid/tests/test_phasemapper.py

# Conflicts:
#	pyramid/tests/test_phasemapper.py

Smooth_vortex now can have a homogeneous core with radius larger 1.
Hacky solution for PyQt4/5, change later!

Changed ignore files.

The PhaseMapperCharge was updated

See merge request !4

test charge finished

See merge request !3

PhaseMapperCharge has been updated.

See merge request !2

test

See merge request !1

docs: moved up one level.
plottools: added some default label sizes.
version: added to VCS and added a TODO (switch to Git)
fielddata: added rot90 for ScalarData, lot of small changes.

Started working on reader for binary ovf files (WIP).
utils.pm now works with PhaseMapperFDFC.

fielddata and phasemap: Now use the new plottools module, cleanup of arguments
                        and documentation.
plottools: New module for pretty plotting and different annotations like text,
           colorwheels and colorbars.
colors: Colorbar now has a black circle outline and arrows pointing in cardinal
        directions.
diagnostics: Small documentation fixes and naming 'avg' --> 'avrg'.
docs: Renewed documentation.

diagnostics: now takes magdata as input instead of a vector.
             Plotting routines for diagnostics added.
fielddata: Added quiverkey if b_0 is provided.
phasemap: If appropriate unit is provided, will be labeled as "Gain Map".
scalebar: Cleaned up and clipping added.

reconstruction: jutil.TakeTime is now used here.
scalebars: Module which allows nice scalebars to be displayed in all plots.
           This is the new default and can be turned off.
ramp: Now stores everything from the dataset directly to self, instead of
      keeping a reference to the DataSet (construct without Dataset in future!).
projector: tqdm now uses tqdm_notebook if used in IPython Notebook!
magcreator: Added functionality for smooth vortices (see de Graef et al.).
kernel: Corrected behaviour of slab geometry (u and v were still switched!).
dataset: phasemappers now accessable as dictionary or list. The append function
         now also takes lists (but projectors and phasemappers can in turn not
         set directly anymore). Se_inv will be updated automatically.
diagnostics: Functionality to access total, directional and magnitude error,
             according to Kemp et al.

dataset: implemented save/load features in io_dataset.py
h5py: copied data from hdf5 files to make sure they exist after file is closed.
projector/phasemap/dataset: force dim/dim_uv to be tuples.

Projectors now have tqdm options to show progress.