orGUI 1.1.2__tar.gz → 1.3.0__tar.gz

{orgui-1.1.2 → orgui-1.3.0}/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: orGUI
-Version: 1.1.2
+Version: 1.3.0
 Summary: orGUI: Orientation and Integration with 2D detectors
 Author-email: Timo Fuchs <tfuchs@cornell.edu>
-License: MIT License
+License-Expression: MIT
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Win32 (MS Windows)
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
@@ -21,7 +20,7 @@ Classifier: Topic :: Scientific/Engineering :: Chemistry
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy>=1.12
@@ -43,6 +42,8 @@ Provides-Extra: full
 Requires-Dist: qtconsole; extra == "full"
 Requires-Dist: ase; extra == "full"
 Requires-Dist: numba; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
+Dynamic: license-file
 
 
 orGUI: Orientation and Integration with 2D detectors

{orgui-1.1.2 → orgui-1.3.0}/orGUI.egg-info/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: orGUI
-Version: 1.1.2
+Version: 1.3.0
 Summary: orGUI: Orientation and Integration with 2D detectors
 Author-email: Timo Fuchs <tfuchs@cornell.edu>
-License: MIT License
+License-Expression: MIT
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Win32 (MS Windows)
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
@@ -21,7 +20,7 @@ Classifier: Topic :: Scientific/Engineering :: Chemistry
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy>=1.12
@@ -43,6 +42,8 @@ Provides-Extra: full
 Requires-Dist: qtconsole; extra == "full"
 Requires-Dist: ase; extra == "full"
 Requires-Dist: numba; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
+Dynamic: license-file
 
 
 orGUI: Orientation and Integration with 2D detectors

{orgui-1.1.2 → orgui-1.3.0}/orGUI.egg-info/SOURCES.txt

@@ -9,19 +9,17 @@ orGUI.egg-info/requires.txt
 orGUI.egg-info/top_level.txt
 orgui/__init__.py
 orgui/main.py
-orgui.egg-info/PKG-INFO
-orgui.egg-info/SOURCES.txt
-orgui.egg-info/dependency_links.txt
-orgui.egg-info/entry_points.txt
-orgui.egg-info/requires.txt
-orgui.egg-info/top_level.txt
 orgui/app/ArrayTableDialog.py
+orgui/app/QHKLDialog.py
 orgui/app/QReflectionSelector.py
 orgui/app/QScanSelector.py
 orgui/app/QUBCalculator.py
 orgui/app/__init__.py
+orgui/app/_roi_sum_accel.py
+orgui/app/bgroi.py
 orgui/app/database.py
 orgui/app/orGUI.py
+orgui/app/peak1Dintegr.py
 orgui/app/qutils.py
 orgui/backend/__init__.py
 orgui/backend/backends.py
@@ -36,8 +34,11 @@ orgui/backend/beamline/id31_tools.py
 orgui/datautils/__init__.py
 orgui/datautils/util.py
 orgui/datautils/xrayutils/CTRcalc.py
+orgui/datautils/xrayutils/CTRfilm.py
 orgui/datautils/xrayutils/CTRopt.py
 orgui/datautils/xrayutils/CTRplotutil.py
+orgui/datautils/xrayutils/CTRuc.py
+orgui/datautils/xrayutils/CTRutil.py
 orgui/datautils/xrayutils/DetectorCalibration.py
 orgui/datautils/xrayutils/HKLVlieg.py
 orgui/datautils/xrayutils/ReciprocalNavigation.py
@@ -63,18 +64,23 @@ orgui/datautils/xrayutils/unitcells/a-PtO2(0001).bul
 orgui/resources/__init__.py
 orgui/resources/icons/alpha.png
 orgui/resources/icons/alpha.svg
-orgui/resources/icons/diffractometer_v2.png
-orgui/resources/icons/diffractometer_v2.svg
+orgui/resources/icons/anchor-ROI.png
+orgui/resources/icons/anchor-ROI.svg
 orgui/resources/icons/diffractometer_v3.png
-orgui/resources/icons/diffractometer_v3.svg
-orgui/resources/icons/diffractometer_v3_norm.svg
-orgui/resources/icons/diffractometer_v3_opt.svg
 orgui/resources/icons/disable-image.png
 orgui/resources/icons/disable-image.svg
