Index: DD_Conductivity/loader.py =================================================================== diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r736bbf411c3a020f656991ae826ed4b2389dfe81 --- DD_Conductivity/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f) +++ DD_Conductivity/loader.py (.../loader.py) (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # dd Simulator from leahi_dialin.ui.dd_messaging import DD_Messaging Index: DD_Versions/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -r736bbf411c3a020f656991ae826ed4b2389dfe81 --- DD_Versions/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ DD_Versions/loader.py (.../loader.py) (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -11,17 +11,13 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - -# hd Simulator +# dd Simulator from leahi_dialin.ui.dd_messaging import DD_Messaging class Loader(DynamicLoader): """ - The TD Versions ui loader + The DD Versions ui loader """ def __init__(self): Index: FP_Pressure/interface.ui =================================================================== diff -u --- FP_Pressure/interface.ui (revision 0) +++ FP_Pressure/interface.ui (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,311 @@ + + + ui_interface + + + + 0 + 0 + 1000 + 290 + + + + + 0 + 0 + + + + + 1000 + 0 + + + + + 1000 + 16777215 + + + + + 476 + 250 + + + + &7 FP info/&1 Pressures + + + + + + 2 + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(169, 25, 219); + + + 52 : [0x3400] : FP Pressures + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + + + + + + + + + + + 220 + 0 + + + + Before RO pump Pressure (X1) + + + + + + + + + + + + + + + 220 + 0 + + + + RO Concentrate Drop (X3) + + + + + + + + + + + + + + + 230 + 0 + + + + Before RO Filter (P13) + + + + + + + + + + + + + + + 230 + 0 + + + + After RO Filter (P17) + + + + + + + + + + + + + + + 220 + 0 + + + + RO Concentrate (X2) + + + + + + + + + + + + + + + 220 + 0 + + + + Pressure Drain Drop (X4) + + + + + + + + + + + + + + + 230 + 0 + + + + Before Inlet Conductivity (P8) + + + + + + + + + + + + + + + 230 + 0 + + + + After Pressure Regulator (M3) + + + + + + + + + + + + + + + 230 + 0 + + + + Before Pressure Regulator (M1) + + + + + + + 10000.000000000000000 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + dsbBeforePressureRegulator + dsbAfterPressureRegulator + dsbBeforeInletConductivity + dsbBeforeROFilter + dsbAfterROFilter + dsbBeforeROPump + dsbROConcentrate + dsbROConcentrateDrop + dsbDrainDrop + tbSend + tbReset + + + + Index: FP_Pressure/loader.py =================================================================== diff -u --- FP_Pressure/loader.py (revision 0) +++ FP_Pressure/loader.py (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,96 @@ +""" + The FP pressure ui loader +""" +# Python +import os + +# Qt +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Slot + +# parent +from engine.dynamicloader import DynamicLoader + +# FP Simulator +from leahi_dialin.ui.fp_messaging import FP_Messaging + + +class Loader(DynamicLoader): + """ + The FP pressure ui loader + """ + + def __init__(self): + self.fp_interface = FP_Messaging() + super().__init__(os.path.dirname(__file__)) + + + def _init_loader(self): + """ + finds and creates widgets + :return: none + """ + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + + self.dsbBeforePressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforePressureRegulator' ) + self.dsbAfterPressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbAfterPressureRegulator' ) + self.dsbBeforeInletConductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeInletConductivity' ) + self.dsbBeforeROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeROFilter' ) + self.dsbAfterROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbAfterROFilter' ) + self.dsbBeforeROPump = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeROPump' ) + self.dsbROConcentrate = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbROConcentrate' ) + self.dsbROConcentrateDrop = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbROConcentrateDrop' ) + self.dsbDrainDrop = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbDrainDrop' ) + + def _init_connections(self): + """ + initializes the widgets connections + :return: none + """ + self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_fp_pressure) + + @Slot() + def _init_widgets(self): + """ + initializes the widgets' properties + :return: none + """ + self.dsbBeforePressureRegulator .setValue(0) + self.dsbAfterPressureRegulator .setValue(0) + self.dsbBeforeInletConductivity .setValue(0) + self.dsbBeforeROFilter .setValue(0) + self.dsbAfterROFilter .setValue(0) + self.dsbBeforeROPump .setValue(0) + self.dsbROConcentrate .setValue(0) + self.dsbROConcentrateDrop .setValue(0) + self.dsbDrainDrop .setValue(0) + @Slot() + def do_fp_pressure(self): + """ + the slot for FP pressure change + :return: none + """ + + m1Pressure = self.dsbBeforePressureRegulator .value() + m3Pressure = self.dsbAfterPressureRegulator .value() + p8Pressure = self.dsbBeforeInletConductivity .value() + p13Pressure = self.dsbBeforeROFilter .value() + p17Pressure = self.dsbAfterROFilter .value() + x1Pressure = self.dsbBeforeROPump .value() + x2Pressure = self.dsbROConcentrate .value() + x3Pressure = self.dsbROConcentrateDrop .value() + x4Pressure = self.dsbDrainDrop .value() + + self.fp_interface.fp_pressure( + m1Pressure , + m3Pressure , + p8Pressure , + p13Pressure , + p17Pressure , + x1Pressure , + x2Pressure , + x3Pressure , + x4Pressure + ) \ No newline at end of file Index: FP_Valves/interface.ui =================================================================== diff -u --- FP_Valves/interface.ui (revision 0) +++ FP_Valves/interface.ui (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,618 @@ + + + ui_interface + + + + 0 + 0 + 540 + 392 + + + + + 0 + 0 + + + + + 540 + 0 + + + + + 1202 + 16777215 + + + + + 0 + 0 + + + + &7 FP info/&2 Valves + + + + + + 2 + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(123, 91, 149) + + + 49 : [0x3100] : FP Valves + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + + + + + + + + + + + 230 + 26 + + + + M4 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 1 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P39 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 2 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P6 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 3 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P11 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 4 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P33 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 5 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P34 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 6 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P37 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 7 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + M7 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 8 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P20 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 9 + + + + + + + 255 + + + + + + + + + + + + 230 + 26 + + + + P43 Valve + + + + + + + + + + + + + + + + + + + 200 + 0 + + + + Valve Sensed State 10 + + + + + + + 255 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + cbM4Valve + cbP39Valve + cbP6Valve + cbP11Valve + cbP33Valve + cbP34Valve + cbP37Valve + cbM7Valve + cbP20Valve + cbP43Valve + sbValvesSensedState1 + sbValvesSensedState2 + sbValvesSensedState3 + sbValvesSensedState4 + sbValvesSensedState5 + sbValvesSensedState6 + sbValvesSensedState7 + sbValvesSensedState8 + sbValvesSensedState9 + sbValvesSensedState10 + tbSend + tbReset + + + + Index: FP_Valves/loader.py =================================================================== diff -u --- FP_Valves/loader.py (revision 0) +++ FP_Valves/loader.py (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,134 @@ +""" + The FP Valves ui loader +""" +# Python +import os + +# Qt +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Slot + +# parent +from engine.dynamicloader import DynamicLoader + +# fp Simulator +from leahi_dialin.ui.fp_messaging import FP_Messaging + + +class Loader(DynamicLoader): + """ + The FP Valves ui loader + """ + + def __init__(self): + self.fp_interface = FP_Messaging() + super().__init__(os.path.dirname(__file__)) + + + def _init_loader(self): + """ + finds and creates widgets + :return: none + """ + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + + self.cbM4Valve = self.find_widget(QtWidgets.QCheckBox , 'cbM4Valve' ) + self.cbP39Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP39Valve' ) + self.cbP6Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP6Valve' ) + self.cbP11Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP11Valve' ) + self.cbP33Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP33Valve' ) + self.cbP34Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP34Valve' ) + self.cbP37Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP37Valve' ) + self.cbM7Valve = self.find_widget(QtWidgets.QCheckBox , 'cbM7Valve' ) + self.cbP20Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP20Valve' ) + self.cbP43Valve = self.find_widget(QtWidgets.QCheckBox , 'cbP43Valve' ) + + self.sbValvesSensedState1 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState1' ) + self.sbValvesSensedState2 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState2' ) + self.sbValvesSensedState3 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState3' ) + self.sbValvesSensedState4 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState4' ) + self.sbValvesSensedState5 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState5' ) + self.sbValvesSensedState6 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState6' ) + self.sbValvesSensedState7 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState7' ) + self.sbValvesSensedState8 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState8' ) + self.sbValvesSensedState9 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState9' ) + self.sbValvesSensedState10 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState10' ) + + def _init_connections(self): + """ + initializes the widgets connections + :return: none + """ + self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_fp_valves) + + @Slot() + def _init_widgets(self): + """ + initializes the widgets' properties + :return: none + """ + self.cbM4Valve .setChecked(False) + self.cbP39Valve .setChecked(False) + self.cbP6Valve .setChecked(False) + self.cbP11Valve .setChecked(False) + self.cbP33Valve .setChecked(False) + self.cbP34Valve .setChecked(False) + self.cbP37Valve .setChecked(False) + self.cbM7Valve .setChecked(False) + self.cbP20Valve .setChecked(False) + self.cbP43Valve .setChecked(False) + self.sbValvesSensedState1 .setValue(0) + self.sbValvesSensedState2 .setValue(0) + self.sbValvesSensedState3 .setValue(0) + self.sbValvesSensedState4 .setValue(0) + self.sbValvesSensedState5 .setValue(0) + self.sbValvesSensedState6 .setValue(0) + self.sbValvesSensedState7 .setValue(0) + self.sbValvesSensedState8 .setValue(0) + self.sbValvesSensedState9 .setValue(0) + self.sbValvesSensedState10 .setValue(0) + + @Slot() + def do_fp_valves(self): + """ + the slot for fp valves change + :return: none + """ + M4_VALV = self.cbM4Valve .isChecked() + P39_VALV = self.cbP39Valve .isChecked() + P6_VALV = self.cbP6Valve .isChecked() + P11_VALV = self.cbP11Valve .isChecked() + P33_VALV = self.cbP33Valve .isChecked() + P34_VALV = self.cbP34Valve .isChecked() + P37_VALV = self.cbP37Valve .isChecked() + M7_VALV = self.cbM7Valve .isChecked() + P20_VALV = self.cbP20Valve .isChecked() + P43_VALV = self.cbP43Valve .isChecked() + valvesensedState = [ + self.sbValvesSensedState1 .value() , + self.sbValvesSensedState2 .value() , + self.sbValvesSensedState3 .value() , + self.sbValvesSensedState4 .value() , + self.sbValvesSensedState5 .value() , + self.sbValvesSensedState6 .value() , + self.sbValvesSensedState7 .value() , + self.sbValvesSensedState8 .value() , + self.sbValvesSensedState9 .value() , + self.sbValvesSensedState10 .value() + ] + + self.fp_interface.fp_valves( + M4_VALV , + P39_VALV , + P6_VALV , + P11_VALV , + P33_VALV , + P34_VALV , + P37_VALV , + M7_VALV , + P20_VALV , + P43_VALV , + valvesensedState + ) \ No newline at end of file Index: FP_Versions/interface.ui =================================================================== diff -u --- FP_Versions/interface.ui (revision 0) +++ FP_Versions/interface.ui (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,266 @@ + + + ui_interface + + + + 0 + 0 + 755 + 126 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + &Misc/&3 FP Versions + + + + + + + + + + + + + 0 + 0 + + + + + 220 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(92, 53, 102); + + + 90 : [0x5A00] : FP Versions + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + + + + + + + + 0 + + + + + 0 + + + + + 0 + + + + + + 250 + 0 + + + + false + + + background-color: rgb(114, 159, 207); +color: rgb(255, 255, 255); + + + Device Ver. + + + + + + + background-color: rgb(52, 101, 164); +color: rgb(255, 255, 255); + + + FPGA Ver. + + + + + + + + + + + + + + + + Lab + + + + + + + Micro + + + + + + + Minor + + + + + + + ID + + + + + + + + + + + + + Minor + + + + + + + Build + + + + + + + + + + + + + + + + Major + + + + + + + + + + Comp. + + + + + + + + + + Major + + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + deviceMajorspinBox + deviceMinorspinBox + deviceMicrospinBox + deviceBuildspinBox + deviceCompatibilityspinBox + FPGAIDspinBox + FPGAMajorspinBox + FPGAMinorspinBox + FPGALabspinBox + tbSend + tbReset + + + + Index: FP_Versions/loader.py =================================================================== diff -u --- FP_Versions/loader.py (revision 0) +++ FP_Versions/loader.py (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) @@ -0,0 +1,94 @@ +""" + The FP Versions ui loader +""" +# Python +import os + +# Qt +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Slot + +# parent +from engine.dynamicloader import DynamicLoader + +# dd Simulator +from leahi_dialin.ui.fp_messaging import FP_Messaging + + +class Loader(DynamicLoader): + """ + The TD Versions ui loader + """ + + def __init__(self): + self.FP_interface = FP_Messaging() + super().__init__(os.path.dirname(__file__)) + + + def _init_loader(self): + """ + finds and creates widgets + :return: none + """ + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + + self.dmajor = self.find_widget(QtWidgets.QSpinBox , 'deviceMajorspinBox' ) + self.dminor = self.find_widget(QtWidgets.QSpinBox , 'deviceMinorspinBox' ) + self.dmicro = self.find_widget(QtWidgets.QSpinBox , 'deviceMicrospinBox' ) + self.dbuild = self.find_widget(QtWidgets.QSpinBox , 'deviceBuildspinBox' ) + self.comp = self.find_widget(QtWidgets.QSpinBox , 'deviceCompatibilityspinBox' ) + self.fpga_id = self.find_widget(QtWidgets.QSpinBox , 'FPGAIDspinBox' ) + self.fpga_major = self.find_widget(QtWidgets.QSpinBox , 'FPGAMajorspinBox' ) + self.fpga_minor = self.find_widget(QtWidgets.QSpinBox , 'FPGAMinorspinBox' ) + self.fpga_lab = self.find_widget(QtWidgets.QSpinBox , 'FPGALabspinBox' ) + def _init_connections(self): + """ + initializes the widgets connections + :return: none + """ + self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_version_data) + + @Slot() + def _init_widgets(self): + """ + initializes the widgets' properties + :return: none + """ + self.dmajor.setValue(0) + self.dminor.setValue(0) + self.dmicro.setValue(0) + self.dbuild.setValue(0) + self.comp.setValue(0) + self.fpga_id.setValue(0) + self.fpga_major.setValue(0) + self.fpga_minor.setValue(0) + self.fpga_lab.setValue(0) + + @Slot() + def do_version_data(self): + """ + the slot for Version data change + :return: none + """ + major = self.dmajor .value() + minor = self.dminor .value() + micro = self.dmicro .value() + build = self.dbuild .value() + fpga_id = self.fpga_id .value() + fpga_major = self.fpga_major .value() + fpga_minor = self.fpga_minor .value() + fpga_lab = self.fpga_lab .value() + compatibility_rev = self.comp .value() + self.FP_interface.fp_versions( + major, + minor, + micro, + build, + fpga_id, + fpga_major, + fpga_minor, + fpga_lab, + compatibility_rev + ) \ No newline at end of file