Merge pull request #12 from sandialabs/develop

Updated to 0.11.0

Author: dprohe

docs/source/_templates/footer.html

@@ -0,0 +1,5 @@
+{% extends "!footer.html" %}
+{%- block contentinfo %}
+{{ super }}
+<img src="_images/snl.jpg" alt="Sandia National Laboratories" style="height:40px">
+{% endblock %}

docs/source/conf.py

@@ -30,10 +30,8 @@ def get_version():
 
 
 project = 'SDynPy'
+copyright = '2022, Sandia National Laboratories'
 author = 'Daniel P. Rohe'
-copyright = '2022 National Technology & Engineering Solutions of Sandia, \
-    LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, \
-    the U.S. Government retains certain rights in this software'
 
 # The full version, including alpha/beta/rc tags
 release = get_version()
@@ -45,7 +43,10 @@ def get_version():
 html_static_path = ['_static']
 html_css_files = ['custom.css']
 html_theme = 'sphinx_rtd_theme'
-html_theme_options = {'navigation_depth': 8}
+html_theme_options = {'navigation_depth': 8,
+                      'logo_only': True,
+                      'display_version':False}
+html_logo = 'images/logo_horizontal_light.svg'
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.napoleon',

docs/source/example_problems/transmission_simulator.rst

@@ -85,7 +85,6 @@ will start by importing the required modules and setting up plotting options.
     import numpy as np # For numerics
     import matplotlib.pyplot as plt # For plotting
     from scipy.spatial import QhullError # For creating elements for visualization
-    QhullError = qhull.QhullError # To check if element creation has failed
     
     # Set up options to use for plotting
     plot_options = {'node_size':0,'line_width':1,'show_edges':False,

docs/source/images/logo_horizontal.svg

@@ -3,6 +3,13 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+.. image:: /images/logo_horizontal.svg
+  :width: 550
+  :alt: SDynPy Logo
+  :align: center
+
+|
+
 Welcome to SDynPy's documentation!
 ==================================
 

docs/source/images/logo_horizontal_light.svg

@@ -163,4 +163,9 @@ SDynPy has several general purpose signal processing tools as well.  These inclu
 * :py:mod:`sdpy.correlation<sdynpy.signal_processing.sdynpy_correlation>` - Functions for comparing data
 * :py:mod:`sdpy.complex<sdynpy.signal_processing.sdynpy_complex>` - Functions for working with complex numbers
 * :py:mod:`sdpy.rotation<sdynpy.signal_processing.sdynpy_rotation>` - Functions for computing and working with rotation matrices
-* :py:mod:`sdpy.generator<sdynpy.signal_processing.sdynpy_generator>` - Functions for generating standard signal types such as sine or pseudorandom
+* :py:mod:`sdpy.generator<sdynpy.signal_processing.sdynpy_generator>` - Functions for generating standard signal types such as sine or pseudorandom
+* :py:mod:`sdpy.camera<sdynpy.signal_processing.sdynpy_camera>` - Functions for working with camera projections and projections
+* :py:mod:`sdpy.harmonic<sdynpy.signal_processing.sdynpy_harmonic>` - Functions for working with harmonic signals
+* :py:mod:`sdpy.geometry_fitting<sdynpy.signal_processing.sdynpy_geometry_fitting>` - Functions for fitting geometry to data
+* :py:mod:`sdpy.frf_inverse<sdynpy.signal_processing.sdynpy_frf_inverse>` - Functions for inverting frequency response functions for inverse problems
+* :py:mod:`sdpy.srs<sdynpy.signal_processing.sdynpy_srs>` - Functions for computing shock response spectra and generating sum-decayed-sines signals

docs/source/index.rst

@@ -46,16 +46,17 @@ def get_ui_files(directory):
         "numpy",
         "scipy",
         "matplotlib",
+        "npTDMS",
         "qtpy",
-        "PyQt6; sys_platform=='darwin'",
-        "PyQt5; sys_platform!='darwin'",
+        "PyQt5",
         "pyqtgraph",
         "netCDF4",
         "pandas",
         "python-pptx",
         "Pillow",
         "pyvista",
         "pyvistaqt",
+        "openpyxl",
         "vtk"
     ],
     python_requires='>=3.8',
@@ -76,6 +77,7 @@ def get_ui_files(directory):
                  'Programming Language :: Python :: 3.8',
                  'Programming Language :: Python :: 3.9',
                  'Programming Language :: Python :: 3.10',
+                 'Programming Language :: Python :: 3.11',
                  'Framework :: Pytest',
                  'License :: OSI Approved :: GNU General Public License v3 (GPLv3)'
                  ]