+orgui/resources/icons/document-nx-new.png
+orgui/resources/icons/document-nx-new.svg
 orgui/resources/icons/document-nx-open.png
 orgui/resources/icons/document-nx-open.svg
 orgui/resources/icons/document-nx-save.png
 orgui/resources/icons/document-nx-save.svg
+orgui/resources/icons/incident_corrections.png
+orgui/resources/icons/incident_corrections.svg
+orgui/resources/icons/intersect_s1.png
+orgui/resources/icons/intersect_s1.svg
+orgui/resources/icons/intersect_s2.png
+orgui/resources/icons/intersect_s2.svg
 orgui/resources/icons/lattice-all-link.png
 orgui/resources/icons/lattice-all-link.svg
 orgui/resources/icons/lattice-horizontal-link.png
@@ -85,6 +91,8 @@ orgui/resources/icons/lattice-view.png
 orgui/resources/icons/lattice-view.svg
 orgui/resources/icons/logo.png
 orgui/resources/icons/logo.svg
+orgui/resources/icons/logo_v1.png
+orgui/resources/icons/logo_v1.svg
 orgui/resources/icons/max_image.png
 orgui/resources/icons/max_image.svg
 orgui/resources/icons/max_image2.png

{orgui-1.1.2 → orgui-1.3.0}/orGUI.egg-info/requires.txt

@@ -18,6 +18,7 @@ ase
 qtconsole
 ase
 numba
+PyOpenGL
 
 [speedup]
 numba

{orgui-1.1.2 → orgui-1.3.0}/orgui/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # /*##########################################################################
 #
