HXKJ
/
PROFIBUS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: HXKJ:13db8caf4659d7dbc372fc966c54c30a05eb93f0
Branches Tags
HXKJ:main
HXKJ:2024/02/05
..
compare: HXKJ:15b3fd2e99887b0d558a38df59cb8f54a70a2aad
Branches Tags
HXKJ:main
HXKJ:2024/02/05

No commits in common. '13db8caf4659d7dbc372fc966c54c30a05eb93f0' and '15b3fd2e99887b0d558a38df59cb8f54a70a2aad' have entirely different histories.
13db8caf46 ... 15b3fd2e99

3 changed files with 9 additions and 59 deletions
Show Stats

32
Static/Main.qss
Unescape Escape View File

@ -474,38 +474,6 @@ QWidget#deviceWidget{
} }
QWidget#scroWidget{
background-color: white;
hight: 25px;
}
QScrollArea#scroArea{
border: none;
}
QScrollBar#scroBar{
background: white;
height: 5px;
}
QScrollBar#scroBar::handle{
background: gray;
height: 5px;
}

26
UI/BlockParameterManageWidget.py
Unescape Escape View File

@ -3,7 +3,7 @@ import qtawesome
from PyQt5.QtGui import QPixmap, QPainter, QIcon from PyQt5.QtGui import QPixmap, QPainter, QIcon
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QStyledItemDelegate, QStyle, QComboBox, QMessageBox, QPushButton,QStackedWidget, QLineEdit \ from PyQt5.QtWidgets import QStyledItemDelegate, QStyle, QComboBox, QMessageBox, QPushButton,QStackedWidget, QLineEdit \
, QVBoxLayout, QHBoxLayout, QWidget, QLabel, QSplitter, QScrollArea, QButtonGroup, QDialog, QRadioButton , QVBoxLayout, QHBoxLayout, QWidget, QLabel, QSplitter, QButtonGroup, QDialog, QRadioButton
from utils.DBModels.DeviceParModels import * from utils.DBModels.DeviceParModels import *
from UI.BlockParameterView import ParmView from UI.BlockParameterView import ParmView
from UI.SearchAddressWidget import SearchAddressWidget from UI.SearchAddressWidget import SearchAddressWidget
@ -85,14 +85,11 @@ class DynamicAddBlock(QHBoxLayout):
self.initUI() self.initUI()
def initUI(self): def initUI(self):
self.setContentsMargins(0, 0, 0, 0)
pbNumber = self.blocklist[0] pbNumber = self.blocklist[0]
tbNumber = self.blocklist[1] tbNumber = self.blocklist[1]
fbNumber = self.blocklist[2] fbNumber = self.blocklist[2]
for i in range(pbNumber): for i in range(pbNumber):
pblockBtn = QPushButton('物理块') pblockBtn = QPushButton('物理块')
@ -276,11 +273,6 @@ class BlockParameterManageWidget(QWidget):
self.settingLayout.addWidget(self.refershDataBtn, 1) self.settingLayout.addWidget(self.refershDataBtn, 1)
# self.settingLayout.addLayout(self.blockLayout) # self.settingLayout.addLayout(self.blockLayout)
# self.settingLayout.setSpacing(5) # self.settingLayout.setSpacing(5)
self.scroArea = QScrollArea()
self.scroArea.setObjectName('scroArea')
self.scroArea.horizontalScrollBar().setObjectName('scroBar')
self.splitter = QSplitter() self.splitter = QSplitter()
self.settingLayout.addWidget(self.splitter, 18) self.settingLayout.addWidget(self.splitter, 18)
@ -328,12 +320,8 @@ class BlockParameterManageWidget(QWidget):
Globals.setValue('blockManage', self.blockManage) Globals.setValue('blockManage', self.blockManage)
blocklist = self.blockManage.getBlockNums() blocklist = self.blockManage.getBlockNums()
self.blockLayout = DynamicAddBlock(blocklist, self.blockManage.TBTypeList) self.blockLayout = DynamicAddBlock(blocklist, self.blockManage.TBTypeList)
self.scroWidget = QWidget() self.settingLayout.addLayout(self.blockLayout, 7)
self.scroWidget.setObjectName('scroWidget') self.settingLayout.addWidget(self.splitter, 11)
self.scroWidget.setLayout(self.blockLayout)
self.scroArea.setWidget(self.scroWidget)
self.settingLayout.addWidget(self.scroArea, 18)
# self.settingLayout.addWidget(self.splitter, 11)
self.mainlayout.addWidget(self.blockLayout.parameStackWidget, 20) self.mainlayout.addWidget(self.blockLayout.parameStackWidget, 20)
self.initUIstat = False self.initUIstat = False
self.recordAddress = address #记录链接成功的站地址 self.recordAddress = address #记录链接成功的站地址
@ -357,15 +345,12 @@ class BlockParameterManageWidget(QWidget):
self.blockLayout.deleteLater() self.blockLayout.deleteLater()
self.splitter.deleteLater() self.splitter.deleteLater()
self.splitter = QSplitter() self.splitter = QSplitter()
# self.scroArea.deleteLater()
blocklist = self.blockManage.getBlockNums() blocklist = self.blockManage.getBlockNums()
TbtypeList = self.blockManage.TBTypeList TbtypeList = self.blockManage.TBTypeList
self.blockLayout = DynamicAddBlock(blocklist, TbtypeList) self.blockLayout = DynamicAddBlock(blocklist, TbtypeList)
self.scroWidget.setObjectName('scroWidget') self.settingLayout.addLayout(self.blockLayout, 7)
self.scroWidget.setLayout(self.blockLayout) self.settingLayout.addWidget(self.splitter, 11)
self.scroArea.setWidget(self.scroWidget)
self.settingLayout.addWidget(self.scroArea, 18)
self.mainlayout.addWidget(self.blockLayout.parameStackWidget, 20) self.mainlayout.addWidget(self.blockLayout.parameStackWidget, 20)
self.recordAddress = address #记录链接成功的站地址 self.recordAddress = address #记录链接成功的站地址
else: else:
@ -422,7 +407,6 @@ class BlockParameterManageWidget(QWidget):
self.blockLayout.deleteLater() self.blockLayout.deleteLater()
self.splitter.deleteLater() self.splitter.deleteLater()
self.splitter = QSplitter() self.splitter = QSplitter()
self.scroArea.deleteLater()
self.widget = ShowImage('Static/pict.png') self.widget = ShowImage('Static/pict.png')
self.mainlayout.addWidget(self.widget, 20) self.mainlayout.addWidget(self.widget, 20)
self.settingLayout.addWidget(self.splitter,18) self.settingLayout.addWidget(self.splitter,18)

