Merge pull request #12 from sandialabs/develop

Updated to 0.11.0

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/index.rst

@@ -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/usage.rst

@@ -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

setup.py

@@ -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)'
                  ]

src/sdynpy/__init__.py

@@ -18,16 +18,18 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from .core import coordinate, colors, array, geometry, shape, data, system, matrix_mod
-from .fileio import unv, uff, rattlesnake, vic
+from .fileio import unv, uff, rattlesnake, vic, tshaker
 from .fem.sdynpy_exodus import Exodus, ExodusInMemory
 from .fem import sdynpy_beam as beam
 from .fem import sdynpy_shaker as shaker
 from .fem import sdynpy_dof as dof
-from .signal_processing import frf, cpsd, integration, correlation, complex, rotation, generator, camera, harmonic, geometry_fitting
+from .signal_processing import (frf, cpsd, integration, correlation, complex,
+                                rotation, generator, camera, harmonic, 
+                                geometry_fitting, srs)
 from .modal import PolyPy, SMAC, PolyPy_GUI, SMAC_GUI, compute_residues, compute_shapes, SignalProcessingGUI, ColoredCMIF
 from . import doc
 
-__version__ = "0.6.0"
+__version__ = "0.11.0"
 
 # Pull things in for easier access
 SdynpyArray = array.SdynpyArray

src/sdynpy/core/GUIPlot.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>839</width>
+    <height>599</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -69,14 +69,14 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QPushButton" name="pushButton">
+          <widget class="QPushButton" name="update_button">
            <property name="text">
             <string>Update</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="checkBox">
+          <widget class="QCheckBox" name="autoupdate_checkbox">
            <property name="text">
             <string>Auto-Update</string>
            </property>
@@ -87,6 +87,27 @@
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Line Width</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="linewidth_selector">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
     </item>
@@ -109,7 +130,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>839</width>
      <height>21</height>
     </rect>
    </property>

src/sdynpy/core/sdynpy_coordinate.py

@@ -135,6 +135,17 @@ def string_array(self):
         """
         return create_coordinate_string_array(self.node, self.direction)
 
+    def direction_string_array(self):
+        """
+        Returns a string array representation of the direction
+        
+        Returns
+        -------
+        np.ndarray
+            ndarray of direction strings representing the CoordinateArray
+        """
+        return _map_direction_string_array(self.direction)
+
     def __repr__(self):
         return 'coordinate_array(string_array=\n' + repr(self.string_array()) + ')'