`
:download:`Subtracting a Model Calculation from Experimental Data `
diff --git a/installers/installer.iss b/installers/installer.iss
index df8ca8833a..6e2d10d77f 100644
--- a/installers/installer.iss
+++ b/installers/installer.iss
@@ -2,8 +2,8 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "SasView"
-#define MyAppVersion "6.1.2"
-#define MyAppPublisher "(c) 2009 - 2025, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS"
+#define MyAppVersion "6.1.3"
+#define MyAppPublisher "(c) 2009 - 2026, UTK, NIST, UMD, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, SciLifeLab, and the scattering community"
#define MyAppURL "http://www.sasview.org"
#define MyAppExeName "sasview.exe"
diff --git a/installers/license.txt b/installers/license.txt
index 684b712d94..09d5abe5c7 100644
--- a/installers/license.txt
+++ b/installers/license.txt
@@ -18,4 +18,4 @@ sentence:
*"This work benefited from the use of the SasView application, originally
developed under NSF award DMR-0520547."*
-Copyright (c) 2009-2025, SasView Developers
\ No newline at end of file
+Copyright (c) 2009-2026, SasView Developers
\ No newline at end of file
diff --git a/src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py b/src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py
index 2afd421a9e..0cbfe51ee0 100644
--- a/src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py
+++ b/src/sas/qtgui/MainWindow/UnitTesting/WelcomePanelTest.py
@@ -30,5 +30,5 @@ def testVersion(self, widget):
assert isinstance(version, QtWidgets.QLabel)
assert "SasView" in version.text()
- for inst in "UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, TUD, BAM, ANSTO".split(", "):
+ for inst in "UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, TU Delft, SciLifeLab, ANSTO".split(", "):
assert inst in ack.text()
diff --git a/src/sas/qtgui/MainWindow/WelcomePanel.py b/src/sas/qtgui/MainWindow/WelcomePanel.py
index f467df696d..aa44101d3a 100644
--- a/src/sas/qtgui/MainWindow/WelcomePanel.py
+++ b/src/sas/qtgui/MainWindow/WelcomePanel.py
@@ -18,6 +18,7 @@ def __init__(self, parent=None):
ver = "\nSasView %s\n%s" % (version, legal.copyright)
self.lblVersion.setText(ver)
+ self.lblAcknowledgements.setText(legal.about)
# no reason to have this widget resizable
self.setFixedSize(self.minimumSizeHint())
diff --git a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
index e9ee8ba966..a3b33c5ce3 100644
--- a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
+++ b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
@@ -230,6 +230,9 @@ def dataFromItems(self, value: QtGui.QStandardItem | list[QtGui.QStandardItem])
self._logic.append(logic)
# Option widget logic was destroyed - reestablish
self.options_widget.logic = self._logic[0]
+ # Ensure auxiliary widgets point at the new logic instance
+ self.polydispersity_widget.logic = self._logic[0]
+ self.magnetism_widget.logic = self._logic[0]
# update the ordering tab
self.order_widget.updateData(self.all_data)
diff --git a/src/sas/system/legal.py b/src/sas/system/legal.py
index 0d1ce73162..c3761cbe85 100644
--- a/src/sas/system/legal.py
+++ b/src/sas/system/legal.py
@@ -8,6 +8,22 @@ class Legal:
def __init__(self):
year = datetime.datetime.now().year
self.copyright = f"Copyright (c) 2009-{year}, SasView Developers"
+ self.about = """
+
+
+
+
+ This work originally developed as part of the DANSE project funded by the NSF under
+ grant DMR-0520547, and currently maintained by UTK, NIST, UMD, ORNL, ISIS, ESS, ILL,
+ ANSTO, TU Delft, DLS, SciLifeLab, and the scattering community.
+
+
+ SasView also contains code developed with funding from the EU Horizon 2020 programme under
+ the SINE2020 project (Grant No 654000).
+
+
+ """
+
@property
def credits_html(self) -> Path:
diff --git a/src/sas/system/resources.py b/src/sas/system/resources.py
index 646a376208..9397344738 100644
--- a/src/sas/system/resources.py
+++ b/src/sas/system/resources.py
@@ -167,9 +167,9 @@ def path_to_resource_directory(self, src: str | PurePath) -> Path:
if path:
# this will be a entry within the directory or possibly even a subdirectory
# need to walk up to find the entry we really want
- match = f"/{self.module}/{src}" # pathlib.Path directories don't end in /
+ match = str(Path(f"/{self.module}/{src}")) # pathlib.Path directories don't end in /
for part in itertools.chain([path], path.parents):
- if str(part).endswith(match):
+ if str(Path(part)).endswith(match):
return part
# if the upwards search falls through to here, then something went wrong
# with the original filtering of the RECORD data, but allow it to try
diff --git a/src/sas/system/version.py b/src/sas/system/version.py
index aa862612f4..cb4615273d 100644
--- a/src/sas/system/version.py
+++ b/src/sas/system/version.py
@@ -3,9 +3,9 @@
try:
from ._version import __version__
except ImportError:
- __version__ = "6.1.2"
+ __version__ = "6.1.3"
-__release_date__ = "2025"
+__release_date__ = "2026"
__version_parsed__ = Version(__version__)
__all__ = ["__version_parsed__", "__release_date__", "__version__"]
diff --git a/src/sas/system/zenodo.py b/src/sas/system/zenodo.py
new file mode 100644
index 0000000000..05808de634
--- /dev/null
+++ b/src/sas/system/zenodo.py
@@ -0,0 +1 @@
+__DOI__ = "10.5281/zenodo.18352296"