0616更新

ModbusPack
zhangxuxutm 2 years ago
parent 041e3258ae
commit f3083044fa

@ -1 +1 @@
gYuFx9QNxg-GxPhpM9hzfS7z5z2jXG9QeQkqMZAGI1UofTf4oA_hmM7bWvTtxjKf3Lbjy1ZWiXjweryfjdOzWA== jtTFa-rtobjdxWm7fKS7Tk2gZECrXwdM59799SddTcqDWDGiQTPEFYy5VW6IHgsAK5RZMtMLWmpZA3PaipOkmg==

@ -637,9 +637,9 @@ QComboBox#setBox{
color: #889399; color: #889399;
font-family: ".SFNSDisplay-Regular"; font-family: "SFNSDisplay-Regular";
font-size: 15px; font-size: 28px;
font-weight: 520; font-weight: 520;
@ -787,6 +787,7 @@ QComboBox#timeBox QAbstractItemView::item:hover{
} }
QTextEdit#mesEdit{ QTextEdit#mesEdit{
border: 2px solid #dddddd; border: 2px solid #dddddd;
border-radius: 8px; border-radius: 8px;

@ -198,7 +198,7 @@ class RTUSettingWidget(QWidget):
self.baudrateEdit.setText(baudrate) self.baudrateEdit.setText(baudrate)
self.stopbitsBox.setCurrentText(stopbits) self.stopbitsBox.setCurrentText(stopbits)
self.freEdit.setText(frequency) self.freEdit.setText(frequency)
self.offsetBox.setCurrentText(offset)
self.parityBox.setCurrentText(parity) self.parityBox.setCurrentText(parity)
def saveSetting(self): def saveSetting(self):

@ -138,6 +138,7 @@ class TCPSettingWidget(QWidget):
self.ipEdit.setText(host) self.ipEdit.setText(host)
self.portEdit.setText(port) self.portEdit.setText(port)
self.freEdit.setText(frequency) self.freEdit.setText(frequency)
self.offsetBox.setCurrentText(offset)
def saveSetting(self): def saveSetting(self):

@ -190,7 +190,7 @@ class TrendWidgets(QWidget):
if self.timeBox.findText(time) == -1: if self.timeBox.findText(time) == -1:
self.timeBox.addItem(time) self.timeBox.addItem(time)
self.memLsit.append(x.mem) self.memLsit.append(x.mem)
self.historyDB = HistoryDBManage(bucket = self.proName) self.historyDB = HistoryDBManage(bucket = self.proName, isCelery = False)
# self.refreshList(self.timeBox.currentIndex()) # self.refreshList(self.timeBox.currentIndex())
def refreshList(self, index): def refreshList(self, index):

@ -18,13 +18,12 @@ def parseDate(date_string: str):
class HistoryDBManage(): class HistoryDBManage():
token = 'jtTFa-rtobjdxWm7fKS7Tk2gZECrXwdM59799SddTcqDWDGiQTPEFYy5VW6IHgsAK5RZMtMLWmpZA3PaipOkmg=='
org = "DCS" org = "DCS"
# bucket = "history" # bucket = "history"
url = "http://localhost:6324" url = "http://localhost:6324"
def __init__(self, bucket, mem = None): def __init__(self, bucket, mem = None, isCelery = True):
self.getToken(isCelery)
self.client = InfluxDBClient(url = self.url, token = self.token, org = self.org) self.client = InfluxDBClient(url = self.url, token = self.token, org = self.org)
self.writeApi = self.client.write_api(write_options = SYNCHRONOUS) self.writeApi = self.client.write_api(write_options = SYNCHRONOUS)
self.deleteApi = self.client.delete_api() self.deleteApi = self.client.delete_api()
@ -40,6 +39,15 @@ class HistoryDBManage():
def __del__(self): def __del__(self):
self.client.close() self.client.close()
def getToken(self, isCelery):
if not isCelery:
with open('Static/InfluxDB.api', 'r', encoding='utf-8') as f:
self.token = f.read()
else:
with open('../../../Static/InfluxDB.api', 'r', encoding='utf-8') as f:
self.token = f.read()
def writeFun(self, varName, value): def writeFun(self, varName, value):
try: try:

@ -256,7 +256,7 @@ class ProjectManage(object):
curTime = float("{:.5f}".format(curTime)) curTime = float("{:.5f}".format(curTime))
cursor.execute('insert into InfluxMem (mem) values ({})'.format(str(curTime))) cursor.execute('insert into InfluxMem (mem) values ({})'.format(str(curTime)))
historyDB = HistoryDBManage(mem = curTime, bucket = projectName) historyDB = HistoryDBManage(mem = curTime, bucket = projectName, isCelery = False)
return historyDB return historyDB
@classmethod @classmethod

@ -0,0 +1 @@
nuitka --standalone --mingw64 --show-memory --show-progress --nofollow-import-to=numpy,pandas,celery,peewee,PIL,cffi,pycparser,pyserial,pywin32,modbus_tk,matplotlib,redis,pyecharts --enable-plugin=pyqt5,numpy,eventlet,gevent,multiprocessing --include-package=model,project,protocol,UI,utils,windoweffect,redis,pythonnet,uuid,logging,openpyxl,matplotlib,importlib,prettytable --output-dir=o bin.py

@ -1,3 +1,5 @@
from pythonnet import load
load('coreclr')
import clr # 与其他模块不同此处不直接导入pythonnet 而是导入clrpython与c#交互核心) import clr # 与其他模块不同此处不直接导入pythonnet 而是导入clrpython与c#交互核心)
dll_path = 'protocol\\FF\\NationalInstruments.Fieldbus' # 为了方便理解这里给到dll所在的绝对路径且包含dll文件本身 dll_path = 'protocol\\FF\\NationalInstruments.Fieldbus' # 为了方便理解这里给到dll所在的绝对路径且包含dll文件本身
clr.AddReference(dll_path) #加载c#库 clr.AddReference(dll_path) #加载c#库

Loading…
Cancel
Save