1.5.1 release

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: XAFSmass
-Version: 1.5.0
+Version: 1.5.1
 Summary: A program for calculating the mass of XAFS samples. For synchrotron users.
 Home-page: http://xafsmass.readthedocs.io
 Author: Konstantin Klementiev, Roman Chernikov
@@ -18,6 +18,9 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
+Requires-Dist: numpy>=1.8.0
+Requires-Dist: matplotlib>=2.0.0
+Requires-Dist: distro
 
 
 A program for calculating the mass of XAFS [X-ray Absorption Fine Structure]

XAFSmass/XAFSmassQt.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 __author__ = "Konstantin Klementiev, Roman Chernikov"
-__date__ = "30 Nov 2023"
+__date__ = "10 Oct 2024"
 
 import sys
 import os
@@ -261,14 +261,12 @@ def __init__(self, parent=None):
 
         self.muTdLabel = QLabel("")
         self.muTdEdit = QLineEdit()
-        self.muTdEdit.setPlaceholderText('typ. 2.6')
 #        font = QtGui.QFont(self.font())
 #        font.setPointSize(font.pointSize()+2)
 #        fm = QtGui.QFontMetrics(font)
 #        self.muTdEdit.setMinimumSize(fm.width("8.88"), fm.height())
         self.areaLabel = QLabel("")
         self.areaEdit = QLineEdit()
-        self.areaEdit.setPlaceholderText('1.33 for \u230013mm ')
 #        self.areaEdit.setMinimumSize(fm.width("8.88"), fm.height())
         self.dmudLabel = QLabel(u"δµd = ")
         self.dmudEdit = QLineEdit()
@@ -282,6 +280,7 @@ def __init__(self, parent=None):
         self.energyCB.currentIndexChanged.connect(self.energySelected)
         self.energy = 9029
         self.energyCB.lineEdit().setText(str(self.energy))
+        self.energyCB.setMaxVisibleItems(25)
 
         self.tableLabel = QLabel("f data table:")
         self.tableCB = QComboBox()
@@ -490,22 +489,30 @@ def updateUi(self):
             self.areaLabel.setText(u"S (cm<sup>2</sup>) = ")
             self.resNuLabel.setText(u"ν (mmol) = ")
             self.resMassLabel.setText("m (mg) = ")
+            self.muTdEdit.setPlaceholderText('typ. 2.6')
+            self.areaEdit.setPlaceholderText('1.33 for \u230013mm ')
             self.resNuLabel.show()
             self.resNu.show()
         elif self.what == FOIL:
             self.areaLabel.setText(u"ρ (g/cm<sup>3</sup>) = ")
             self.resMassLabel.setText(u"d (µm) = ")
+            self.muTdEdit.setPlaceholderText('typ. 2.6')
+            self.areaEdit.setPlaceholderText('')
             self.resNuLabel.hide()
             self.resNu.hide()
         elif self.what == GAS:
             self.areaLabel.setText(u"d (cm) = ")
             self.resMassLabel.setText(u"p (mbar) = ")
+            self.muTdEdit.setPlaceholderText('(0, 1)')
+            self.areaEdit.setPlaceholderText('')
             self.resNuLabel.hide()
             self.resNu.hide()
         elif self.what == XCONTENT:
             self.areaLabel.setText(u"Δµd = ")
             self.resNuLabel.setText("N<sub>x</sub> = ")
             self.resMassLabel.setText(r"wt%<sub>x</sub> = ")
+            self.muTdEdit.setPlaceholderText('')
+            self.areaEdit.setPlaceholderText('')
             self.resNuLabel.show()
             self.resNu.show()
 
@@ -849,7 +856,7 @@ def isWin11():
             <li>{1[0]}
             <li>{1[1]}
             </ul>
-            <p>Open source, {2}. Available at PyPI and GitHub<p>
+            <p>Open source, {2}. Available on PyPI and GitHub<p>
             <p>Your system:
             <ul>
             <li>{3}

XAFSmass/__init__.py

@@ -195,12 +195,12 @@
 
 """
 __module__ = "XAFSmass"
-__versioninfo__ = (1, 5, 0)
+__versioninfo__ = (1, 5, 1)
 __version__ = '.'.join(map(str, __versioninfo__))
 __author__ = \
     "Konstantin Klementiev (MAX IV Laboratory), " +\
-    "Roman Chernikov (Canadian Light Source)"
+    "Roman Chernikov (NSLS-II)"
 __email__ = \
     "konstantin.klementiev@gmail.com, rchernikov@gmail.com"
-__date__ = "30 Nov 2023"
+__date__ = "10 Oct 2024"
 __license__ = "MIT license"

XAFSmass/help/_sources/index.rst.txt

@@ -8,7 +8,7 @@ XAFSmass
 
 :Release: |version| |DOI|
 :Date: |today|
-:Authors: Konstantin Klementiev (MAX IV Laboratory), Roman Chernikov (Canadian Light Source)
+:Authors: Konstantin Klementiev (MAX IV Laboratory), Roman Chernikov (NSLS-II)
 :License: Open Source, :ref:`MIT License <license>`
 
 .. |DOI| image:: https://zenodo.org/badge/54989911.svg

XAFSmass/help/_static/basic.css

@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -237,6 +237,10 @@ a.headerlink {
     visibility: hidden;
 }
 
+a:visited {
+    color: #551A8B;
+}
+
 h1:hover > a.headerlink,
 h2:hover > a.headerlink,
 h3:hover > a.headerlink,
@@ -670,6 +674,16 @@ dd {
     margin-left: 30px;
 }
 
+.sig dd {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.sig dl {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
 dl > dd:last-child,
 dl > dd:last-child > :last-child {
     margin-bottom: 0;
@@ -738,6 +752,14 @@ abbr, acronym {
     cursor: help;
 }
 
+.translated {
+    background-color: rgba(207, 255, 207, 0.2)
+}
+
+.untranslated {
+    background-color: rgba(255, 207, 207, 0.2)
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {

XAFSmass/help/_static/classic.css

@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- classic theme.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -129,7 +129,7 @@ a {
 }
 
 a:visited {
-    color: #355f7c;
+    color: #551a8b;
     text-decoration: none;
 }
 

XAFSmass/help/_static/doctools.js

@@ -4,7 +4,7 @@
  *
  * Base JavaScript utilities for all Sphinx HTML documentation.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

XAFSmass/help/_static/documentation_options.js

@@ -1,6 +1,5 @@
-var DOCUMENTATION_OPTIONS = {
-    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '1.5.0',
+const DOCUMENTATION_OPTIONS = {
+    VERSION: '1.5.1',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

XAFSmass/help/_static/language_data.js

@@ -5,15 +5,15 @@
  * This script contains the language-specific data used by searchtools.js,
  * namely the list of stopwords, stemmer, scorer and splitter.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
 
 var stopwords = ["a", "and", "are", "as", "at", "be", "but", "by", "for", "if", "in", "into", "is", "it", "near", "no", "not", "of", "on", "or", "such", "that", "the", "their", "then", "there", "these", "they", "this", "to", "was", "will", "with"];
 
 
-/* Non-minified version is copied as a separate JS file, is available */
+/* Non-minified version is copied as a separate JS file, if available */
 
 /**
  * Porter Stemmer

XAFSmass/help/_static/pygments.css

@@ -17,6 +17,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */
 .highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
 .highlight .gr { color: #FF0000 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #00A000 } /* Generic.Inserted */