New upstream version 5.4.0+dfsg

3 files changed, 48 insertions, 95 deletions

diff --git a/PyMca5.egg-info/PKG-INFO b/PyMca5.egg-info/PKG-INFO
index d997002..cf22011 100644
--- a/PyMca5.egg-info/PKG-INFO
+++ b/PyMca5.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: PyMca5
-Version: 5.3.2
+Version: 5.4.0
 Summary: Mapping and X-Ray Fluorescence Analysis
 Home-page: http://pymca.sourceforge.net
 Author: V. Armando Sole
 Author-email: sole@esrf.fr
 License: MIT
-Download-URL: https://github.com/vasole/pymca/archive/v5.3.2.tar.gz
+Download-URL: https://github.com/vasole/pymca/archive/v5.4.0.tar.gz
 Description: Stand-alone application and Python tools for interactive and/or batch processing analysis of X-Ray Fluorescence Spectra. Graphical user interface (GUI) and batch processing capabilities provided
         
 Platform: any
diff --git a/PyMca5.egg-info/SOURCES.txt b/PyMca5.egg-info/SOURCES.txt
index 40702b0..950923c 100644
--- a/PyMca5.egg-info/SOURCES.txt
+++ b/PyMca5.egg-info/SOURCES.txt
@@ -99,9 +99,11 @@ PyMca5/PyMcaCore/EdfFileDataSource.py
 PyMca5/PyMcaCore/EdfFileLayer.py
 PyMca5/PyMcaCore/EventHandler.py
 PyMca5/PyMcaCore/HtmlIndex.py
+PyMca5/PyMcaCore/LoggingLevel.py
 PyMca5/PyMcaCore/NexusDataSource.py
 PyMca5/PyMcaCore/NexusTools.py
 PyMca5/PyMcaCore/Plugin1DBase.py
+PyMca5/PyMcaCore/Plugin2DBase.py
 PyMca5/PyMcaCore/PyMcaBatchBuildOutput.py
 PyMca5/PyMcaCore/PyMcaDirs.py
 PyMca5/PyMcaCore/PyMcaLogo.py
@@ -389,6 +391,7 @@ PyMca5/PyMcaGui/math/PCAWindow.py
 PyMca5/PyMcaGui/math/SGWindow.py
 PyMca5/PyMcaGui/math/SIFTAlignmentWindow.py
 PyMca5/PyMcaGui/math/SNIPWindow.py
+PyMca5/PyMcaGui/math/SimpleActions.py
 PyMca5/PyMcaGui/math/StripBackgroundWidget.py
 PyMca5/PyMcaGui/math/__init__.py
 PyMca5/PyMcaGui/math/fitting/CheckField.py
@@ -460,6 +463,7 @@ PyMca5/PyMcaGui/plotting/LegendSelector.py
 PyMca5/PyMcaGui/plotting/MaskImageTools.py
 PyMca5/PyMcaGui/plotting/MaskImageWidget.py
 PyMca5/PyMcaGui/plotting/MaskScatterWidget.py
+PyMca5/PyMcaGui/plotting/MaskToolBar.py
 PyMca5/PyMcaGui/plotting/McaROIWidget.py
 PyMca5/PyMcaGui/plotting/ObjectPrintConfigurationDialog.py
 PyMca5/PyMcaGui/plotting/PlotWidget.py
@@ -479,9 +483,11 @@ PyMca5/PyMcaGui/pymca/ChangeLog.py
 PyMca5/PyMcaGui/pymca/EdfFileSimpleViewer.py
 PyMca5/PyMcaGui/pymca/ExternalImagesWindow.py
 PyMca5/PyMcaGui/pymca/Fit2Spec.py
+PyMca5/PyMcaGui/pymca/LegacyScanWindow.py
 PyMca5/PyMcaGui/pymca/Mca2Edf.py
 PyMca5/PyMcaGui/pymca/McaCalibrationControlGUI.py
 PyMca5/PyMcaGui/pymca/McaCustomEvent.py
+PyMca5/PyMcaGui/pymca/McaLegendselector.py
 PyMca5/PyMcaGui/pymca/McaSimpleFit.py
 PyMca5/PyMcaGui/pymca/McaWindow.py
 PyMca5/PyMcaGui/pymca/Median2DBrowser.py
@@ -511,6 +517,7 @@ PyMca5/PyMcaGui/pymca/RGBCorrelatorTable.py
 PyMca5/PyMcaGui/pymca/RGBCorrelatorWidget.py
 PyMca5/PyMcaGui/pymca/RGBImageCalculator.py
 PyMca5/PyMcaGui/pymca/ScanFit.py
+PyMca5/PyMcaGui/pymca/ScanFitToolButton.py
 PyMca5/PyMcaGui/pymca/ScanWindow.py
 PyMca5/PyMcaGui/pymca/ScanWindowInfoWidget.py
 PyMca5/PyMcaGui/pymca/SilxExternalImagesWindow.py
