Merge branch 'refactor_24' into 2993-ascii-file-reader-options

SasView · Dec 18, 2024 · 50bf23a · 50bf23a
2 parents 7ec2f80 + 6e0c172
commit 50bf23a
Show file tree

Hide file tree

Showing 95 changed files with 2,603 additions and 1,072 deletions.
diff --git a/build_tools/contributors.tsv b/build_tools/contributors.tsv
@@ -0,0 +1,102 @@
+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
+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.
diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt
@@ -14,7 +14,6 @@ lxml
 mako
 matplotlib
 numba
-numpy==1.26.4
 periodictable
 pybind11
 pylint
@@ -25,7 +24,6 @@ pytest_qt
 pytest-mock
 pytools
 qtconsole
-scipy==1.13.1
 six
 sphinx
 superqt
@@ -40,4 +38,6 @@ zope
 pywin32; platform_system == "Windows"
 
 # Alphabetized list of version-pinned packages
-PySide6
+numpy==1.26.4  # 2.0.0 deprecates many functions used in the codebase (and potentially in dependencies)
+PySide6==6.4.3  # Later versions do not mesh well with pyinstaller < 6.0
+scipy==1.13.1  # 1.14 deprecates some functions used in the codebase (and potentially in dependencies)
diff --git a/docs/sphinx-docs/source/conf.py b/docs/sphinx-docs/source/conf.py
@@ -87,7 +87,7 @@
 # The short X.Y version.
 version = '6.0'
 # The full version, including e.g. alpha tags (a1).
-release = '6.0.0b1'
+release = '6.0.0b2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/sphinx-docs/source/user/tutorial.rst b/docs/sphinx-docs/source/user/tutorial.rst
diff --git a/docs/sphinx-docs/source/user/working.rst b/docs/sphinx-docs/source/user/working.rst
@@ -14,8 +14,6 @@ Working with SasView
 
    Example Data <example_data/testdata_help>
 
-   Tutorials <tutorial>
-
    Writing a Plugin Model <qtgui/Perspectives/Fitting/plugin>
 
    Scripting Interface to Sasmodels <qtgui/Perspectives/Fitting/scripting>

diff --git a/installers/installer.iss b/installers/installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SasView"
-#define MyAppVersion "5.0.5"
+#define MyAppVersion "6.0.0"
 #define MyAppPublisher "(c) 2009 - 2021, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS"
 #define MyAppURL "http://www.sasview.org"
 #define MyAppExeName "sasview.exe"
@@ -26,7 +26,7 @@ UsedUserAreasWarning=no
 LicenseFile=license.txt
 ArchitecturesInstallIn64BitMode=x64
 OutputBaseFilename=setupSasView
-SetupIconFile=dist\sasview\_internal\images\ball.ico
+SetupIconFile=dist\sasview\images\ball.ico
 
 
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
@@ -55,9 +55,8 @@ end;
 
 [Files]
 Source: "dist\sasview\sasview.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "dist\sasview\plugin_models\*"; DestDir: "{%USERPROFILE}\.sasview\plugin_models"
 Source: "dist\sasview\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "dist\sasview\_internal\plugin_models\*"; DestDir: "{%USERPROFILE}\.sasview\plugin_models"
-Source: "dist\sasview\_internal\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon

diff --git a/installers/sasview.spec b/installers/sasview.spec
@@ -11,12 +11,15 @@ PYTHON_PACKAGES = sysconfig.get_path('platlib')
 
 datas = [
     ('../src/sas/qtgui/images', 'images'),
+    ('../src/sas/qtgui/images', "sas/qtgui/images"),
     ('../src/sas/sasview/media', 'media'),
     ('../src/sas/example_data', 'example_data'),
     ('../src/sas/sascalc/calculator/ausaxs/lib', 'sas/sascalc/calculator/ausaxs/lib'),    
     ('../src/sas/qtgui/Utilities/Reports/report_style.css', 'sas/qtgui/Utilities/Reports'),
     ('../src/sas/qtgui/Perspectives/Fitting/plugin_models', 'plugin_models'),
     ('../src/sas/qtgui/Utilities/WhatsNew/messages', 'sas/qtgui/Utilities/WhatsNew/messages'),
+    ('../src/sas/qtgui/Utilities/WhatsNew/css/style.css', 'sas/qtgui/Utilities/WhatsNew/css'),
+    ('../src/sas/qtgui/Utilities/About/images', 'sas/qtgui/Utilities/About/images'),
     ('../src/sas/system/log.ini', 'sas/system/'),
     ('../../sasmodels/sasmodels','sasmodels'),
     ('../docs/sphinx-docs/build','doc/build'),
@@ -102,6 +105,7 @@ if platform.system() == 'Darwin':
           a.scripts,
           exclude_binaries=True,
           name='sasview',
+          contents_directory='.',
           debug=False,
           upx=True,
           icon=os.path.join("../src/sas/qtgui/images","ball.icns"),
@@ -114,12 +118,14 @@ else:
         [],
         exclude_binaries=True,
         name='sasview',
+        contents_directory='.',
         debug=False,
         bootloader_ignore_signals=False,
         icon=os.path.join("../src/sas/qtgui/images","ball.ico"),
         strip=False,
         upx=True,
-        console=False)
+        console=True,
+        hide_console='hide-early')
 
 coll = COLLECT(
     exe,

diff --git a/src/sas/qtgui/Calculators/DensityPanel.py b/src/sas/qtgui/Calculators/DensityPanel.py
@@ -56,17 +56,10 @@ def setupUi(self):
 
         self.setFixedSize(self.minimumSizeHint())
 
-        # set validators
-        #self.ui.editMolecularFormula.setValidator(FormulaValidator(self.ui.editMolecularFormula))
-
         rx = QtCore.QRegularExpression("[+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?")
         self.ui.editMolarVolume.setValidator(QtGui.QRegularExpressionValidator(rx, self.ui.editMolarVolume))
         self.ui.editMassDensity.setValidator(QtGui.QRegularExpressionValidator(rx, self.ui.editMassDensity))
 
-        # signals
-        self.ui.editMolarVolume.textEdited.connect(functools.partial(self.setMode, MODES.VOLUME_TO_DENSITY))
-        self.ui.editMassDensity.textEdited.connect(functools.partial(self.setMode, MODES.DENSITY_TO_VOLUME))
-
         self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Reset).clicked.connect(self.modelReset)
         self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Help).clicked.connect(self.displayHelp)
 
@@ -116,6 +109,7 @@ def dataChanged(self, top, bottom):
                 self._updateVolume()
 
     def volumeChanged(self, current_text):
+        self.setMode(MODES.VOLUME_TO_DENSITY)
         try:
             molarMass = float(toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text()))
             molarVolume = float(current_text)
@@ -130,6 +124,7 @@ def volumeChanged(self, current_text):
             self.model.item(MODEL.MASS_DENSITY).setText("")
 
     def massChanged(self, current_text):
+        self.setMode(MODES.DENSITY_TO_VOLUME)
         try:
             molarMass = float(toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text()))
             molarDensity = float(current_text)