Index: DD_Temperature/loader.py =================================================================== diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a --- DD_Temperature/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f) +++ DD_Temperature/loader.py (.../loader.py) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a) @@ -33,21 +33,29 @@ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.dsbD1InletheatExchanger = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD1InletheatExchanger' ) - self.dsbX6OutletHeatExchanger = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX6OutletHeatExchanger' ) - self.dsbD4Hydraulics = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4Hydraulics' ) - self.dsbD50Trimmerheater = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50Trimmerheater' ) - self.dsbBoard = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBoard' ) - self.dsbBarometric = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBarometric' ) - self.dsbD16 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD16' ) - self.dsbD28 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28' ) - self.dsbD30 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30' ) - self.dsbD44 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD44' ) - self.dsbD75 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD75' ) - self.dsbD4MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4MovingAverage' ) - self.dsbD50MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50MovingAverage' ) - self.dsbD28MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28MovingAverage' ) - self.dsbD30MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30MovingAverage' ) + self.dsbD1Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD1Temperature' ) + self.dsbD78Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD78Temperature' ) + self.dsbD4Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4Temperature' ) + self.dsbD50Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50Temperature' ) + self.dsbD99Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD99Temperature' ) + self.dsbBoardTemperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBoardTemperature' ) + self.dsbD16Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD16Conductivity' ) + self.dsbD28Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28Conductivity' ) + self.dsbD30Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30Conductivity' ) + self.dsbD44Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD44Conductivity' ) + self.dsbD75Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD75Conductivity' ) + self.dsbD4MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4MovingAverage' ) + self.dsbD50MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50MovingAverage' ) + self.dsbD99MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD99MovingAverage' ) + self.dsbD28MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28MovingAverage' ) + self.dsbD30MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30MovingAverage' ) + self.dsbD78MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD78MovingAverage' ) + self.dsbD9PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD9PressureAverage' ) + self.dsbD66PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD66PressureAverage' ) + self.dsbD51PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD51PressureAverage' ) + self.dsbD18PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD18PressureAverage' ) + self.dsbD41PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD41PressureAverage' ) + self.dsbD87PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD87PressureAverage' ) def _init_connections(self): """ @@ -63,59 +71,59 @@ initializes the widgets' properties :return: none """ - self.dsbD1InletheatExchanger .setValue(0) - self.dsbX6OutletHeatExchanger .setValue(0) - self.dsbD4Hydraulics .setValue(0) - self.dsbD50Trimmerheater .setValue(0) - self.dsbBoard .setValue(0) - self.dsbBarometric .setValue(0) - self.dsbD16 .setValue(0) - self.dsbD28 .setValue(0) - self.dsbD30 .setValue(0) - self.dsbD44 .setValue(0) - self.dsbD75 .setValue(0) - self.dsbD4MovingAverage .setValue(0) - self.dsbD50MovingAverage .setValue(0) - self.dsbD28MovingAverage .setValue(0) - self.dsbD30MovingAverage .setValue(0) + self.dsbD1Temperature .setValue(0) + self.dsbD78Temperature .setValue(0) + self.dsbD4Temperature .setValue(0) + self.dsbD50Temperature .setValue(0) + self.dsbD99Temperature .setValue(0) + self.dsbBoardTemperature .setValue(0) + self.dsbD16Conductivity .setValue(0) + self.dsbD28Conductivity .setValue(0) + self.dsbD30Conductivity .setValue(0) + self.dsbD44Conductivity .setValue(0) + self.dsbD75Conductivity .setValue(0) + self.dsbD4MovingAverage .setValue(0) + self.dsbD50MovingAverage .setValue(0) + self.dsbD99MovingAverage .setValue(0) + self.dsbD28MovingAverage .setValue(0) + self.dsbD30MovingAverage .setValue(0) + self.dsbD78MovingAverage .setValue(0) + self.dsbD9PressureAverage .setValue(0) + self.dsbD66PressureAverage .setValue(0) + self.dsbD51PressureAverage .setValue(0) + self.dsbD18PressureAverage .setValue(0) + self.dsbD41PressureAverage .setValue(0) + self.dsbD87PressureAverage .setValue(0) @Slot() def do_dd_temperature(self): """ the slot for dd temperature change :return: none """ - - d1Temp = self.dsbD1InletheatExchanger .value() - x6Temp = self.dsbX6OutletHeatExchanger .value() - d4Temp = self.dsbD4Hydraulics .value() - d50Temp = self.dsbD50Trimmerheater .value() - boardTemp = self.dsbBoard .value() - baroTemp = self.dsbBarometric .value() - d16CondTemp = self.dsbD16 .value() - d28CondTemp = self.dsbD28 .value() - d30CondTemp = self.dsbD30 .value() - d44CondTemp = self.dsbD44 .value() - d75CondTemp = self.dsbD75 .value() - d4AvgTemp = self.dsbD4MovingAverage .value() - d50AvgTemp = self.dsbD50MovingAverage .value() - d28AvgTemp = self.dsbD28MovingAverage .value() - d30AvgTemp = self.dsbD30MovingAverage .value() self.dd_interface.dd_temperature( - d1Temp , - x6Temp , - d4Temp , - d50Temp , - boardTemp , - baroTemp , - d16CondTemp , - d28CondTemp , - d30CondTemp , - d44CondTemp , - d75CondTemp , - d4AvgTemp , - d50AvgTemp , - d28AvgTemp , - d30AvgTemp + self.dsbD1Temperature .value(), + self.dsbD78Temperature .value(), + self.dsbD4Temperature .value(), + self.dsbD50Temperature .value(), + self.dsbD99Temperature .value(), + self.dsbBoardTemperature .value(), + self.dsbD16Conductivity .value(), + self.dsbD28Conductivity .value(), + self.dsbD30Conductivity .value(), + self.dsbD44Conductivity .value(), + self.dsbD75Conductivity .value(), + self.dsbD4MovingAverage .value(), + self.dsbD50MovingAverage .value(), + self.dsbD99MovingAverage .value(), + self.dsbD28MovingAverage .value(), + self.dsbD30MovingAverage .value(), + self.dsbD78MovingAverage .value(), + self.dsbD9PressureAverage .value(), + self.dsbD66PressureAverage.value(), + self.dsbD51PressureAverage.value(), + self.dsbD18PressureAverage.value(), + self.dsbD41PressureAverage.value(), + self.dsbD87PressureAverage.value() ) \ No newline at end of file