Renamed kmap to xsocs.

.travis.yml

@@ -60,7 +60,7 @@ script:
     - pip install --upgrade pip
 
     # Install from source package
-    - pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ kmap
+    - pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ xsocs
 
     # Print Python info
     - python ci/info_platform.py

MANIFEST.in

 include README.rst
 include MANIFEST.in
 include run_tests.py
-recursive-include kmap *.pyx *.pxd *.pxi
-recursive-include kmap *.h *.c *.cpp
+recursive-include xsocs *.pyx *.pxd *.pxi
+recursive-include xsocs *.h *.c *.cpp
 recursive-include doc/source *.py *.rst *.png *.ico

README.rst

 
-kmap
+xsocs
 ====
 
 TBD
@@ -9,8 +9,8 @@ Installation
 
 The latest development version can be obtained from the git repository::
 
-    git clone git://gitlab.esrf.fr:kmap/kmap.git
-    cd kmap
+    git clone git://gitlab.esrf.fr:xsocs/xsocs.git
+    cd xsocs
 
 And then install::
     pip install . [--user]
@@ -50,7 +50,7 @@ Testing
 License
 -------
 
-The source code of kmap is licensed under the MIT and LGPL licenses.
+The source code of xsocs is licensed under the MIT and LGPL licenses.
 See the `copyright file TBD`_ for details.
 
 .. |Travis Status| image:: TBD

ci/appveyor.yml

@@ -70,7 +70,7 @@ test_script:
     - "pip install matplotlib"
 
     # Install the generated wheel package to test it
-    #- "pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ kmap"
+    #- "pip install --pre --find-links dist/ --trusted-host www.edna-site.org --find-links http://www.edna-site.org/pub/wheelhouse/ xsocs"
 
     # Print Python info
     - "python ci\\info_platform.py"

circle.yml

