Initial implementation of the undelete mechanism for fitting tabs.

.github/workflows/ci.yml

@@ -110,9 +110,9 @@ jobs:
 
       - name: Fetch sources for sibling projects
         run: |
-          git clone --depth=50 --branch=master https://github.com/SasView/sasdata.git ../sasdata
-          git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git ../sasmodels
-          git clone --depth=50 --branch=master https://github.com/bumps/bumps.git ../bumps
+          git clone --depth=50 --branch=v0.9.0 https://github.com/SasView/sasdata.git ../sasdata
+          git clone --depth=50 --branch=v1.0.8 https://github.com/SasView/sasmodels.git ../sasmodels
+          git clone --depth=50 --branch=v0.9.2 https://github.com/bumps/bumps.git ../bumps
 
       - name: Build and install sasdata
         run: |
@@ -305,34 +305,6 @@ jobs:
             installers/dist/sasview6.tar.gz
           if-no-files-found: ignore
 
-      - name: Rename artifacts (Windows)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
-        run: |
-          mv installers/dist/setupSasView.exe installers/dist/setupSasView-6.0.0-alpha-Win64.exe
-
-      - name: Rename artifacts (MacOS)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        run: |    
-          mv installers/dist/SasView6.dmg  installers/dist/SasView-6.0.0-alpha-MacOSX.dmg
-
-      - name: Rename artifacts (Linux)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'ubuntu') }}
-        run: |    
-          mv installers/dist/sasview6.tar.gz installers/dist/SasView-6.0.0-alpha-Linux.tar.gz
-
-      - name: Upload Release Installer to GitHub
-        if: ${{ matrix.installer }}
-        uses: ncipollo/release-action@v1
-        with:
-          draft: false
-          prerelease: true
-          allowUpdates: true
-          replacesArtifacts: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "installers/dist/*SasView-6.0.0-*"
-          name: "Release 6.0.0-alpha"
-          bodyFile: "build_tools/release_notes/6.0.0_notes.txt"
-          tag: "v6.0.0-alpha"
 
   test-installer:
     needs: [ build-matrix ]
@@ -457,17 +429,37 @@ jobs:
 
       - name: Install X11 libraries (Linux)
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        env:
+          DEBIAN_FRONTEND: noninteractive
         run: |
-          sudo apt-get update
-          sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils xvfb
+          sudo apt install libegl1 libopengl0 libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils xvfb
 
       - name: Try running the installation (Linux)
         if: ${{ startsWith(matrix.os, 'ubuntu' )}}
         # If sasview has crashed on its own, then this should return an error
         run: |
-          xvfb-run -a --server-args="-screen 0 1024x768x24" $RUN_SASVIEW &
-          sleep 60s
-          kill %1
+          (
+            echo "## START SASVIEW"
+            xvfb-run -a --server-args="-screen 0 1024x768x24" $RUN_SASVIEW 2>&1 |
+            tee sasview-test.log
+          ) &
+          svpid=$!
+          (
+            set -e
+            sleep 20s
+            echo "## PULSE CHECK"
+            kill -0 $svpid
+            echo "## PULSE OK"
+            sleep 40s
+            echo "## FINISHING SMOKE TEST"
+            kill $svpid
+            echo "## SMOKE TEST COMPLETE"
+            exit 0
+          ) &
+          pulsepid=$1
+          wait $pulsepid
+          # Check the log file for successful startup
+          grep "SasView session started" sasview-test.log
 
       ### Optionally attempt to work with the debug tarball from pyinstaller
 

.github/workflows/matrix.py

@@ -27,7 +27,9 @@
 #   https://pyinstaller.readthedocs.io/en/stable/usage.html#making-gnu-linux-apps-forward-compatible
 os_release_list = [
     'ubuntu-20.04',
+    'ubuntu-22.04',
     'windows-latest',
+    'macos-13',
     'macos-latest',
 ]
 