-# Copyright (c) 2020-2024 Timo Fuchs
+# Copyright (c) 2020-2025 Timo Fuchs
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +26,10 @@
 
 """
 __author__ = "Timo Fuchs"
-__copyright__ = "Copyright 2020-2024 Timo Fuchs"
+__copyright__ = "Copyright 2020-2025 Timo Fuchs"
 __credits__ = []
 __license__ = "MIT License"
-__version__ = "1.1.2"
+__version__ = "1.3.0"
 __maintainer__ = "Timo Fuchs"
 __email__ = "tfuchs@cornell.edu"
 

{orgui-1.1.2 → orgui-1.3.0}/orgui/app/ArrayTableDialog.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # /*##########################################################################
 #
-# Copyright (c) 2020-2024 Timo Fuchs
+# Copyright (c) 2020-2025 Timo Fuchs
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,11 @@
 #
 # ###########################################################################*/
 __author__ = "Timo Fuchs"
-__copyright__ = "Copyright 2020-2024 Timo Fuchs"
+__copyright__ = "Copyright 2020-2025 Timo Fuchs"
 __license__ = "MIT License"
-__version__ = "1.0.0"
+__version__ = "1.3.0"
 __maintainer__ = "Timo Fuchs"
-__email__ = "fuchs@physik.uni-kiel.de"
+__email__ = "tfuchs@cornell.edu"
 
 import numpy as np
 import os

orgui-1.3.0/orgui/app/QHKLDialog.py

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# /*##########################################################################
+#
+# Copyright (c) 2020-2025 Timo Fuchs
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+__author__ = "Timo Fuchs"
+__copyright__ = "Copyright 2020-2025 Timo Fuchs"
+__license__ = "MIT License"
+__version__ = "1.3.0"
+__maintainer__ = "Timo Fuchs"
+__email__ = "tfuchs@cornell.edu"
+
+from silx.gui import qt
+from . import qutils
+import numpy as np
+from contextlib import contextmanager
+
+@contextmanager
+def blockSignals(qobjects):
+    try:
+        for obj in qobjects:
+            obj.blockSignals(True)
+        yield
+        for obj in qobjects:
+            obj.blockSignals(False)
+    except TypeError:
+        qobject.blockSignals(True)
+        yield
+        qobject.blockSignals(False)
+
+class HKLDialog(qt.QDialog):
+    sigHKLchanged = qt.pyqtSignal(np.ndarray)
+    
+    def __init__(self, msg='', title='' ,parent=None):
+        qt.QDialog.__init__(self, parent)
+        self.savedParams = np.array([0.,0.,0.])
+        layout = qt.QVBoxLayout()
+        self.setWindowTitle(title)
+        
+        hkl_layout = qt.QHBoxLayout()
+        
+        self.hkl_editors = [qt.QDoubleSpinBox() for i in range(3)]
+        [h.setRange(-20000,20000) for h in self.hkl_editors]
+        [h.setDecimals(3) for h in self.hkl_editors]
+        [h.setValue(0.) for h in self.hkl_editors]
+        for editor, lbll in zip(self.hkl_editors, ["H:", "K:", "L:"]):
+            hkl_layout.addWidget(qt.QLabel(lbll))
+            hkl_layout.addWidget(editor)
+            editor.valueChanged.connect(self._onAnyHKLChanged)
+
+        
+        self.label = qt.QLabel()
+        self.label.setText(msg)
+        
+        buttons = qt.QDialogButtonBox(qt.QDialogButtonBox.Ok | qt.QDialogButtonBox.Cancel | qt.QDialogButtonBox.Reset)
+        buttons.button(qt.QDialogButtonBox.Ok).clicked.connect(self.accept)
+        buttons.button(qt.QDialogButtonBox.Cancel).clicked.connect(self.onCancel)
+        buttons.button(qt.QDialogButtonBox.Reset).clicked.connect(self.resetParameters)
+        
+        layout.addWidget(self.label)
+        layout.addLayout(hkl_layout)
+        layout.addWidget(buttons)
+        self.setLayout(layout)
+        
+
+    def _onAnyHKLChanged(self):
+        self.sigHKLchanged.emit(self.get_hkl())
+        
+    def get_hkl(self):
+        return np.array([h.value() for h in self.hkl_editors])
+        
+    def set_hkl(self, hkl):
+        assert len(hkl) == 3
+        with blockSignals(self.hkl_editors):
+            for h, e in zip(hkl, self.hkl_editors):
+                e.setValue(h)
+        self.sigHKLchanged.emit(self.get_hkl())
+        
+    def showEvent(self, event):
+        if event.spontaneous():
+            super().showEvent(event)
+        else:
+            self.savedParams = self.get_hkl()
+            super().showEvent(event)
+            
+    #def hideEvent(self, event):
+    #    self.sigHide.emit()
+    #    super().hideEvent(event)
+            
+    def resetParameters(self):
+        self.set_hkl(self.savedParams)
+            
+    def onCancel(self):
+        self.resetParameters()
+        self.reject()

{orgui-1.1.2 → orgui-1.3.0}/orgui/app/QReflectionSelector.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # /*##########################################################################
 #
-# Copyright (c) 2020-2024 Timo Fuchs
+# Copyright (c) 2020-2025 Timo Fuchs
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,11 @@
 #
 # ###########################################################################*/
 __author__ = "Timo Fuchs"
-__copyright__ = "Copyright 2020-2024 Timo Fuchs"
+__copyright__ = "Copyright 2020-2025 Timo Fuchs"
 __license__ = "MIT License"
-__version__ = "1.0.0"
+__version__ = "1.3.0"
 __maintainer__ = "Timo Fuchs"
-__email__ = "fuchs@physik.uni-kiel.de"
+__email__ = "tfuchs@cornell.edu"
 
 import sys
 import traceback
@@ -38,6 +38,7 @@ from .ArrayTableDialog import ArrayEditWidget
 from collections import OrderedDict
 from dataclasses import dataclass, field
 from typing import ClassVar
+import copy
 
 import numpy as np
 from ..datautils.xrayutils import HKLVlieg
@@ -305,7 +306,7 @@ class QReflectionSelector(qt.QSplitter):
             else:
                 self.setReflections([])
         except Exception:
-            qt.QMessageBox.critical(self,"Cannot read reflections", "Cannot read reeflections %s" % traceback.format_exc())
+            qt.QMessageBox.critical(self,"Cannot read reflections", "Cannot read reflections %s" % traceback.format_exc())
             return
             
     def clearPlotRefReflections(self):
@@ -326,7 +327,7 @@ class QReflectionSelector(qt.QSplitter):
         
             
     def redrawRefReflections(self):
-        self.setReflections(self.reflections)
+        self.setReflections(copy.deepcopy(self.reflections))
         
     def setReflections(self,refls):
         self.clearPlotRefReflections()