Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1030 from ess-dmsc/sort-json-keys
Browse files Browse the repository at this point in the history
Feat: Sort keys in output json
  • Loading branch information
ggoneiESS authored Aug 3, 2023
2 parents c64b186 + 6322a67 commit cf1a56e
Show file tree
Hide file tree
Showing 162 changed files with 1,134 additions and 1,111 deletions.
8 changes: 6 additions & 2 deletions nexus_constructor/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,14 @@ def _save_to_filewriter_json(self, save_compressed_file):
error_collector: List[str] = []
if save_compressed_file:
data_dump = json.dumps(
self.model.as_dict(error_collector), separators=(",", ":")
self.model.as_dict(error_collector),
separators=(",", ":"),
sort_keys=True,
)
else:
data_dump = json.dumps(self.model.as_dict(error_collector), indent=2)
data_dump = json.dumps(
self.model.as_dict(error_collector), indent=2, sort_keys=True
)
if error_collector:
show_errors_message(error_collector)
return
Expand Down
18 changes: 18 additions & 0 deletions nx-class-documentation/html/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,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;
Expand Down Expand Up @@ -738,6 +748,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 {
Expand Down
14 changes: 7 additions & 7 deletions nx-class-documentation/html/applying-nexus.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>1.3. Constructing NeXus Files and Application Definitions &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="_static/blockquote.css" type="text/css" />
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/doctools.js"></script>
<script src="_static/sphinx_highlight.js"></script>
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js?v=a16566f4"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=4825356b"></script>
<script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
Expand Down Expand Up @@ -788,8 +788,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/authorgroup.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>9.1. Authors &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="_static/blockquote.css" type="text/css" />
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/doctools.js"></script>
<script src="_static/sphinx_highlight.js"></script>
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js?v=a16566f4"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="copyright" title="Copyright" href="copyright.html" />
Expand Down Expand Up @@ -150,8 +150,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/classes/applications/NXarchive.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.1. NXarchive &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<link rel="copyright" title="Copyright" href="../../copyright.html" />
Expand Down Expand Up @@ -449,8 +449,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/classes/applications/NXarpes.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.2. NXarpes &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<link rel="copyright" title="Copyright" href="../../copyright.html" />
Expand Down Expand Up @@ -368,8 +368,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/classes/applications/NXcanSAS.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.3. NXcanSAS &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
Expand Down Expand Up @@ -1534,8 +1534,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.4. NXdirecttof &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<link rel="copyright" title="Copyright" href="../../copyright.html" />
Expand Down Expand Up @@ -251,8 +251,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/classes/applications/NXfluo.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.5. NXfluo &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<link rel="copyright" title="Copyright" href="../../copyright.html" />
Expand Down Expand Up @@ -308,8 +308,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.6. NXindirecttof &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<link rel="copyright" title="Copyright" href="../../copyright.html" />
Expand Down Expand Up @@ -237,8 +237,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions nx-class-documentation/html/classes/applications/NXiqproc.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<title>3.3.2.7. NXiqproc &#8212; nexus v2020.10 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
<link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
<link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/doctools.js"></script>
<script src="../../_static/sphinx_highlight.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>
<script src="../../_static/doctools.js?v=888ff710"></script>
<script src="../../_static/sphinx_highlight.js?v=4825356b"></script>
<script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
Expand Down Expand Up @@ -333,8 +333,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.0.1.
&#169; <a href="../../copyright.html">Copyright</a> 1996-2023, NIAC, https://www.nexusformat.org.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.1.2.
</div>
</body>
</html>
Loading

0 comments on commit cf1a56e

Please sign in to comment.