build_tools/application_metadata/org.sasview.sasview.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=6.0.0
+Name=SasView
+GenericName=Small Angle Scattering Analysis
+Comment=Small Angle Scattering Analysis
+Exec=sasview
+# TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=SAS;SANS;SAXS;scattering;neutron scattering;X-ray scattering;physics
+Icon=org.sasview.sasview.png
+Terminal=false
+Type=Application
+Categories=Science;Physics;

build_tools/application_metadata/org.sasview.sasview.metainfo.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<component type="desktop-application">
+  <id>org.sasview.sasview</id>
+  <name>SasViw</name>
+  <project_license>BSD-3-Clause</project_license>
+  <metadata_license>CC0</metadata_license>
+  <summary> SasView is a Small Angle Scattering Analysis Software Package</summary>
+  <developer id="org.sasview">
+    <name>SasView Developers</name>
+  </developer>
+  <content_rating type="oars-1.0" />
+
+
+  <url type="bugtracker">https://github.com/SasView/sasview/issues</url>
+  <url type="homepage">https://www.sasview.org</url>
+  <url type="contact">https://www.sasview.org/people/</url>
+  <url type="faq">https://www.sasview.org/faq/</url>
+  <url type="contribute">https://www.sasview.org/contribute/</url>
+  <url type="vcs-browser">https://github.com/SasView/sasview</url>
+
+  <releases>
+    <release version="6.0.0" date="2024-10-14"></release>
+  </releases>
+
+  <launchable type="desktop-id">org.sasview.sasview.desktop</launchable>
+  <provides>org.sasview.sasview.desktop</provides>
+
+  <description>
+    <p>SasView is an open source Small Angle Scattering (SAS) analysis package used to analyze 1D and 2D scattering data in inverse space. Originally focused on neutron data (SANS), the package has been extended for X-ray scattering and correlation space methods such as SESANS and Interferometry. SasView includes a number of other features, include PrView to invert SAS data to P(r), a resolution calculator, and a scattering length density calculator, to name a few. The package also has a simple plugin mechanism for users to add custom models.</p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.sasview.org/img/basic_fit.png</image>
+      <caption>SasView basic fitting</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.sasview.org/img/SVwelcome.png</image>
+      <caption>SasView welcome screen</caption>
+    </screenshot>
+  </screenshots>
+
+  <supports>
+    <control>keyboard</control>
+    <control>pointing</control>
+  </supports>
+</component>

build_tools/contributors.tsv