10
model/ProjectModel/BlockManage.py
Unescape Escape View File

@ -53,7 +53,7 @@ class BlockManage():
# return cls._instance # return cls._instance
def __init__(self, _isPa, address = None): def __init__(self, _isPa, address = None):
# print(_isPa) print(_isPa)
self._isPa = _isPa self._isPa = _isPa
self.address = address self.address = address
self.TBTypeList = [] self.TBTypeList = []
@ -74,7 +74,7 @@ class BlockManage():
def initBlocks(self): def initBlocks(self):
# print(self._isPa,5555) # print(self._isPa,5555)
if not self.DPV1Master.judgeSlave(self.address): if not self.DPV1Master.judgeSlave(self.address):
# print(self.address) print(self.address)
raise RuntimeError(f"连接从站{self.address}失败.") raise RuntimeError(f"连接从站{self.address}失败.")
self.blockDict = { self.blockDict = {
BlockType.PB : [], BlockType.PB : [],
@ -111,17 +111,16 @@ class BlockManage():
else: else:
dirMesDic[blockIndex] = blockNums dirMesDic[blockIndex] = blockNums
# print(dirMesDic) # print(dirMesDic)
# entryTuples = [] entryTuples = []
for key, value in dirMesDic.items(): for key, value in dirMesDic.items():
# print(key, value) # print(key, value)
if key == 1: if key == 1:
data = self.DPV1Master.readParm(address = self.address, slot = 1, index = 1, length = dirLength + 4 * value) data = self.DPV1Master.readParm(address = self.address, slot = 1, index = key, length = dirLength + 4 * value)
else: else:
data = self.DPV1Master.readParm(address = self.address, slot = 1, index = key, length = 4 * value) data = self.DPV1Master.readParm(address = self.address, slot = 1, index = key, length = 4 * value)
# print(data, int(len(data)/2)) # print(data, int(len(data)/2))
# print(data) # print(data)
data = struct.unpack('>{}h'.format(int(len(data)/2)), data) data = struct.unpack('>{}h'.format(int(len(data)/2)), data)
# print(data)
tuples = [(data[i], data[i+1]) for i in range(0, len(data), 2)] tuples = [(data[i], data[i+1]) for i in range(0, len(data), 2)]
entryTuples += tuples entryTuples += tuples
# print(entryTuples) # print(entryTuples)
@ -131,7 +130,6 @@ class BlockManage():
blkDirMesByte = struct.pack('>h', entryTuples[typeIndex][0]) blkDirMesByte = struct.pack('>h', entryTuples[typeIndex][0])
blkIndex = int(blkDirMesByte[0]) # 目录对象编号 blkIndex = int(blkDirMesByte[0]) # 目录对象编号
blkoffect = int(blkDirMesByte[1]) # 块从第几个Dir_Entry开始 blkoffect = int(blkDirMesByte[1]) # 块从第几个Dir_Entry开始
# print(blkoffect)
numBlk = entryTuples[typeIndex][1] # 块数量 numBlk = entryTuples[typeIndex][1] # 块数量
# print(blkIndex, blkoffect, numBlk) # print(blkIndex, blkoffect, numBlk)
for i in range(numBlk): for i in range(numBlk):

Write Preview
Loading…
Cancel
Save