@@ -33,20 +33,20 @@ dependencies:
         - cp dist/*.tar.gz $CIRCLE_ARTIFACTS
 
         # Install generated wheel and its dependencies
-        - pip install --upgrade --pre --find-links dist/ kmap
+        - pip install --upgrade --pre --find-links dist/ xsocs
 
     post:
         # Clean-up
         - python setup.py clean --all
 
-        # Uninstall kmap before caching
+        # Uninstall xsocs before caching
         # Hack to avoid caching installed package
-        - pip uninstall --yes kmap
+        - pip uninstall --yes xsocs
 
 test:
     pre:
         # Install generated wheel
-        - pip install --pre --find-links dist/ kmap
+        - pip install --pre --find-links dist/ xsocs
 
     override:
         # Print Python info

copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kmap
-Source: https://github.com/kmap-project
+Upstream-Name: xsocs
+Source: https://github.com/xsocs-project
 
 Files: *
 Copyright: 2015-2016 European Synchrotron Radiation Facility
-           Data analysis unit (kmap@esrf.fr) 
+           Data analysis unit (xsocs@esrf.fr)
 License: MIT
 
 License: MIT

scripts/start.py

@@ -102,12 +102,12 @@ def upgrade_project(name, repo):
 
 
 if args.upgrade:
-    upgrade_project("kmap", "git://gitlab.esrf.fr/kmap/kmap.git")
+    upgrade_project("xsocs", "git://gitlab.esrf.fr/xsocs/xsocs.git")
     upgrade_project("plot3d", "git://gitlab.esrf.fr/tvincent/plot3d.git")
     sys.exit()
 
 
-# Add local install of xrayutilities, kmap and plot3d
+# Add local install of xrayutilities, xsocs and plot3d
 # Build command for xrayutilities:
 # PYTHONPATH=/scisoft/xsocs/lib/python2.7/site-packages ; python setup.py --without-openmp install --prefix=/scisoft/xsocs/
 
@@ -116,6 +116,6 @@ script_dir = os.path.dirname(__file__)
 site.addsitedir(os.path.join(script_dir, 'lib', 'python2.7', 'site-packages'))
 
 # Start application
-from kmap.gui import xsocs_main
+from xsocs.gui import xsocs_main
 
 xsocs_main(projectH5File=args.project)

setup.py

@@ -50,7 +50,7 @@ except ImportError:
     from distutils.command.build_ext import build_ext
     from distutils.command.sdist import sdist
 
-PROJECT = "kmap"
+PROJECT = "xsocs"
 cmdclass = {}
 
 
@@ -430,7 +430,7 @@ setup_requires = ["numpy"]
 setup_kwargs.update(
                     name=PROJECT,
                     version=get_version(),
-                    url="http://gitlab.esrf.fr/kmap/kmap",
+                    url="http://gitlab.esrf.fr/xsocs/xsocs",
                     author="data analysis unit",
                     author_email="silx@esrf.fr",
                     classifiers=classifiers,
@@ -439,7 +439,7 @@ setup_kwargs.update(
                     install_requires=install_requires,
                     setup_requires=setup_requires,
                     cmdclass=cmdclass,
-                    package_data={'kmap.resources': [
+                    package_data={'xsocs.resources': [
                         # Add here all resources files
                         'gui/icons/*.png',
                         ]},

kmap/examples/id01_merge.py → xsocs/examples/id01_merge.py

@@ -31,7 +31,7 @@ __license__ = "MIT"
 import os
 import time
 
-from kmap.util.id01_spec import merge_scan_data
+from xsocs.util.id01_spec import merge_scan_data
 
 # output directory (some temporary files will also be written there)
 output_dir = '/path/to/output/'

kmap/examples/id01_peak.py → xsocs/examples/id01_peak.py

 import os
-from kmap.process import peak_fit
+from xsocs.process import peak_fit
 
 import numpy as np
 

kmap/examples/id01_qspace.py → xsocs/examples/id01_qspace.py

-from kmap.process import qspace
+from xsocs.process import qspace
 
 # ========================
 # Files

kmap/gui/process/FitWidget.py → xsocs/gui/process/FitWidget.py

@@ -201,8 +201,9 @@ class FitWidget(Qt.QWidget):
         fitTypeCb.currentIndexChanged[str].connect(
             self.__slotCurrentTextChanged)
 
+        layout.addLayout(fitLayout, 2, 0, alignment=Qt.Qt.AlignLeft)
+
         self.__nPeaksSpinBox = spinbox = Qt.QSpinBox()
-        # layout.addLayout(fitLayout, 2, 0, alignment=Qt.Qt.AlignLeft)
         # spinbox.setMinimum(1)
         # spinbox.setMaximum(20)
         # spinbox.setValue(self.__nPeaks)

kmap/gui/view/FitView.py → xsocs/gui/view/FitView.py

@@ -33,13 +33,13 @@ __date__ = "15/09/2016"
 import numpy as np
 
 from silx.gui import qt as Qt
-from kmap.gui.project.XsocsH5Factory import h5NodeToProjectItem
-from kmap.gui.widgets.Containers import GroupBox
+from xsocs.gui.project.XsocsH5Factory import h5NodeToProjectItem
+from xsocs.gui.widgets.Containers import GroupBox
 
-from kmap.io.FitH5 import FitH5, FitH5QAxis
+from xsocs.io.FitH5 import FitH5, FitH5QAxis
 
 from ..widgets.XsocsPlot2D import XsocsPlot2D
-from kmap.gui.model.TreeView import TreeView
+from xsocs.gui.model.TreeView import TreeView
 from .fitview.FitModel import FitModel, FitH5Node
 from .fitview.DropPlotWidget import DropPlotWidget
 

kmap/gui/view/fitview/DropPlotWidget.py → xsocs/gui/view/fitview/DropPlotWidget.py

@@ -33,7 +33,7 @@ import numpy as np
 
 from silx.gui import qt as Qt
 
-from kmap.io.FitH5 import FitH5, FitH5QAxis
+from xsocs.io.FitH5 import FitH5, FitH5QAxis
 from ....process.fitresults import FitStatus
 
 from ...widgets.XsocsPlot2D import XsocsPlot2D

kmap/gui/view/fitview/FitModel.py → xsocs/gui/view/fitview/FitModel.py

@@ -33,15 +33,16 @@ from silx.gui import qt as Qt
 
 import numpy as np
 
-from kmap.gui.model.Model import Model, RootNode
-from kmap.gui.project.Hdf5Nodes import H5File
-from kmap.gui.model.ModelDef import ModelRoles
+from ...model.ModelDef import ModelRoles
+from ...model.Model import Model, RootNode
 
-from kmap.io.FitH5 import FitH5, FitH5QAxis
+from ...project.Hdf5Nodes import H5File
+from ...project.Hdf5Nodes import H5Base, H5NodeClassDef
+
+from ....io.FitH5 import FitH5, FitH5QAxis
 from ....process.peak_fit import FitStatus
 
 from ...widgets.XsocsPlot2D import XsocsPlot2D
-from ...project.Hdf5Nodes import H5Base, H5NodeClassDef
 
 
 def _grabWidget(widget):

kmap/io/FitH5.py → xsocs/io/FitH5.py

@@ -179,8 +179,6 @@ class FitH5(XsocsH5Base):
                                                              axis=axis_name))
         return status
 
-
-
     def scan_x(self, entry):
         """
         Return the sample points coordinates along x for the given entry.

kmap/resources/gui/icons/create_project.svg → xsocs/resources/gui/icons/create_project.svg

@@ -17,7 +17,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="create_project.svg"
-   inkscape:export-filename="/home/erlaak/work/devs/kmap/kmap/resources/gui/icons/create_project.png"
+   inkscape:export-filename="/home/erlaak/work/devs/xsocs/xsocs/resources/gui/icons/create_project.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs

kmap/resources/gui/icons/left_arrow.svg → xsocs/resources/gui/icons/left_arrow.svg

@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.5 r10040"
    sodipodi:docname="left_arrow.svg"
-   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/kmap/kmap/resources/gui/icons/left_arrow.png"
+   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/xsocs/xsocs/resources/gui/icons/left_arrow.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs

kmap/resources/gui/icons/right_arrow.svg → xsocs/resources/gui/icons/right_arrow.svg

@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.5 r10040"
    sodipodi:docname="right_arrow.svg"
-   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/kmap/kmap/resources/gui/icons/right_arrow.png"
+   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/xsocs/xsocs/resources/gui/icons/right_arrow.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs

kmap/resources/gui/icons/save_2dscatter.svg → xsocs/resources/gui/icons/save_2dscatter.svg

@@ -17,7 +17,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="save_2dscatter.svg"
-   inkscape:export-filename="/home/erlaak/work/devs/kmap/kmap/resources/gui/icons/save_2dscatter.png"
+   inkscape:export-filename="/home/erlaak/work/devs/xsocs/xsocs/resources/gui/icons/save_2dscatter.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs

kmap/resources/gui/icons/xsocs.svg → xsocs/resources/gui/icons/xsocs.svg

@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.5 r10040"
    sodipodi:docname="xsocs.svg"
-   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/kmap/kmap/resources/gui/icons/xsocs.png"
+   inkscape:export-filename="/users/naudet/workspace/dau/id01/devs/xsocs/xsocs/resources/gui/icons/xsocs.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs

kmap/setup.py → xsocs/setup.py

@@ -31,7 +31,7 @@ from numpy.distutils.misc_util import Configuration
 
 
 def configuration(parent_package='', top_path=None):
-    config = Configuration('kmap', parent_package, top_path)
+    config = Configuration('xsocs', parent_package, top_path)
     config.add_subpackage('examples')
     config.add_subpackage('gui')
     config.add_subpackage('io')

kmap/test/__init__.py → xsocs/test/__init__.py

@@ -22,7 +22,7 @@
 # THE SOFTWARE.
 #
 # ###########################################################################*/
-"""Full kmap test suite.
+"""Full xsocs test suite.
 """
 
 __authors__ = ["D. Naudet"]

kmap/test/test_version.py → xsocs/test/test_version.py

@@ -30,12 +30,12 @@ __date__ = "20/04/2016"
 
 import unittest
 
-import kmap
+import xsocs
 
 
 class TestVersion(unittest.TestCase):
     def test_version(self):
-        self.assertTrue(isinstance(kmap.version, str))
+        self.assertTrue(isinstance(xsocs.version, str))
 
 
 def suite():