@@ -0,0 +1,103 @@
+Name	Affiliation	Creator	Producer	RelatedPerson	ORCID	Notes
+Adams, Michel	University of Luxembourg	x				None
+Agouzal, Nouhaila	Institut Laue-Langevin	x				None
+Alina, Gervaise	University of Tennessee, Knoxville	x				None
+Anuchitanukul, Atijit	Oak Ridge National Laboratory	 	 	x	 	worked with Anders on FIT benmchmarking. Should be ISIS?
+Attala, Ziggy	ISIS Neutron and Muon Source	x				Changed RAL to ISIS, as we have diamond separately, needs to be checked
+Bakker, Jurrian	Technical University, Delft	x				None
+Beaucage, Peter	National Institute of Standards and Technology	x			0000-0002-2147-0728	None
+Berger, Jordan	University of Delaware	x				None
+Bourne, Robert	ISIS Neutron and Muon Source	x				None
+Bouwman, Wim	"Technical University, Delft"	x				None
+Bressler, Ingo	Paul Scherrer Institute	x				None
+Butler, Paul	National Institute of Standards and Technology	x			0000-0002-5978-4714	None
+Cadwallader-Jones, Iestyn	Institut Laue-Langevin	x				None
+Campbell, Kieran	ISIS Neutron and Muon Source	x				None
+Cho, Jae-Hie	"University of Tennessee, Knoxville"	x				None
+Cooper-Benun, Torin	ISIS Neutron and Muon Source	x				None
+Cortes Hernandez, R	University of Tennessee, Knoxville	x				None
+Corona, Patrick	University of California, Santa Barbara			x		None
+Crake-Merani, James ISIS Neutron and Muon Source	x			    0009-0003-1736-5567 None
+Doucet, Mathieu	Oak Ridge National Laboratory	x			0000-0002-5560-6478	None
+Doutch, James	ISIS Neutron and Muon Source     	x				None
+Dresen, Dominique	University of Cologne	x				None
+Drosos, Giogos	ETH Zurich	x				Submitted PR externally - never communicated directly with group. Still counts?
+Durniak, Celine	European Spallation Source	x				None
+Farrow, Chris	California Institute of Technology	x				None
+Ferraz Leal, Ricardo	Oak Ridge National Laboratory	x				None
+Ford, Rachel	California Institute of Technology	x				At Grenoble camp and worked on adding assigned model all week till RKH pointed out that it duplicated an existing model. Still should count?
+Forster, Laura	Diamond Light Source	x				None
+Fragneto, Giovanna	European Spallation Source		x			None
+Fultz, Brent	California Institute of Technology		x			None
+Gaudet, Jonathan	University of Maryland	x				None
+Gerina, Mariana	Charles University	x				None
+Gilbert, Peter	National Institute of Standards and Technology	x			0000-0003-1707-7517	Not sure he is properly an author vs other? check contribution.
+Gonzalez, Miguel	Institut Laue-Langevin	x			0000-0002-3478-0215	None
+Heenan, Richard	ISIS Neutron and Muon Source	x			0000-0002-7729-1454	None
+Hewins, Ellis	ISIS Neutron and Muon Source	x				None
+Honecker, Dirk	ISIS Neutron and Muon Source	x				None
+Jackson, Andrew	European Spallation Source	x			0000-0002-6296-0336	None
+Jensen, Grethe	National Institute of Standards and Technology	x				None
+Juhas, Pavol	Brookhaven National Laboratory	x				None
+Karliczek, Julius	Institut Laue-Langevin	x				None
+Kienzle, Paul	National Institute of Standards and Technology	x				None
+King, Stephen	ISIS Neutron and Muon Source	x	x		0000-0003-3386-9151	None
+Kline, Steve	National Institute of Standards and Technology	x				None
+Knudsen, Mikke	University of Copenhagen			x		Who is this person? What is the connection?
+Krueger, Susan	National Institute of Standards and Technology			x		None
+Krzywon, Jeff	National Institute of Standards and Technology	x			0000-0002-2380-4090	None
+Lin, Jiao	California Institute of Technology	x				None
+Liu, Yun	National Institute of Standards and Technology	x				None
+Lopes, Ruben	ISIS Neutron and Muon Source	x				None
+Lozano, Dorian	Institut Laue-Langevin	x				None
+Lytje, Kristian	Aarhus University	x				None
+Mannicke, David	Australian National Science and Technology Organisation	x				None
+Maranville, Brian	National Institute of Standards and Technology	x			0000-0002-6105-8789	None
+Markvardsen, Anders	ISIS Neutron and Muon Source	x	x			None
+Martinez, Nicolas	Institut Laue-Langevin	x				None
+McKerns, Mike	California Institute of Technology	x				None
+Miller, Brayden	National Institute of Standards and Technology	x				None
+Mothander, Karolina	Lund University	x				None
+Murphy, Ryan	National Institute of Standards and Technology	x			0000-0002-4080-7525	None
+Narayanan, Theyencheri	European Synchrotron Radiation Facility			x		None
+Nelson, Andrew 	Australian National Science and Technology Organisation	x				None
+Nielsen, Torben	European Spallation Source	x	x			None
+Oakley, Michael	ISIS Neutron and Muon Source	x				None
+O'Driscoll, Lewis	ISIS Neutron and Muon Source	x				None
+Park, Helen	National Institute of Standards and Technology	x				None
+Parker, Peter	ISIS Neutron and Muon Source	x				None
+Parsons, Drew	University of Cagliari			x		Or should he be listed as creator?
+Patrou, Maria	Oak Ridge National Laboratory	x				No commits yet but contributed 6 days at contributor camp on designs and path forwards
+Pauw, Brian	Federal Institute for Materials Research and Testing			x		None
+Pellicelli, R						Who is this person (and what it their affiliation?) How did the name show up here (could tell us who they are?)
+Perring, Toby	ISIS Neutron and Muon Source		x			None
+Peterson, Pete	Oak Ridge National Laboratory	x				None
+Porcar, Lionel	Institut Laue-Langevin			x		None
+Potrzebowski, Wojciech	SciLifeLab at Lund University	x	x		0000-0002-7789-6779	None
+Pozzo, Lilo	University of Washington			x		None
+Prescott, Stuart	University of New South Wales	x			0000-0001-5639-9688	None
+Prevost, Sylvain	Institut Laue-Langevin			x		None
+Rakitin, Maksim	Brookhaven National Laboratory	x				None
+Rennie, Adrian	Uppsala University			x		None
+Richter, Tobias	Diamond Light Source	x	x			Was at Diamond as creator. counts as Producer at ESS? How to list here?
+Roberts, Graham	University of Connecticut			x		Working on AI module but mostly alone? so not yet creator?
+Rod, Thomas Holm	European Spallation Source		x			None
+Rooks, Jack	University of Delaware	x				None
+Rozyczko, Piotr	European Spallation Source	x			0000-0002-2359-1013	None
+Shan, Xael	National Institute of Standards and Technology	x				None
+Shang, Yingrui	Oak Ridge National Laboratory			x		None
+Snow, Tim	Diamond Light Source	x			0000-0001-7146-6885	None
+Stellhorn, Annika	European Spallation Source	x				None
+Taylor, Jonathan	European Spallation Source		x			None
+Teixeira, Susana	National Institute of Standards and Technology	x				None
+Tumarkin, Jessica	University of Tennessee, Knoxville	x				None
+Udby, Linda	Niels Bohr Institute			x		Pan-learning person.
+Washington, Adam	ISIS Neutron and Muon Source	x				None
+Weigandt, Katie	National Institute of Standards and Technology	x				None
+Whitley, Robert	ISIS Neutron and Muon Source	x				None
+Wilkins, Lucas	ISIS Neutron and Muon Source	x				None
+Wolf, Caitlyn	National Institute of Standards and Technology	x			0000-0002-2956-7049	None
+Zakoutna, Dominika	Charles University			x		None
+Zhang, Anita	University of Princeton	x				None
+Zheng, Alex	National Institute of Standards and Technolog	x				None
+Zhou, Jing	University of Tennessee, Knoxville					First person working on SANS part of DANSE project, but not really SansView yet? not sure how (or if) to list.

