|
|
|
@ -18,6 +18,7 @@ from model.ProjectModel.DeviceManage import DevicesManange
|
|
|
|
|
from utils.DBModels.InitParameterDB import InitParameterDB
|
|
|
|
|
|
|
|
|
|
from protocol.BatterySerial.BatteryProtocol import BatteryManange
|
|
|
|
|
from protocol.ModBus.DPV1Master import DPV1Master
|
|
|
|
|
from UI.BlockParameterManageWidget import BlockParameterManageWidget
|
|
|
|
|
|
|
|
|
|
import sys
|
|
|
|
@ -75,6 +76,7 @@ class MainWindow(QWidget):
|
|
|
|
|
self.setObjectName("MainWindow")
|
|
|
|
|
self.devicesManange = DevicesManange()
|
|
|
|
|
self.batteryManange = BatteryManange()
|
|
|
|
|
self.dpv1Master = DPV1Master('192.168.3.10', 502)
|
|
|
|
|
self.blockParameterManageWidget = BlockParameterManageWidget()
|
|
|
|
|
self.process = None
|
|
|
|
|
self.initUI()
|
|
|
|
@ -87,6 +89,10 @@ class MainWindow(QWidget):
|
|
|
|
|
self.batteryTimer.timeout.connect(self.refreshProgressBar)
|
|
|
|
|
self.batteryTimer.start(3000)
|
|
|
|
|
|
|
|
|
|
self.searchAddressTimer = QTimer()
|
|
|
|
|
self.searchAddressTimer.timeout.connect(self.searchSlave)
|
|
|
|
|
self.searchAddressTimer.start(1000)
|
|
|
|
|
|
|
|
|
|
# self.toolbarWidget = QWidget()
|
|
|
|
|
# self.addToolBar(Qt.LeftToolBarArea, self.toolbar)
|
|
|
|
|
|
|
|
|
@ -115,6 +121,9 @@ class MainWindow(QWidget):
|
|
|
|
|
self.deviceParameterManageBtn.setCheckable(True)
|
|
|
|
|
self.deviceParameterManageBtn.clicked.connect(self.switchDeviceParManageWidget)
|
|
|
|
|
|
|
|
|
|
self.addressLabel = QLabel('在线仪表地址:')
|
|
|
|
|
self.addressLabel.setObjectName('batteryLabel')
|
|
|
|
|
|
|
|
|
|
self.batteryProBar = CustomProgressBar()
|
|
|
|
|
self.batteryProBar.setRange(0, 100)
|
|
|
|
|
|
|
|
|
@ -154,7 +163,9 @@ class MainWindow(QWidget):
|
|
|
|
|
toolbarLayout.addWidget(self.switchBtn, 1)
|
|
|
|
|
toolbarLayout.addWidget(self.switchTouchBtn, 1)
|
|
|
|
|
toolbarLayout.addWidget(self.deviceParameterManageBtn, 1)
|
|
|
|
|
toolbarLayout.addWidget(QWidget(), 20)
|
|
|
|
|
toolbarLayout.addWidget(QWidget(), 4)
|
|
|
|
|
toolbarLayout.addWidget(self.addressLabel, 1)
|
|
|
|
|
toolbarLayout.addWidget(QWidget(), 10)
|
|
|
|
|
# toolbarLayout.addWidget(QLabel('电量:'), 1)
|
|
|
|
|
toolbarLayout.addWidget(self.batteryProBar, 1)
|
|
|
|
|
toolbarLayout.addWidget(self.batteryStateLabel, 1)
|
|
|
|
@ -265,10 +276,14 @@ class MainWindow(QWidget):
|
|
|
|
|
# self.capacity = capacity # mAH
|
|
|
|
|
# self.cappercent = cappercent # 百分比%
|
|
|
|
|
# self.state = state # 充放电状态
|
|
|
|
|
pass
|
|
|
|
|
# result = self.batteryManange.readBatteryInfo()
|
|
|
|
|
# self.batteryProBar.setValue(result.cappercent)
|
|
|
|
|
# self.batteryStateLabel.setText(result.chargingStatus)
|
|
|
|
|
# pass
|
|
|
|
|
result = self.batteryManange.readBatteryInfo()
|
|
|
|
|
self.batteryProBar.setValue(result.cappercent)
|
|
|
|
|
self.batteryStateLabel.setText(result.chargingStatus)
|
|
|
|
|
|
|
|
|
|
def searchSlave(self):
|
|
|
|
|
address = self.dpv1Master.searchSlave()
|
|
|
|
|
self.addressLabel.setText('在线仪表地址:{}'.format(address))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|