@@ -715,6 +722,7 @@ PyMca5/PyMcaPlugins/ImageAlignmentStackPlugin.py
 PyMca5/PyMcaPlugins/KineticsPlugin.py
 PyMca5/PyMcaPlugins/LoadPositionersStackPlugin.py
 PyMca5/PyMcaPlugins/MathPlugins.py
+PyMca5/PyMcaPlugins/Medfilt2DPlugin.py
 PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py
 PyMca5/PyMcaPlugins/MedianFilterScanPlugin.py
 PyMca5/PyMcaPlugins/MedianFilterStackPlugin.py
@@ -767,6 +775,7 @@ PyMca5/tests/SpecfileTest.py
 PyMca5/tests/StackBaseTest.py
 PyMca5/tests/StackInfoTest.py
 PyMca5/tests/TestAll.py
+PyMca5/tests/WidgetsTest.py
 PyMca5/tests/XrfTest.py
 PyMca5/tests/__init__.py
 PyMca5/tests/specfilewrapperTest.py
@@ -786,20 +795,55 @@ doc/source/index.rst
 doc/source/install.rst
 doc/source/license.rst
 doc/source/overview.rst
+doc/source/recipes.rst
 doc/source/tutorials.rst
 doc/source/_templates/localtoc.html
 doc/source/_templates/pagesource.html
 doc/source/customization/index.rst
-doc/source/customization/settings.rst
 doc/source/customization/plugins/index.rst
 doc/source/customization/plugins/plugins1d.rst
 doc/source/customization/plugins/stackplugins.rst
+doc/source/customization/settings/index.rst
+doc/source/customization/settings/img/settings_01.png
+doc/source/customization/settings/img/settings_02.png
 doc/source/hdf5/index.rst
 doc/source/img/PyMca.ico
 doc/source/img/PyMca_256x256.png
 doc/source/modules/index.rst
 doc/source/modules/core/index.rst
 doc/source/modules/core/nexustools.rst
+doc/source/recipes/xrfembedpyqt.rst
+doc/source/recipes/xrfhdf5stack.rst
+doc/source/recipes/recipescode/GenerateHDF5Stack.py
+doc/source/training/matrix/index.rst
+doc/source/training/matrix/img/matrix_01.png
+doc/source/training/matrix/img/matrix_02.png
+doc/source/training/matrix/img/matrix_03.png
+doc/source/training/matrix/img/matrix_04.png
+doc/source/training/matrix/img/tertiary_01.png
+doc/source/training/matrix/img/tertiary_03.png
+doc/source/training/matrix/img/tertiary_04.png
+doc/source/training/quantification/index.rst
+doc/source/training/quantification/img/quantification_01.png
+doc/source/training/quantification/img/quantification_02.png
+doc/source/training/quantification/img/quantification_03.png
+doc/source/training/quantification/img/quantification_04.png
+doc/source/training/quantification/img/quantification_05.png
+doc/source/training/quantification/img/quantification_06.png
+doc/source/training/quantification/img/quantification_07.png
+doc/source/training/quantification/img/quantification_08.png
+doc/source/training/quantification/img/quantification_09.png
+doc/source/training/quantification/img/quantification_10.png
+doc/source/training/quantification/img/quantification_11.png
+doc/source/training/quantification/img/quantification_12.png
+doc/source/training/tertiary/index.rst
+doc/source/training/tertiary/img/tertiary_01.png
+doc/source/training/tertiary/img/tertiary_02.png
+doc/source/training/tertiary/img/tertiary_03.png
+doc/source/training/tertiary/img/tertiary_04.png
+doc/source/training/xraydata/index.rst
+doc/source/training/xraydata/img/xraydata_01.png
+doc/source/training/xraydata/img/xraydata_02.png
 doc/source/xrf/material-definition/index.rst
 doc/source/xrf/material-definition/img/materials_01.jpg
 doc/source/xrf/material-definition/img/materials_02.jpg
@@ -853,97 +897,6 @@ scripts/pymcabatch.bat
 scripts/pymcapostbatch.bat
 scripts/pymcaroitool.bat
 scripts/rgbcorrelator.bat
