Skip to content

use qtpy Qt interface layer instead of hardcoded PyQt5 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacobwilliams wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

use qtpy Qt interface layer instead of hardcoded PyQt5 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Demos/Python/ofqt_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
Launches a demonstration of OpenFrames managed within a PyQt5 framework
Launches a demonstration of OpenFrames managed within a qtpy framework

Copyright (c) 2021 Emergent Space Technologies, Inc.
"""
Expand All @@ -26,20 +26,20 @@
os.environ['OSG_FILE_PATH'] = str(os.environ.get('OSG_FILE_PATH')) + os.pathsep + "/System/Library/Fonts/Supplemental"

# Import modules
from PyQt5.QtWidgets import *
from PyQt5.QtGui import QSurfaceFormat
from PyQt5.QtCore import Qt
from qtpy.QtWidgets import *
from qtpy.QtGui import QSurfaceFormat
from qtpy.QtCore import Qt
import OFInterfaces.PyQtOF as PyQtOF
import OFInterfaces.PyOF as PyOF

from PyQt5.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
from qtpy.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
QMetaObject, QObject, QPoint, QRect,
QSize, QTime, QUrl, Qt)
from PyQt5.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PyQt5.QtWidgets import (QApplication, QDockWidget, QMainWindow, QMenuBar,
from qtpy.QtWidgets import (QApplication, QDockWidget, QMainWindow, QMenuBar,
QSizePolicy, QStatusBar, QWidget)

class Ui_MainWindow(object):
Expand Down Expand Up @@ -168,7 +168,7 @@ def __init__(self):
label = QLabel("Widget in a Tab.")

self.ofwidget = PyQtOF.OFWidget(MyOFDemoWin1)
self.ofwidget.setWindowTitle('PyQt5 OpenFrames Window 1')
self.ofwidget.setWindowTitle('qtpy OpenFrames Window 1')
self.ofwidget.setGeometry(50, 50, 1024, 768)

tabwidget = QTabWidget()
Expand Down Expand Up @@ -205,7 +205,7 @@ def closeEvent(self, event):

# Create standalone window
#exStandaloneWindow = PyQtOF.OFWidget(MyOFDemoWin2)
#exStandaloneWindow.setWindowTitle('PyQt5 OpenFrames Window 2')
#exStandaloneWindow.setWindowTitle('qtpy OpenFrames Window 2')
#exStandaloneWindow.setGeometry(100, 100, 1024, 768)
#exStandaloneWindow.show()

Expand Down
10 changes: 5 additions & 5 deletions Demos/Python/ofqt_interfacec_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
"""
Launches a demonstration of OpenFrames managed within a PyQt5 framework
Launches a demonstration of OpenFrames managed within a qtpy framework

"""

import sys
from PyQt5.QtWidgets import QApplication
from PyQt5.QtGui import QSurfaceFormat
from qtpy.QtWidgets import QApplication
from qtpy.QtGui import QSurfaceFormat
import OFInterfaces.PyQtOFInterfaceC as PyQtOF
from OFInterfaces.PyOFInterfaceC import *

Expand Down Expand Up @@ -75,13 +75,13 @@ def __init__(self):

# Create first window
ex1 = PyQtOF.Widget(MyOFDemoWin1)
ex1.setWindowTitle('PyQt5 OpenFrames Window 1')
ex1.setWindowTitle('qtpy OpenFrames Window 1')
ex1.setGeometry(50, 50, 1024, 768)
ex1.show()

# Create second window
ex2 = PyQtOF.Widget(MyOFDemoWin2)
ex2.setWindowTitle('PyQt5 OpenFrames Window 2')
ex2.setWindowTitle('qtpy OpenFrames Window 2')
ex2.setGeometry(100, 100, 1024, 768)
ex2.show()

Expand Down
8 changes: 4 additions & 4 deletions OFInterfaces/PyQtOF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"""

from sys import platform
from PyQt5.QtWidgets import QWidget, QDockWidget, QGridLayout, QSizePolicy, QLabel
from PyQt5.QtGui import QWindow, QOpenGLContext
from PyQt5.QtCore import Qt, QSize, QCoreApplication, QEventLoop
from qtpy.QtWidgets import QWidget, QDockWidget, QGridLayout, QSizePolicy, QLabel
from qtpy.QtGui import QWindow, QOpenGLContext
from qtpy.QtCore import Qt, QSize, QCoreApplication, QEventLoop
from . import PyOF

DEFAULT_WIDTH = 320
Expand Down Expand Up @@ -191,7 +191,7 @@ def _map_qt_key_event_to_osg_key(event):

Parameters
----------
event : PyQt5.QtGui.QKeyEvent.QKeyEvent
event : qtpy.QtGui.QKeyEvent.QKeyEvent
The key event to map

Returns
Expand Down
8 changes: 4 additions & 4 deletions OFInterfaces/PyQtOFInterfaceC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

"""

from PyQt5.QtWidgets import QWidget, QGridLayout, QSizePolicy
from PyQt5.QtGui import QWindow, QOpenGLContext
from PyQt5.QtCore import Qt, QSize, QCoreApplication, QEventLoop
from qtpy.QtWidgets import QWidget, QGridLayout, QSizePolicy
from qtpy.QtGui import QWindow, QOpenGLContext
from qtpy.QtCore import Qt, QSize, QCoreApplication, QEventLoop
from .PyOFInterfaceC import *


Expand Down Expand Up @@ -204,7 +204,7 @@ def _map_qt_key_event_to_osg_key(event):

Parameters
----------
event : PyQt5.QtGui.QKeyEvent.QKeyEvent
event : qtpy.QtGui.QKeyEvent.QKeyEvent
The key event to map

Returns
Expand Down