From 2fe5ae714955d5730fca399140219f3fe7e38c54 Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Thu, 26 Sep 2024 16:46:35 -0600 Subject: [PATCH] Remove use of poetry Signed-off-by: Travis F. Collins --- MANIFEST.in | 2 + gui/config.py | 150 ---------------- gui/config_popup.py | 40 ----- gui/gen_ui2py.sh | 3 - gui/gui.py | 88 ---------- gui/jif_gui/config.ui | 303 -------------------------------- gui/jif_gui/images/adi_logo.png | Bin 952 -> 0 bytes gui/jif_gui/main.ui | 279 ----------------------------- gui/jif_gui/resource.qrc | 5 - gui/main.py | 147 ---------------- gui/resource_rc.py | 123 ------------- noxfile.py | 5 +- pyproject.toml | 12 ++ 13 files changed, 16 insertions(+), 1141 deletions(-) delete mode 100644 gui/config.py delete mode 100644 gui/config_popup.py delete mode 100644 gui/gen_ui2py.sh delete mode 100644 gui/gui.py delete mode 100644 gui/jif_gui/config.ui delete mode 100644 gui/jif_gui/images/adi_logo.png delete mode 100644 gui/jif_gui/main.ui delete mode 100644 gui/jif_gui/resource.qrc delete mode 100644 gui/main.py delete mode 100644 gui/resource_rc.py diff --git a/MANIFEST.in b/MANIFEST.in index 965b2dd..ec0a260 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,8 @@ include HISTORY.rst include LICENSE include README.rst +include adijif/converters/resources/*.csv + recursive-include tests * recursive-exclude * __pycache__ recursive-exclude * *.py[co] diff --git a/gui/config.py b/gui/config.py deleted file mode 100644 index 1ec9ef6..0000000 --- a/gui/config.py +++ /dev/null @@ -1,150 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'jif_gui/config.ui' -# -# Created by: PyQt5 UI code generator 5.14.2 -# -# WARNING! All changes made in this file will be lost! - - -from PyQt5 import QtCore, QtGui, QtWidgets - - -class Ui_config_pu(object): - def setupUi(self, config_pu): - config_pu.setObjectName("config_pu") - config_pu.resize(330, 515) - self.label = QtWidgets.QLabel(config_pu) - self.label.setGeometry(QtCore.QRect(50, 20, 221, 51)) - self.label.setScaledContents(True) - self.label.setAlignment(QtCore.Qt.AlignCenter) - self.label.setObjectName("label") - self.groupBox = QtWidgets.QGroupBox(config_pu) - self.groupBox.setGeometry(QtCore.QRect(20, 70, 291, 211)) - self.groupBox.setAlignment(QtCore.Qt.AlignCenter) - self.groupBox.setObjectName("groupBox") - self.layoutWidget = QtWidgets.QWidget(self.groupBox) - self.layoutWidget.setGeometry(QtCore.QRect(10, 30, 268, 89)) - self.layoutWidget.setObjectName("layoutWidget") - self.gridLayout = QtWidgets.QGridLayout(self.layoutWidget) - self.gridLayout.setContentsMargins(0, 0, 0, 0) - self.gridLayout.setObjectName("gridLayout") - self.label_3 = QtWidgets.QLabel(self.layoutWidget) - self.label_3.setScaledContents(True) - self.label_3.setAlignment(QtCore.Qt.AlignCenter) - self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 0, 0, 1, 1) - self.comboBox = QtWidgets.QComboBox(self.layoutWidget) - self.comboBox.setObjectName("comboBox") - self.comboBox.addItem("") - self.comboBox.addItem("") - self.comboBox.addItem("") - self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1) - self.lineEdit_3 = QtWidgets.QLineEdit(self.layoutWidget) - self.lineEdit_3.setEnabled(False) - self.lineEdit_3.setObjectName("lineEdit_3") - self.gridLayout.addWidget(self.lineEdit_3, 0, 2, 1, 1) - self.label_4 = QtWidgets.QLabel(self.layoutWidget) - self.label_4.setScaledContents(True) - self.label_4.setAlignment(QtCore.Qt.AlignCenter) - self.label_4.setObjectName("label_4") - self.gridLayout.addWidget(self.label_4, 1, 0, 1, 1) - self.comboBox_2 = QtWidgets.QComboBox(self.layoutWidget) - self.comboBox_2.setObjectName("comboBox_2") - self.comboBox_2.addItem("") - self.comboBox_2.addItem("") - self.comboBox_2.addItem("") - self.gridLayout.addWidget(self.comboBox_2, 1, 1, 1, 1) - self.lineEdit = QtWidgets.QLineEdit(self.layoutWidget) - self.lineEdit.setEnabled(False) - self.lineEdit.setObjectName("lineEdit") - self.gridLayout.addWidget(self.lineEdit, 1, 2, 1, 1) - self.label_5 = QtWidgets.QLabel(self.layoutWidget) - self.label_5.setScaledContents(True) - self.label_5.setAlignment(QtCore.Qt.AlignCenter) - self.label_5.setObjectName("label_5") - self.gridLayout.addWidget(self.label_5, 2, 0, 1, 1) - self.comboBox_3 = QtWidgets.QComboBox(self.layoutWidget) - self.comboBox_3.setObjectName("comboBox_3") - self.comboBox_3.addItem("") - self.comboBox_3.addItem("") - self.comboBox_3.addItem("") - self.gridLayout.addWidget(self.comboBox_3, 2, 1, 1, 1) - self.lineEdit_2 = QtWidgets.QLineEdit(self.layoutWidget) - self.lineEdit_2.setEnabled(False) - self.lineEdit_2.setObjectName("lineEdit_2") - self.gridLayout.addWidget(self.lineEdit_2, 2, 2, 1, 1) - self.layoutWidget1 = QtWidgets.QWidget(self.groupBox) - self.layoutWidget1.setGeometry(QtCore.QRect(10, 130, 232, 54)) - self.layoutWidget1.setObjectName("layoutWidget1") - self.gridLayout_2 = QtWidgets.QGridLayout(self.layoutWidget1) - self.gridLayout_2.setContentsMargins(0, 0, 0, 0) - self.gridLayout_2.setObjectName("gridLayout_2") - self.checkBox = QtWidgets.QCheckBox(self.layoutWidget1) - self.checkBox.setObjectName("checkBox") - self.gridLayout_2.addWidget(self.checkBox, 0, 0, 1, 1) - self.checkBox_2 = QtWidgets.QCheckBox(self.layoutWidget1) - self.checkBox_2.setObjectName("checkBox_2") - self.gridLayout_2.addWidget(self.checkBox_2, 1, 0, 1, 1) - self.groupBox_2 = QtWidgets.QGroupBox(config_pu) - self.groupBox_2.setGeometry(QtCore.QRect(20, 290, 291, 151)) - self.groupBox_2.setAlignment(QtCore.Qt.AlignCenter) - self.groupBox_2.setObjectName("groupBox_2") - self.label_6 = QtWidgets.QLabel(self.groupBox_2) - self.label_6.setGeometry(QtCore.QRect(30, 30, 51, 25)) - self.label_6.setScaledContents(True) - self.label_6.setAlignment(QtCore.Qt.AlignCenter) - self.label_6.setObjectName("label_6") - self.comboBox_4 = QtWidgets.QComboBox(self.groupBox_2) - self.comboBox_4.setGeometry(QtCore.QRect(90, 30, 171, 25)) - self.comboBox_4.setObjectName("comboBox_4") - self.comboBox_4.addItem("") - self.comboBox_4.addItem("") - self.layoutWidget2 = QtWidgets.QWidget(self.groupBox_2) - self.layoutWidget2.setGeometry(QtCore.QRect(40, 60, 212, 27)) - self.layoutWidget2.setObjectName("layoutWidget2") - self.gridLayout_3 = QtWidgets.QGridLayout(self.layoutWidget2) - self.gridLayout_3.setContentsMargins(0, 0, 0, 0) - self.gridLayout_3.setObjectName("gridLayout_3") - self.lineEdit_4 = QtWidgets.QLineEdit(self.layoutWidget2) - self.lineEdit_4.setObjectName("lineEdit_4") - self.gridLayout_3.addWidget(self.lineEdit_4, 0, 0, 1, 1) - self.label_2 = QtWidgets.QLabel(self.layoutWidget2) - self.label_2.setObjectName("label_2") - self.gridLayout_3.addWidget(self.label_2, 0, 1, 1, 1) - self.line = QtWidgets.QFrame(config_pu) - self.line.setGeometry(QtCore.QRect(10, 50, 311, 20)) - self.line.setFrameShape(QtWidgets.QFrame.HLine) - self.line.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line.setObjectName("line") - - self.retranslateUi(config_pu) - QtCore.QMetaObject.connectSlotsByName(config_pu) - - def retranslateUi(self, config_pu): - _translate = QtCore.QCoreApplication.translate - config_pu.setWindowTitle(_translate("config_pu", "AD9523-1 Configurator")) - self.label.setText(_translate("config_pu", "AD9523-1 Configuration")) - self.groupBox.setTitle(_translate("config_pu", "Divider Settings")) - self.label_3.setText(_translate("config_pu", "m1")) - self.comboBox.setItemText(0, _translate("config_pu", "Auto Find")) - self.comboBox.setItemText(1, _translate("config_pu", "Fix")) - self.comboBox.setItemText(2, _translate("config_pu", "Range")) - self.label_4.setText(_translate("config_pu", "n2")) - self.comboBox_2.setItemText(0, _translate("config_pu", "Auto Find")) - self.comboBox_2.setItemText(1, _translate("config_pu", "Fix")) - self.comboBox_2.setItemText(2, _translate("config_pu", "Range")) - self.label_5.setText(_translate("config_pu", "r2")) - self.comboBox_3.setItemText(0, _translate("config_pu", "Auto Find")) - self.comboBox_3.setItemText(1, _translate("config_pu", "Fix")) - self.comboBox_3.setItemText(2, _translate("config_pu", "Range")) - self.checkBox.setText(_translate("config_pu", "Minimize Feedback Dividers")) - self.checkBox_2.setText( - _translate("config_pu", "Allow only even output dividers") - ) - self.groupBox_2.setTitle(_translate("config_pu", "References")) - self.label_6.setText(_translate("config_pu", "VCXO")) - self.comboBox_4.setItemText(0, _translate("config_pu", "Fix")) - self.comboBox_4.setItemText(1, _translate("config_pu", "Find multiple of")) - self.lineEdit_4.setText(_translate("config_pu", "125000000")) - self.label_2.setText(_translate("config_pu", "Hz")) diff --git a/gui/config_popup.py b/gui/config_popup.py deleted file mode 100644 index 07f363e..0000000 --- a/gui/config_popup.py +++ /dev/null @@ -1,40 +0,0 @@ -from config import Ui_config_pu -from PyQt5.Qt import * - - -class ConfigPopup(Ui_config_pu, QWidget): - def __init__(self): - QWidget.__init__(self) - self.setupUi(self) - self.add_connects() - - def add_connects(self): - self.comboBox.activated[str].connect(self.onChanged_m2) - self.comboBox_2.activated[str].connect(self.onChanged_n2) - self.comboBox_3.activated[str].connect(self.onChanged_r2) - - def update_input_fields(self, source, text): - if source == "m2": - if text == "Fix": - self.lineEdit_3.setEnabled(True) - elif text == "Auto Find": - self.lineEdit_3.setEnabled(False) - elif source == "n2": - if text == "Fix": - self.lineEdit.setEnabled(True) - elif text == "Auto Find": - self.lineEdit.setEnabled(False) - elif source == "r2": - if text == "Fix": - self.lineEdit_2.setEnabled(True) - elif text == "Auto Find": - self.lineEdit_2.setEnabled(False) - - def onChanged_m2(self, text): - self.update_input_fields("m2", text) - - def onChanged_n2(self, text): - self.update_input_fields("n2", text) - - def onChanged_r2(self, text): - self.update_input_fields("r2", text) diff --git a/gui/gen_ui2py.sh b/gui/gen_ui2py.sh deleted file mode 100644 index 64ffeb5..0000000 --- a/gui/gen_ui2py.sh +++ /dev/null @@ -1,3 +0,0 @@ -pyuic5 jif_gui/config.ui -o config.py -pyuic5 jif_gui/main.ui -o main.py -pyrcc5 jif_gui/resource.qrc -o resource_rc.py diff --git a/gui/gui.py b/gui/gui.py deleted file mode 100644 index 3bbee02..0000000 --- a/gui/gui.py +++ /dev/null @@ -1,88 +0,0 @@ -# import os,sys,inspect -# current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) -# parent_dir = os.path.dirname(current_dir) -# sys.path.insert(0, parent_dir) - -from config_popup import ConfigPopup -from main import Ui_MainGUI -from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.Qt import * - -# import adijif - - -def test_config(): - vcxo = 125000000 - - sys = adijif.system("ad9680", "hmc7044", "xilinx", vcxo) - - # Get Converter clocking requirements - sys.converter.sample_clock = 1e9 - sys.converter.datapath_decimation = 1 - sys.converter.L = 4 - sys.converter.M = 2 - sys.converter.N = 14 - sys.converter.Np = 16 - sys.converter.K = 32 - sys.converter.F = 1 - sys.Debug_Solver = False - - # Get FPGA clocking requirements - sys.fpga.setup_by_dev_kit_name("zc706") - sys.fpga.force_qpll = 1 - - try: - sys.solve() - except: - return False - lr = sys.converter.bit_clock - vcxo = sys.clock.vcxo - return sys.clock.get_config(), lr, vcxo - - -class PyADIGUI(Ui_MainGUI): - def add_row(self, c, lr, vcxo, row): - _translate = QtCore.QCoreApplication.translate - # LANE, VCXO, CNV REF, CNV SYS, FPGA REF, FPGA, SYS - c = c["output_clocks"] - - values = [ - lr, - vcxo, - c["ad9680_adc_clock"]["rate"], - c["ad9680_sysref"]["rate"], - c["fpga_ref"]["rate"], - c["ad9680_sysref"]["rate"], - ] - for i, val in enumerate(values): - print(i) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setItem(row, i, item) - item = self.tw_output.item(row, i) - item.setText(_translate("MyGUI", str(val))) - - def search(self): - o, lr, vcxo = test_config() - self.add_row(o, lr, vcxo, 0) - self.tw_output.setRowCount(2) - self.add_row(o, lr, vcxo, 1) - - def launch_config_panel(self): - self.w = ConfigPopup() - self.w.show() - - def add_connects(self): - self.b_search.clicked.connect(self.search) - self.pushButton_4.clicked.connect(self.launch_config_panel) - - -if __name__ == "__main__": - import sys - - app = QtWidgets.QApplication(sys.argv) - MyGUI = QtWidgets.QMainWindow() - ui = PyADIGUI() - ui.setupUi(MyGUI) - ui.add_connects() - MyGUI.show() - sys.exit(app.exec_()) diff --git a/gui/jif_gui/config.ui b/gui/jif_gui/config.ui deleted file mode 100644 index 81c193d..0000000 --- a/gui/jif_gui/config.ui +++ /dev/null @@ -1,303 +0,0 @@ - - - config_pu - - - - 0 - 0 - 330 - 515 - - - - AD9523-1 Configurator - - - - - 50 - 20 - 221 - 51 - - - - AD9523-1 Configuration - - - true - - - Qt::AlignCenter - - - - - - 20 - 70 - 291 - 211 - - - - Divider Settings - - - Qt::AlignCenter - - - - - 10 - 30 - 268 - 89 - - - - - - - m1 - - - true - - - Qt::AlignCenter - - - - - - - - Auto Find - - - - - Fix - - - - - Range - - - - - - - - false - - - - - - - n2 - - - true - - - Qt::AlignCenter - - - - - - - - Auto Find - - - - - Fix - - - - - Range - - - - - - - - false - - - - - - - r2 - - - true - - - Qt::AlignCenter - - - - - - - - Auto Find - - - - - Fix - - - - - Range - - - - - - - - false - - - - - - - - - 10 - 130 - 232 - 54 - - - - - - - Minimize Feedback Dividers - - - - - - - Allow only even output dividers - - - - - - - - - - 20 - 290 - 291 - 151 - - - - References - - - Qt::AlignCenter - - - - - 30 - 30 - 51 - 25 - - - - VCXO - - - true - - - Qt::AlignCenter - - - - - - 90 - 30 - 171 - 25 - - - - - Fix - - - - - Find multiple of - - - - - - - 40 - 60 - 212 - 27 - - - - - - - 125000000 - - - - - - - Hz - - - - - - - - - - 10 - 50 - 311 - 20 - - - - Qt::Horizontal - - - - - - diff --git a/gui/jif_gui/images/adi_logo.png b/gui/jif_gui/images/adi_logo.png deleted file mode 100644 index b19682ea512f6d71ec10770c42f6d4adc876050f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmeAS@N?(olHy`uVBq!ia0vp^tAKbd2NRH7FIb!lq&N#aB8wRq_|$-E{xg0Ee)^e# zfjP_5#WAE}&fB{O3l}>`xIFxN&CQ9+t1)5dDQTsHB&eC2!XrQi>np4|Vp@4cjB#LT>ZJqpX#?El-NFpH`FuY{w_(SJXUn>e`a ze;77xaoGdG8S&ROz|Km7yVbDXH3CFSn$Z}L@B zrcdgDr#Vi{5BMWE!G7lnWrcb*L!iu>MZFDwSdU0D{_O5FVEQB;R>ty#f8iC56Y?Ja zfC}f#0V)iry&tbP{mSw`-n9(hW<9TzIsW_ayoWlU*e4n9nPA`Y=V9xg)~Q_jPxP1N zR4CRn3LfJAxw%U??!;WaclHJ{XKxXYJMq6e>@fGw@U5~yW{Y!$;(u{Fpp^U_pbfr< zyG!eye@L1&|3lLB`5)#>K2`ryF7}gi|FVyNTK-3F2C`h6fkbRDkO)`)$@zcQtIxv! zI=XmdK II;Vst0OgSBj{pDw diff --git a/gui/jif_gui/main.ui b/gui/jif_gui/main.ui deleted file mode 100644 index 7c13d82..0000000 --- a/gui/jif_gui/main.ui +++ /dev/null @@ -1,279 +0,0 @@ - - - MainGUI - - - true - - - - 0 - 0 - 733 - 619 - - - - ADI JESD Configurator - - - - - - 65 - 140 - 111 - 25 - - - - Configure - - - - - - 10 - 380 - 711 - 161 - - - - - 1 - - - - - Lane Rate - - - - - VCXO - - - - - Converter Clock Rate - - - - - Converter Sysref Rate - - - - - FPGA Reference Rate - - - - - FPGA Sysref Rate - - - - - FPGA Config - - - - - Clock Config - - - - - 10000000000 - - - - - 125000000 - - - - - - - 180 - 110 - 361 - 16 - - - - Qt::Horizontal - - - - - - 180 - 140 - 361 - 16 - - - - Qt::Horizontal - - - - - - 150 - 350 - 411 - 21 - - - - Search - - - - - - 330 - 90 - 64 - 23 - - - - - - - 65 - 110 - 111 - 25 - - - - - AD9680 - - - - - AD9144 - - - - - ADRV9009 - - - - - - - 550 - 110 - 111 - 25 - - - - - Xilinx - - - - - Intel - - - - - - - 550 - 140 - 111 - 25 - - - - Configure - - - - - - 300 - 170 - 111 - 25 - - - - - AD9523-1 - - - - - AD9528 - - - - - HMC7044 - - - - - - - 300 - 200 - 111 - 25 - - - - Configure - - - - - - 650 - 0 - 81 - 81 - - - - - - - :/images/adi_logo.png - - - true - - - - - - - 0 - 0 - 733 - 22 - - - - - - - - - - diff --git a/gui/jif_gui/resource.qrc b/gui/jif_gui/resource.qrc deleted file mode 100644 index 29b1fdf..0000000 --- a/gui/jif_gui/resource.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/adi_logo.png - - diff --git a/gui/main.py b/gui/main.py deleted file mode 100644 index ff9ab64..0000000 --- a/gui/main.py +++ /dev/null @@ -1,147 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'jif_gui/main.ui' -# -# Created by: PyQt5 UI code generator 5.14.2 -# -# WARNING! All changes made in this file will be lost! - - -import resource_rc -from PyQt5 import QtCore, QtGui, QtWidgets - - -class Ui_MainGUI(object): - def setupUi(self, MainGUI): - MainGUI.setObjectName("MainGUI") - MainGUI.setEnabled(True) - MainGUI.resize(733, 619) - self.centralwidget = QtWidgets.QWidget(MainGUI) - self.centralwidget.setObjectName("centralwidget") - self.pushButton = QtWidgets.QPushButton(self.centralwidget) - self.pushButton.setGeometry(QtCore.QRect(65, 140, 111, 25)) - self.pushButton.setObjectName("pushButton") - self.tw_output = QtWidgets.QTableWidget(self.centralwidget) - self.tw_output.setGeometry(QtCore.QRect(10, 380, 711, 161)) - self.tw_output.setObjectName("tw_output") - self.tw_output.setColumnCount(8) - self.tw_output.setRowCount(1) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setVerticalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(2, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(3, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(4, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(5, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(6, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setHorizontalHeaderItem(7, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setItem(0, 0, item) - item = QtWidgets.QTableWidgetItem() - self.tw_output.setItem(0, 1, item) - self.line = QtWidgets.QFrame(self.centralwidget) - self.line.setGeometry(QtCore.QRect(180, 110, 361, 16)) - self.line.setFrameShape(QtWidgets.QFrame.HLine) - self.line.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line.setObjectName("line") - self.line_2 = QtWidgets.QFrame(self.centralwidget) - self.line_2.setGeometry(QtCore.QRect(180, 140, 361, 16)) - self.line_2.setFrameShape(QtWidgets.QFrame.HLine) - self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line_2.setObjectName("line_2") - self.b_search = QtWidgets.QPushButton(self.centralwidget) - self.b_search.setGeometry(QtCore.QRect(150, 350, 411, 21)) - self.b_search.setObjectName("b_search") - self.lcdNumber = QtWidgets.QLCDNumber(self.centralwidget) - self.lcdNumber.setGeometry(QtCore.QRect(330, 90, 64, 23)) - self.lcdNumber.setObjectName("lcdNumber") - self.cb_converter = QtWidgets.QComboBox(self.centralwidget) - self.cb_converter.setGeometry(QtCore.QRect(65, 110, 111, 25)) - self.cb_converter.setObjectName("cb_converter") - self.cb_converter.addItem("") - self.cb_converter.addItem("") - self.cb_converter.addItem("") - self.cb_fpga = QtWidgets.QComboBox(self.centralwidget) - self.cb_fpga.setGeometry(QtCore.QRect(550, 110, 111, 25)) - self.cb_fpga.setObjectName("cb_fpga") - self.cb_fpga.addItem("") - self.cb_fpga.addItem("") - self.pushButton_2 = QtWidgets.QPushButton(self.centralwidget) - self.pushButton_2.setGeometry(QtCore.QRect(550, 140, 111, 25)) - self.pushButton_2.setObjectName("pushButton_2") - self.cb_clock = QtWidgets.QComboBox(self.centralwidget) - self.cb_clock.setGeometry(QtCore.QRect(300, 170, 111, 25)) - self.cb_clock.setObjectName("cb_clock") - self.cb_clock.addItem("") - self.cb_clock.addItem("") - self.cb_clock.addItem("") - self.pushButton_4 = QtWidgets.QPushButton(self.centralwidget) - self.pushButton_4.setGeometry(QtCore.QRect(300, 200, 111, 25)) - self.pushButton_4.setObjectName("pushButton_4") - self.label = QtWidgets.QLabel(self.centralwidget) - self.label.setGeometry(QtCore.QRect(650, 0, 81, 81)) - self.label.setText("") - self.label.setPixmap(QtGui.QPixmap(":/images/adi_logo.png")) - self.label.setScaledContents(True) - self.label.setObjectName("label") - MainGUI.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainGUI) - self.menubar.setGeometry(QtCore.QRect(0, 0, 733, 22)) - self.menubar.setObjectName("menubar") - MainGUI.setMenuBar(self.menubar) - self.statusbar = QtWidgets.QStatusBar(MainGUI) - self.statusbar.setObjectName("statusbar") - MainGUI.setStatusBar(self.statusbar) - - self.retranslateUi(MainGUI) - QtCore.QMetaObject.connectSlotsByName(MainGUI) - - def retranslateUi(self, MainGUI): - _translate = QtCore.QCoreApplication.translate - MainGUI.setWindowTitle(_translate("MainGUI", "ADI JESD Configurator")) - self.pushButton.setText(_translate("MainGUI", "Configure")) - item = self.tw_output.verticalHeaderItem(0) - item.setText(_translate("MainGUI", "1")) - item = self.tw_output.horizontalHeaderItem(0) - item.setText(_translate("MainGUI", "Lane Rate")) - item = self.tw_output.horizontalHeaderItem(1) - item.setText(_translate("MainGUI", "VCXO")) - item = self.tw_output.horizontalHeaderItem(2) - item.setText(_translate("MainGUI", "Converter Clock Rate")) - item = self.tw_output.horizontalHeaderItem(3) - item.setText(_translate("MainGUI", "Converter Sysref Rate")) - item = self.tw_output.horizontalHeaderItem(4) - item.setText(_translate("MainGUI", "FPGA Reference Rate")) - item = self.tw_output.horizontalHeaderItem(5) - item.setText(_translate("MainGUI", "FPGA Sysref Rate")) - item = self.tw_output.horizontalHeaderItem(6) - item.setText(_translate("MainGUI", "FPGA Config")) - item = self.tw_output.horizontalHeaderItem(7) - item.setText(_translate("MainGUI", "Clock Config")) - __sortingEnabled = self.tw_output.isSortingEnabled() - self.tw_output.setSortingEnabled(False) - item = self.tw_output.item(0, 0) - item.setText(_translate("MainGUI", "10000000000")) - item = self.tw_output.item(0, 1) - item.setText(_translate("MainGUI", "125000000")) - self.tw_output.setSortingEnabled(__sortingEnabled) - self.b_search.setText(_translate("MainGUI", "Search")) - self.cb_converter.setItemText(0, _translate("MainGUI", "AD9680")) - self.cb_converter.setItemText(1, _translate("MainGUI", "AD9144")) - self.cb_converter.setItemText(2, _translate("MainGUI", "ADRV9009")) - self.cb_fpga.setItemText(0, _translate("MainGUI", "Xilinx")) - self.cb_fpga.setItemText(1, _translate("MainGUI", "Intel")) - self.pushButton_2.setText(_translate("MainGUI", "Configure")) - self.cb_clock.setItemText(0, _translate("MainGUI", "AD9523-1")) - self.cb_clock.setItemText(1, _translate("MainGUI", "AD9528")) - self.cb_clock.setItemText(2, _translate("MainGUI", "HMC7044")) - self.pushButton_4.setText(_translate("MainGUI", "Configure")) diff --git a/gui/resource_rc.py b/gui/resource_rc.py deleted file mode 100644 index d7b83a0..0000000 --- a/gui/resource_rc.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- - -# Resource object code -# -# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore - -qt_resource_data = b"\ -\x00\x00\x03\xb8\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\xaa\x00\x00\x00\xad\x08\x02\x00\x00\x00\xaf\x11\x73\x6d\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\x26\x00\x00\x0d\xff\ -\x01\xf0\x53\xe5\xf3\x00\x00\x03\x6a\x49\x44\x41\x54\x78\x9c\xed\ -\xdd\xc1\x71\xa3\x40\x18\x44\xe1\xf5\xd6\x46\x42\x0a\x4a\x81\x58\ -\x94\x02\x31\x10\x82\x94\x0a\x4a\xc5\xa4\xc2\x1e\xda\x07\xbb\x2c\ -\x6c\x10\xcc\xcc\x3f\xd3\xef\xbb\xea\x30\x54\xbd\x16\x12\x27\xde\ -\x96\x65\xf9\x03\x57\x7f\x4b\x5f\x00\x4a\x22\xbf\x35\xf2\x5b\x23\ -\xbf\x35\xf2\x5b\x23\xbf\x35\xf2\x5b\x23\xbf\xb7\x65\xc5\x30\x0c\ -\xa5\x2f\x0d\x27\x18\x86\x61\x2d\xf1\xb2\x2c\x7c\xfb\xad\x91\xdf\ -\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\ -\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\ -\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\ -\x91\xdf\x5a\xda\xfc\xd3\x34\x4d\xd3\xd4\xf7\x7d\xd2\x53\xf0\xb2\ -\xe4\xdf\xfe\xbe\xef\x19\x41\x58\x99\x6e\xfe\x8c\x20\xa6\xac\xbf\ -\xfd\x8c\x20\x9a\x02\x7f\xfd\x18\x41\x1c\xc5\xfe\xf9\x33\x82\x08\ -\x0a\x3f\xf8\x31\x82\xb2\x42\x3c\xf7\x33\x82\x52\x42\xe4\x17\x46\ -\x90\x5f\xa0\xfc\xa2\x11\xdc\x6e\xb7\xae\xeb\x4a\x5f\x4b\xfb\xc2\ -\xe5\x97\xeb\xf5\xfa\xfe\xfe\xce\x08\x52\x0b\x9a\x5f\x18\x41\x6a\ -\xa1\xf3\x0b\x23\x48\xa7\x82\xfc\xc2\x08\x52\xa8\x26\xbf\x30\x82\ -\x73\x55\x96\x5f\x18\xc1\x59\xaa\xcc\x2f\x8c\xe0\xb8\x8a\xf3\x0b\ -\x23\x38\xa2\xfa\xfc\xc2\x08\x5e\xd3\x48\x7e\x61\x04\x7b\x35\x95\ -\x5f\x18\xc1\x76\x0d\xe6\x17\x46\xb0\x45\xb3\xf9\x85\x11\xfc\xac\ -\xf1\xfc\xc2\x08\xd6\x58\xe4\x17\x46\xf0\x9d\x51\x7e\x61\x04\x9f\ -\xd9\xe5\x17\x46\x20\xa6\xf9\x85\x11\x58\xe7\x17\xe7\x11\x90\xff\ -\x83\xe7\x08\xc8\xff\x85\xdb\x08\xc8\xff\x84\xcf\x08\xc8\xbf\xca\ -\x61\x04\xe4\xff\x45\xdb\x23\x20\xff\x26\xad\x8e\x80\xfc\x3b\xb4\ -\x37\x02\xf2\xef\xd6\xd2\x08\xc8\xff\xa2\x36\x46\x40\xfe\x43\x6a\ -\x1f\x01\xf9\x4f\x50\xef\x08\xc8\x7f\x9a\x1a\x47\x40\xfe\x93\xd5\ -\x35\x02\xf2\x27\x51\xcb\x08\xc8\x9f\x50\xfc\x11\x90\x3f\xb9\xc8\ -\x23\x20\x7f\x26\x31\x47\x40\xfe\xac\xa2\x8d\x80\xfc\x05\xc4\x19\ -\x01\xf9\x8b\x89\x30\x02\xf2\x17\x56\x76\x04\xe4\x0f\xa1\xd4\x08\ -\xc8\x1f\x48\xfe\x11\x90\x3f\x9c\x9c\x23\x20\x7f\x50\x7d\xdf\x5f\ -\x2e\x97\xd4\xa7\xfc\x4b\x7d\x00\xf6\x9a\xe7\x79\x1c\xc7\xfb\xfd\ -\x9e\xe1\x2c\xf2\x07\x92\x33\xbc\x90\x3f\x84\xfc\xe1\x85\xfc\x85\ -\x95\x0a\x2f\xe4\x2f\xa6\x6c\x78\x21\x7f\x01\x11\xc2\x0b\xf9\xb3\ -\x8a\x13\x5e\xc8\x9f\x49\xb4\xf0\x42\xfe\xe4\x62\x86\x17\xf2\x27\ -\x14\x39\xbc\x90\x3f\x89\xf8\xe1\x85\xfc\x27\xab\x25\xbc\x90\xff\ -\x34\x75\x85\x17\xf2\x9f\xa0\xc6\xf0\x42\xfe\x43\xea\x0d\x2f\xe4\ -\x7f\x51\xed\xe1\x85\xfc\xbb\xb5\x11\x5e\xc8\xbf\x43\x4b\xe1\x85\ -\xfc\x9b\xb4\x17\x5e\xc8\xff\x8b\x56\xc3\x0b\xf9\x57\xb5\x1d\x5e\ -\xc8\xff\x84\x43\x78\x21\xff\x17\x3e\xe1\x85\xfc\x1f\xdc\xc2\x0b\ -\xf9\x4d\xc3\x8b\x75\x7e\xe7\xf0\x62\x9a\x9f\xf0\x62\x97\x9f\xf0\ -\x9f\x19\xe5\x27\xfc\x77\x16\xf9\x09\xbf\xa6\xf1\xfc\x84\xff\x59\ -\xb3\xf9\x09\xbf\x45\x83\xf9\x09\xbf\x5d\x53\xf9\x09\xbf\x57\x23\ -\xf9\x09\xff\x9a\xea\xf3\x13\xfe\x88\x8a\xf3\x13\xfe\xb8\x2a\xf3\ -\x13\xfe\x2c\x95\xe5\x27\xfc\xb9\xaa\xc9\x4f\xf8\x14\x2a\xc8\x4f\ -\xf8\x74\x42\xe7\x27\x7c\x6a\x41\xf3\x13\x3e\x8f\x70\xf9\x09\x9f\ -\x53\xa0\xfc\x84\xcf\x2f\x44\x7e\xc2\x97\x52\x38\x3f\xe1\xcb\x2a\ -\x96\x9f\xf0\x11\x14\xc8\x4f\xf8\x38\xb2\xe6\x27\x7c\x34\x99\xf2\ -\x13\x3e\xa6\xe4\xf9\x09\x1f\x59\xda\xfc\xe3\x38\x3e\x1e\x8f\xa4\ -\x47\xe0\x88\xb4\x6f\xf2\xa2\x7d\x70\xbc\xc8\xcd\x1a\xf9\xad\x91\ -\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\ -\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\ -\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\x1a\xf9\xad\x91\xdf\xda\xdb\ -\xb2\x2c\x4f\x3f\x98\xe7\x79\x9e\xe7\xcc\x57\x83\xd3\x75\x5d\xd7\ -\x75\xdd\xda\xa7\xab\xf9\xe1\x80\x9b\xbf\x35\xf2\x5b\x23\xbf\x35\ -\xf2\x5b\x23\xbf\x35\xf2\x5b\x23\xbf\x35\xf2\x5b\x23\xbf\x35\xf2\ -\x5b\xfb\x0f\xed\x70\xc1\x9a\xf3\x6c\x82\x7a\x00\x00\x00\x00\x49\ -\x45\x4e\x44\xae\x42\x60\x82\ -" - -qt_resource_name = b"\ -\x00\x06\ -\x07\x03\x7d\xc3\ -\x00\x69\ -\x00\x6d\x00\x61\x00\x67\x00\x65\x00\x73\ -\x00\x0c\ -\x09\x57\xbb\x27\ -\x00\x61\ -\x00\x64\x00\x69\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x2e\x00\x70\x00\x6e\x00\x67\ -" - -qt_resource_struct_v1 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ -\x00\x00\x00\x12\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -" - -qt_resource_struct_v2 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x12\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x76\xfd\x86\xae\xe6\ -" - -qt_version = [int(v) for v in QtCore.qVersion().split(".")] -if qt_version < [5, 8, 0]: - rcc_version = 1 - qt_resource_struct = qt_resource_struct_v1 -else: - rcc_version = 2 - qt_resource_struct = qt_resource_struct_v2 - - -def qInitResources(): - QtCore.qRegisterResourceData( - rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data - ) - - -def qCleanupResources(): - QtCore.qUnregisterResourceData( - rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data - ) - - -qInitResources() diff --git a/noxfile.py b/noxfile.py index 5ac1b5c..ceee78b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -138,19 +138,18 @@ def testsnb(session): args = ["--nbmake", "examples"] install_with_constraints( session, + ".[cplex,gekko]", "pytest", "pytest-cov", "pytest-xdist", "pytest-mock", - "gekko", "numpy", - "cplex", - "docplex", "coverage[toml]", "nbmake", "pandas", "itables", "git+https://github.com/analogdevicesinc/pyadi-dt.git", + "jinja2", "pillow", ) session.run("pytest", *args) diff --git a/pyproject.toml b/pyproject.toml index 77441a1..a3eae51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,3 +26,15 @@ source = ["adijif"] [tool.coverage.report] show_missing = true fail_under = 90 + +[tool.setuptools.packages.find] +where = ["."] +include = ["adijif"] +exclude = ["tests*"] +namespaces = true + +[tool.setuptools] +py-modules = ["adijif"] + +[tool.setuptools.package-data] +adijif = ["adijif/converters/resources/*.csv"] \ No newline at end of file