OASYS2-XRayServer 1.0.0__tar.gz → 1.0.2__tar.gz

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2/OASYS2_XRayServer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OASYS2-XRayServer
-Version: 1.0.0
+Version: 1.0.2
 Summary: X-Ray Server: Sergey Stepanov's X-Ray Server on OASYS 2
 Home-page: https://github.com/oasys-kit/OASYS2-XRayServer
 Download-URL: https://github.com/oasys-kit/OASYS2-XRayServer
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Science/Research
 License-File: LICENSE
 Requires-Dist: oasys2>=0.0.1
-Requires-Dist: PyQtWebEngine>=5.15.7
+Requires-Dist: PyQt6-WebEngine>=6.9.0
 Requires-Dist: dabax
 Dynamic: author
 Dynamic: author-email

oasys2_xrayserver-1.0.2/OASYS2_XRayServer.egg-info/requires.txt

@@ -0,0 +1,3 @@
+oasys2>=0.0.1
+PyQt6-WebEngine>=6.9.0
+dabax

{oasys2_xrayserver-1.0.0/OASYS2_XRayServer.egg-info → oasys2_xrayserver-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OASYS2-XRayServer
-Version: 1.0.0
+Version: 1.0.2
 Summary: X-Ray Server: Sergey Stepanov's X-Ray Server on OASYS 2
 Home-page: https://github.com/oasys-kit/OASYS2-XRayServer
 Download-URL: https://github.com/oasys-kit/OASYS2-XRayServer
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Science/Research
 License-File: LICENSE
 Requires-Dist: oasys2>=0.0.1
-Requires-Dist: PyQtWebEngine>=5.15.7
+Requires-Dist: PyQt6-WebEngine>=6.9.0
 Requires-Dist: dabax
 Dynamic: author
 Dynamic: author-email

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/util/xrayserver_util.py

@@ -2,8 +2,10 @@ import os
 
 from orangewidget import gui
 
-from PyQt5 import QtWidgets
-from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView
+try:    from AnyQt.QtWebEngineWidgets import QWebEngineView as QWebView
+except: from AnyQt.QtWebKitWidgets import QWebView
+
+from AnyQt.QtWidgets import QDialog, QVBoxLayout, QScrollArea, QDialogButtonBox
 
 import matplotlib
 import urllib
@@ -99,24 +101,24 @@ class XRayServerPlot:
             plot_window.setGraphYLimits(min(y), max(y)*1.01)
         plot_window.replot()
 
-class ShowHtmlDialog(QtWidgets.QDialog):
+class ShowHtmlDialog(QDialog):
 
     def __init__(self, title, html_text, width=650, height=400, parent=None):
-        QtWidgets.QDialog.__init__(self, parent)
+        QDialog.__init__(self, parent)
         self.setModal(True)
         self.setWindowTitle(title)
-        layout = QtWidgets.QVBoxLayout(self)
+        layout = QVBoxLayout(self)
 
         web_view = QWebView(self)
         web_view.setHtml(html_text)
 
-        text_area = QtWidgets.QScrollArea(self)
+        text_area = QScrollArea(self)
         text_area.setWidget(web_view)
         text_area.setWidgetResizable(True)
         text_area.setFixedHeight(height)
         text_area.setFixedWidth(width)
 
-        bbox = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok)
+        bbox = QDialogButtonBox(QDialogButtonBox.Ok)
 
         bbox.accepted.connect(self.accept)
         layout.addWidget(text_area)

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/gui/ow_xrayserver_widget.py

@@ -2,8 +2,8 @@ import numpy
 
 from oasys2.widget.widget import OWWidget, OWAction
 
-from PyQt5.QtWidgets import QApplication, QSizePolicy
-from PyQt5.QtCore import QRect
+from AnyQt.QtWidgets import QApplication, QSizePolicy
+from AnyQt.QtCore import QRect
 
 import oasys2.widget.gui as oasysgui
 from oasys2.canvas.util.canvas_util import ShowTextDialog