build_tools/get_external_dependencies.py

@@ -1,4 +1,5 @@
 import requests
+import platform
 from enum import Enum
 
 class OS(Enum):
@@ -11,7 +12,6 @@ def get_os():
     """
     Get the operating system of the current machine.
     """
-    import platform
     if platform.system() == "Windows":
         return OS.WIN
     elif platform.system() == "Linux":
@@ -23,25 +23,20 @@ def get_os():
 def get_ausaxs():
     _os = get_os()
     url = "https://github.com/SasView/AUSAXS/releases/latest/download/"
-    libs = None
+    lib = None
     if _os == OS.WIN:
-        libs = ["libausaxs.dll"]
+        lib = "libausaxs.dll"
     elif _os == OS.LINUX:
-        libs = ["libausaxs.so"]
+        lib = "libausaxs.so"
     elif _os == OS.MAC:
-        libs = ["libausaxs.dylib"]
-    if libs is not None:
+        lib = "libausaxs.dylib"
+    if lib is not None:
         # we have to use a relative path since the package is not installed yet
         base_loc = "src/sas/sascalc/calculator/ausaxs/lib/"
-        for lib in libs:
-            response = requests.get(url+lib)
+        response = requests.get(url+lib)
 
-            # disable macos for now by renaming the local file
-            if _os is OS.MAC:
-                lib = "libausaxs.dylib"
-
-            with open(base_loc+lib, "wb") as f:
-                f.write(response.content)
+        with open(base_loc+lib, "wb") as f:
+            f.write(response.content)
 
 def fetch_external_dependencies(): 
     #surround with try/except to avoid breaking the build if the download fails