-third-party/fisx/LICENSE
-third-party/fisx/MANIFEST.in
-third-party/fisx/README.rst
-third-party/fisx/TODO
-third-party/fisx/changelog.txt
-third-party/fisx/setup.py
-third-party/fisx/fisx_data/BindingEnergies.dat
-third-party/fisx/fisx_data/EADL97_BindingEnergies.dat
-third-party/fisx/fisx_data/EADL97_KShellConstants.dat
-third-party/fisx/fisx_data/EADL97_KShellNonradiativeRates.dat
-third-party/fisx/fisx_data/EADL97_KShellRadiativeRates.dat
-third-party/fisx/fisx_data/EADL97_LShellConstants.dat
-third-party/fisx/fisx_data/EADL97_LShellNonradiativeRates.dat
-third-party/fisx/fisx_data/EADL97_LShellRadiativeRates.dat
-third-party/fisx/fisx_data/EADL97_MShellConstants.dat
-third-party/fisx/fisx_data/EADL97_MShellNonradiativeRates.dat
-third-party/fisx/fisx_data/EADL97_MShellRadiativeRates.dat
-third-party/fisx/fisx_data/EPDL97_CrossSections.dat
-third-party/fisx/fisx_data/KShellConstants.dat
-third-party/fisx/fisx_data/KShellRates.dat
-third-party/fisx/fisx_data/LShellConstants.dat
-third-party/fisx/fisx_data/LShellRates.dat
-third-party/fisx/fisx_data/MShellConstants.dat
-third-party/fisx/fisx_data/MShellRates.dat
-third-party/fisx/fisx_data/XCOM_CrossSections.dat
-third-party/fisx/python/cython/Detector.pxd
-third-party/fisx/python/cython/EPDL97.pxd
-third-party/fisx/python/cython/Element.pxd
-third-party/fisx/python/cython/Elements.pxd
-third-party/fisx/python/cython/Layer.pxd
-third-party/fisx/python/cython/Material.pxd
-third-party/fisx/python/cython/Math.pxd
-third-party/fisx/python/cython/PyDetector.pyx
-third-party/fisx/python/cython/PyEPDL97.pyx
-third-party/fisx/python/cython/PyElement.pyx
-third-party/fisx/python/cython/PyElements.pyx
-third-party/fisx/python/cython/PyLayer.pyx
-third-party/fisx/python/cython/PyMaterial.pyx
-third-party/fisx/python/cython/PyMath.pyx
-third-party/fisx/python/cython/PyShell.pyx
-third-party/fisx/python/cython/PySimpleIni.pyx
-third-party/fisx/python/cython/PySimpleSpecfile.pyx
-third-party/fisx/python/cython/PyVersion.pyx
-third-party/fisx/python/cython/PyXRF.pyx
-third-party/fisx/python/cython/Shell.pxd
-third-party/fisx/python/cython/SimpleIni.pxd
-third-party/fisx/python/cython/SimpleSpecfile.pxd
-third-party/fisx/python/cython/Version.pxd
-third-party/fisx/python/cython/XRF.pxd
-third-party/fisx/python/cython/_fisx.pyx
-third-party/fisx/python/cython/default/_fisx.cpp
-third-party/fisx/python/fisx/DataDir.py
-third-party/fisx/python/fisx/FisxCythonTools.py
-third-party/fisx/python/fisx/__init__.py
-third-party/fisx/python/fisx/tests/__init__.py
-third-party/fisx/python/fisx/tests/testAll.py
-third-party/fisx/python/fisx/tests/testDataDir.py
-third-party/fisx/python/fisx/tests/testEPDL97.py
-third-party/fisx/python/fisx/tests/testElements.py
-third-party/fisx/python/fisx/tests/testSimpleSpecfile.py
-third-party/fisx/python/fisx/tests/testXRF.py
-third-party/fisx/src/fisx_beam.cpp
-third-party/fisx/src/fisx_beam.h
-third-party/fisx/src/fisx_defaultelementsinfo.h
-third-party/fisx/src/fisx_detector.cpp
-third-party/fisx/src/fisx_detector.h
-third-party/fisx/src/fisx_element.cpp
-third-party/fisx/src/fisx_element.h
-third-party/fisx/src/fisx_elements.cpp
-third-party/fisx/src/fisx_elements.h
-third-party/fisx/src/fisx_epdl97.cpp
-third-party/fisx/src/fisx_epdl97.h
-third-party/fisx/src/fisx_layer.cpp
-third-party/fisx/src/fisx_layer.h
-third-party/fisx/src/fisx_material.cpp
-third-party/fisx/src/fisx_material.h
-third-party/fisx/src/fisx_math.cpp
-third-party/fisx/src/fisx_math.h
-third-party/fisx/src/fisx_multilayer.cpp
-third-party/fisx/src/fisx_shell.cpp
-third-party/fisx/src/fisx_shell.h
-third-party/fisx/src/fisx_simpleini.cpp
-third-party/fisx/src/fisx_simpleini.h
-third-party/fisx/src/fisx_simplespecfile.cpp
-third-party/fisx/src/fisx_simplespecfile.h
-third-party/fisx/src/fisx_version.cpp
-third-party/fisx/src/fisx_version.h
-third-party/fisx/src/fisx_xrf.cpp
-third-party/fisx/src/fisx_xrf.h
-third-party/fisx/src/fisx_xrfconfig.cpp
-third-party/fisx/src/fisx_xrfconfig.h
 third-party/khronos_headers/GL/glcorearb.h
 third-party/khronos_headers/GL/glext.h
 third-party/khronos_headers/GL/glxext.h
diff --git a/PyMca5.egg-info/requires.txt b/PyMca5.egg-info/requires.txt
index 265c771..409ddbf 100644
--- a/PyMca5.egg-info/requires.txt
+++ b/PyMca5.egg-info/requires.txt
@@ -1,4 +1,4 @@
-fisx>=1.1.4
+fisx>=1.1.6
 h5py
 matplotlib>1.0
 numpy