HXKJ
/
DCS_V1.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0617

Browse Source
main
ZHANGXUXU\95193 4 months ago
parent 55eb458d5b
commit 4e2dc90d94
6 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File

14
UI/UserManage/UserWidget.py
Unescape Escape View File

@ -1,21 +1,15 @@
from PyQt5 import QtCore, QtGui, QtWidgets
from PyQt5 import QtCore, QtWidgets
from PyQt5.QtCore import QSize, Qt
from PyQt5.Qt import *
from PyQt5.QtGui import QPixmap, QIcon
from PyQt5.QtWidgets import QHBoxLayout, QAbstractItemView, QTableView, QVBoxLayout, QSplitter, \
QApplication, QGroupBox, QLabel, QGridLayout, QLineEdit, QComboBox, QTextEdit, QCheckBox,QVBoxLayout,QListView, QMainWindow
from PyQt5.QtWidgets import QListWidget, QStackedWidget, QFrame
from PyQt5.QtWidgets import QListWidgetItem, QSizePolicy
from PyQt5.QtWidgets import QWidget, QSpacerItem, QHeaderView
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QSplitter
from .UserTable import UserTableView
from utils.DBModels.UserModels import User
from .UserModel import UserTableModel
from utils import Globals
from model.UserModel.UserManage import UserManage
from Static import static
class UserWidgets(QtWidgets.QWidget):
def __init__(self, parent=None):

19
UI/VarManages/ModbusModel.py
Unescape Escape View File

@ -1,13 +1,13 @@
from ast import mod
import typing
import sys
from matplotlib.widgets import EllipseSelector
from numpy import var
import qtawesome
from PyQt5 import QtGui,QtCore,QtWidgets
from PyQt5.QtCore import QAbstractTableModel, QModelIndex, Qt, QVariant, QSize
from PyQt5.QtWidgets import QItemDelegate, QHBoxLayout, QWidget, QTableView, QMessageBox, QComboBox, QStyleOptionViewItem
from PyQt5.QtWidgets import QItemDelegate, QHBoxLayout, QWidget, QMessageBox, QComboBox, QStyleOptionViewItem
from sympy import N
from protocol.Celery.MBTCPMaster import app as MBTCPMApp
@ -381,13 +381,16 @@ class VarButtonDelegate(QItemDelegate):
sender.oldName = model.datas[sender.index[0]][3]
model.editableList.append(sender.index[0])
fucationCheckbox.setEnabled(True)
self.parent().viewport().update()
else:
varMes = model.datas[sender.index[0]]
name, des, varType, slaveID, address, min, max, order = str(varMes[3]), str(varMes[4]), str(varMes[5]), str(varMes[6]), str(varMes[7]), str(varMes[8]), str(varMes[9]), str(varMes[-1])
# print(name, des, varType, slaveID, address, min, max, order)
if not name or not varType:
if varType == '':
varType = '0'
if not name:
reply = QMessageBox.question(self.parent(),
'警告',
"有字段为空或输入错误",
@ -395,7 +398,7 @@ class VarButtonDelegate(QItemDelegate):
return
if sender.oldName and Globals()[modbusType + 'Var'].getByName(sender.oldName):
if sender.oldName and ModbusVarManage.getByName(sender.oldName, modbusType):
if sender.oldName == name or [varMes[3] for varMes in model.datas].count(name) < 2:
ModbusVarManage.editVar(name = sender.oldName, Nname = name, des = des,
varType = varType, slaveID = slaveID, address = address,
@ -422,13 +425,15 @@ class VarButtonDelegate(QItemDelegate):
sender.isEdit = True
fucationCheckbox.setEnabled(False)
model.editableList.remove(sender.index[0])
self.parent().viewport().update()
def delete_action(self):
sender = self.sender()
model = self.parent().model
name = str(model.datas[sender.index[0]][3])
ModbusVarManage.deleteVar(name = name)
modbusType = self.parent().modbusType
ModbusVarManage.deleteVar(name = name, modbusType = modbusType)
model.remove_row(sender.index[0])
def trend_action(self):

26
UI/VarManages/VarTable.py
Unescape Escape View File

@ -1,14 +1,10 @@
import typing
import qtawesome
from PyQt5 import QtGui,QtCore,QtWidgets
from PyQt5.QtCore import QAbstractTableModel, QModelIndex, Qt, QVariant, QSize
import sys
from PyQt5.QtWidgets import (QApplication, QHeaderView, QStyle, QStyleOptionButton, QTableView, QAbstractItemView)
from PyQt5.QtCore import (pyqtSignal, Qt, QAbstractTableModel, QModelIndex, QRect, QVariant)
from PyQt5 import QtCore
from PyQt5.QtWidgets import (QHeaderView, QStyle, QStyleOptionButton, QTableView, QAbstractItemView)
from PyQt5.QtCore import (pyqtSignal, Qt, QRect)
from PyQt5.QtWidgets import QItemDelegate, QHBoxLayout, QWidget, QTableView
from PyQt5.QtWidgets import QTableView
from .ModbusModel import *
from .AnalogModel import *
@ -18,7 +14,7 @@ from .TCRTDModel import *
from UI.VarManages.Thread import RTDTCThread, AnalogThread, FFSimulateThread, HartSimulateThread
from UI.VarManages.Thread import RTDTCThread, AnalogThread, HartSimulateThread
from utils import Globals
@ -141,18 +137,6 @@ class AnalogTableView(VarTableView):
self.setItemDelegateForColumn(8, AnalogButtonDelegate(self))
self.model = AnalogModel(['ID', '强制值', '当前值', '变量名', '变量描述', '变量类型', '工程量下限', '工程量上限', '操作'], [], table=self)
class FFSimulateTableView(VarTableView):
def __init__(self, parent=None):
super(FFSimulateTableView, self).__init__(parent)
self.valueList = []
# self.realList = [0] * 8 + [0] * 8 + [0] * 8
self.workThread = FFSimulateThread(self)
Globals.setValue('FFSimulateThread', self.workThread)
# print(self.workThread)
def setHeader(self):
self.setItemDelegateForColumn(6, FFSimulateButtonDelegate(self))
self.model = FFSimulateModel(['ID', '强制值', '当前值', '变量名', '变量描述', '变量类型', '操作'], [], table=self)
class HartSimulateTableView(VarTableView):
def __init__(self, parent=None):

2
UI/VarManages/VarWidget.py
Unescape Escape View File

@ -3,7 +3,7 @@ from PyQt5.QtCore import QSize, Qt, QTimer
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QSplitter, QPushButton, QFileDialog, QMessageBox
from UI.VarManages.VarTable import VarTableView, HartTableView, TcRtdTableView, AnalogTableView, FFSimulateTableView, \
from UI.VarManages.VarTable import VarTableView, HartTableView, TcRtdTableView, AnalogTableView, \
HartSimulateTableView
from UI.VarManages.MessageWidget import MessageWidget

1
model/ProjectModel/VarManage.py
Unescape Escape View File

@ -1,6 +1,5 @@
import openpyxl
from pytz import NonExistentTimeError
from utils.DBModels.ProtocolModel import ModbusTcpMasterVar, ModbusRtuMasterVar, ModbusRtuSlaveVar,\
ModbusTcpSlaveVar, HartVar, TcRtdVar, AnalogVar, FFSimulateVar, HartSimulateVar

1
utils/DBModels/ProtocolModel.py
Unescape Escape View File

@ -1,5 +1,4 @@
import sys
import os
import datetime
from peewee import *

Write Preview
Loading…
Cancel
Save