@@ -24,7 +24,7 @@ class XrayServerWidget(OWWidget):
         self.runaction.triggered.connect(self.submit)
         self.addAction(self.runaction)
 
-        geom = QApplication.desktop().availableGeometry()
+        geom = QApplication.primaryScreen().geometry()
         self.setGeometry(QRect(round(geom.width()*0.05),
                                round(geom.height()*0.05),
                                round(min(geom.width()*0.98, self.MAX_WIDTH)),

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/xrayserver/__init__.py

@@ -17,4 +17,4 @@ BACKGROUND = "#CAB244"
 
 ICON = "icons/xrayserver.png"
 
-PRIORITY = 3001
+PRIORITY = 7.0

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/xrayserver/ow_gid_sl.py

@@ -1,4 +1,7 @@
 import numpy
+
+from AnyQt.QtWidgets import QTextEdit, QLineEdit
+
 from orangewidget import gui
 from orangewidget.settings import Setting
 from orangewidget.widget import Output
@@ -15,7 +18,6 @@ from orangecontrib.xrayserver.util.xrayserver_util import HttpManager, XRayServe
 from orangecontrib.xrayserver.util.list_utility import ListUtility
 from orangecontrib.xrayserver.widgets.gui.ow_xrayserver_widget import XrayServerWidget, XrayServerException
 
-from PyQt5 import QtWidgets
 
 APPLICATION = "/cgi/gid_form.pl"
 
@@ -394,7 +396,7 @@ class GID_SL(XrayServerWidget):
 
         box_top_0_2 = oasysgui.widgetBox(box_top_0, "", addSpace=False, orientation="horizontal", width=360)
 
-        self.profile_area = QtWidgets.QTextEdit()
+        self.profile_area = QTextEdit()
         self.profile_area.setStyleSheet("background-color: white;")
         self.profile_area.setMaximumHeight(110)
         self.profile_area.setMaximumWidth(360)
@@ -418,21 +420,21 @@ class GID_SL(XrayServerWidget):
         oasysgui.widgetBox(box_top_1, "", addSpace=False, orientation="horizontal", width=100)
         box_top_1_2 = oasysgui.widgetBox(box_top_1, "", addSpace=False, orientation="horizontal", width=360)
 
-        crystals_area = QtWidgets.QTextEdit()
+        crystals_area = QTextEdit()
         crystals_area.setStyleSheet("background-color: white;")
         crystals_area.setMaximumHeight(100)
         crystals_area.setMaximumWidth(120)
         crystals_area.setText("\n".join(ListUtility.get_list("crystals")))
         crystals_area.setReadOnly(True)
 
-        non_crystals_area = QtWidgets.QTextEdit()
+        non_crystals_area = QTextEdit()
         non_crystals_area.setStyleSheet("background-color: white;")
         non_crystals_area.setMaximumHeight(100)
         non_crystals_area.setMaximumWidth(120)
         non_crystals_area.setText("\n".join(ListUtility.get_list("amorphous")))
         non_crystals_area.setReadOnly(True)
 
-        elements_area = QtWidgets.QTextEdit()
+        elements_area = QTextEdit()
         elements_area.setStyleSheet("background-color: white;")
         elements_area.setMaximumHeight(100)
         elements_area.setMaximumWidth(120)
@@ -472,7 +474,7 @@ class GID_SL(XrayServerWidget):
         except:
             pass
 
-        if event: QtWidgets.QLineEdit.focusOutEvent(self.le_alphamax, event)
+        if event: QLineEdit.focusOutEvent(self.le_alphamax, event)
 
     def set_TemplateType(self, change_values=True):
         if self.template_type == 0:

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/xrayserver/ow_ter_sl.py

@@ -1,9 +1,8 @@
 import numpy
 
-from PyQt5.QtCore import QSize, Qt
-from PyQt5.QtGui import QImage,QPixmap, QPainter, QPalette, QFont, QColor
-from PyQt5.QtWidgets import QLabel, QWidget
-from PyQt5 import QtWidgets
+from AnyQt.QtCore import QSize, Qt
+from AnyQt.QtGui import QImage,QPixmap, QPainter, QPalette, QFont, QColor
+from AnyQt.QtWidgets import QLabel, QWidget, QTextEdit
 
 import orangecanvas.resources as resources
 from orangewidget import gui
@@ -253,11 +252,11 @@ class TER_SL(XrayServerWidget):
 
         box_top_1 = oasysgui.widgetBox(box_top, "", addSpace=False, orientation="horizontal", width=470)
 
-        self.profile_area = QtWidgets.QTextEdit()
+        self.profile_area = QTextEdit()
         self.profile_area.setStyleSheet("background-color: white;")
         self.profile_area.setMaximumHeight(240)
         self.profile_area.setMaximumWidth(335)
-        self.profile_area.setLineWrapMode(QtWidgets.QTextEdit.NoWrap)
+        self.profile_area.setLineWrapMode(QTextEdit.NoWrap)
 
         box_top_1.layout().addWidget(self.profile_area)
         
@@ -267,7 +266,7 @@ class TER_SL(XrayServerWidget):
 
         gui.label(box_top_labels, self, "Available Codes:")
 
-        crystals_area = QtWidgets.QTextEdit()
+        crystals_area = QTextEdit()
         crystals_area.setStyleSheet("background-color: white;")
         crystals_area.setMaximumHeight(295)
         crystals_area.setMaximumWidth(130)

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/xrayserver/ow_x0h.py

@@ -16,7 +16,8 @@ from orangecontrib.xrayserver.util.xrayserver_util import HttpManager, XRayServe
 from orangecontrib.xrayserver.widgets.gui.ow_xrayserver_widget import XrayServerWidget, XrayServerException
 
 
-from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView
+try:    from AnyQt.QtWebEngineWidgets import QWebEngineView as QWebView
+except: from AnyQt.QtWebKitWidgets import QWebView
 
 APPLICATION = "/cgi/x0h_form.exe"
 

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/orangecontrib/xrayserver/widgets/xrayserver/ow_x0p.py

@@ -13,8 +13,8 @@ from orangecontrib.xrayserver.util.xrayserver_util import HttpManager, XRayServe
 from orangecontrib.xrayserver.widgets.gui.ow_xrayserver_widget import XrayServerWidget, XrayServerException
 from oasys2.canvas.util.canvas_util import ShowTextDialog
 
-from PyQt5 import QtGui
-from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView
+try:    from AnyQt.QtWebEngineWidgets import QWebEngineView as QWebView
+except: from AnyQt.QtWebKitWidgets import QWebView
 
 APPLICATION = "/cgi/x0p_form.exe"
 

{oasys2_xrayserver-1.0.0 → oasys2_xrayserver-1.0.2}/setup.py

@@ -8,7 +8,7 @@ except AttributeError:
     from setuptools import find_packages, setup
 
 NAME = 'OASYS2-XRayServer'
-VERSION = '1.0.0'
+VERSION = '1.0.2'
 ISRELEASED = True
 
 DESCRIPTION = 'X-Ray Server: Sergey Stepanov\'s X-Ray Server on OASYS 2'
@@ -41,7 +41,7 @@ SETUP_REQUIRES = (
 
 INSTALL_REQUIRES = (
     'oasys2>=0.0.1',
-    'PyQtWebEngine>=5.15.7',
+    'PyQt6-WebEngine>=6.9.0',
     'dabax',
 )
 

oasys2_xrayserver-1.0.0/OASYS2_XRayServer.egg-info/requires.txt

@@ -1,3 +0,0 @@
-oasys2>=0.0.1
-PyQtWebEngine>=5.15.7
-dabax