0703更新

Static/InfluxDB.api

@@ -1 +1 @@
-jtTFa-rtobjdxWm7fKS7Tk2gZECrXwdM59799SddTcqDWDGiQTPEFYy5VW6IHgsAK5RZMtMLWmpZA3PaipOkmg==
+NsJwF-xrmRwm_zyJjd7nDVPd5tsflJQMMaAOfFejufwIwmXxfFs1bp6UKPAmSEfcAAp-gUtnZQamrggGSulvTA==

Static/influxDB/config.yaml

@@ -1,4 +1,4 @@
-engine-path: "C:\\Users\\zcw\\Desktop\\DCS\\Static\\influxDB\\engine"
+engine-path: "engine"
-http-bind-address: ":6324"
+http-bind-address: ":8086"
 storage-cache-max-memory-size: 268435456
-bolt-path: "C:\\Users\\zcw\\Desktop\\DCS\\Static\\influxDB\\engine\\influxd.bolt"
+bolt-path: "engine\\influxd.bolt"

UI/Main/Main.py

@@ -20,7 +20,7 @@ from PyQt5.QtWinExtras import QtWin
 from win32 import win32api, win32gui
 from win32.lib import win32con
 
-from UI.VarManages.FFWidget import FFWidget
+# from UI.VarManages.FFWidget import FFWidget
 
 from windoweffect import WindowEffect, MINMAXINFO, NCCALCSIZE_PARAMS
 
@@ -29,8 +29,9 @@ from UI.Main.MainTop import MainTop
 
 
 from ..ProjectManages.ProjectWidget import ProjectWidgets
-from ..VarManages.VarWidget import VarWidgets, HartWidgets, TcRtdWidgets, AnalogWidgets, FFSimulateWidgets, \
+from ..VarManages.VarWidget import VarWidgets
-    HartSimulateWidgets
+# HartWidgets, TcRtdWidgets, AnalogWidgets, FFSimulateWidgets, \
+#     HartSimulateWidgets
 from ..UserManage.UserWidget import UserWidgets
 from ..TrendManage.TrendWidget import TrendWidgets
 from ..Setting.RTUSetting import RTUSettingWidget
@@ -115,22 +116,22 @@ class MainWindow(QMainWindow):
         self.trendWidget = TrendWidgets()
         self.TcpSettingWidget = TCPSettingWidget()
         self.RtuSettingWidget = RTUSettingWidget()
-        self.hartWidget = HartWidgets()
+        # self.hartWidget = HartWidgets()
-        self.tcrtdWidget = TcRtdWidgets()
+        # self.tcrtdWidget = TcRtdWidgets()
-        self.analogWidget = AnalogWidgets()
+        # self.analogWidget = AnalogWidgets()
-        self.ffWidget = FFWidget()
+        # self.ffWidget = FFWidget()
-        self.ffsimulateWidget = FFSimulateWidgets()
+        # self.ffsimulateWidget = FFSimulateWidgets()
-        self.hartsimulateWidget = HartSimulateWidgets()
+        # self.hartsimulateWidget = HartSimulateWidgets()
 
 
         self.userWidget.setObjectName('userWidget')
         self.projectWidget.setObjectName('projectWidget')
         self.trendWidget.setObjectName('trendWidget')
         self.varWidget.setObjectName('varWidget')
-        self.analogWidget.setObjectName('analogWidget')
+        # self.analogWidget.setObjectName('analogWidget')
-        self.ffWidget.setObjectName('ffWidget')
+        # self.ffWidget.setObjectName('ffWidget')
-        self.ffsimulateWidget.setObjectName('ffsimulateWidget')
+        # self.ffsimulateWidget.setObjectName('ffsimulateWidget')
-        self.hartsimulateWidget.setObjectName('hartsimulateWidget')
+        # self.hartsimulateWidget.setObjectName('hartsimulateWidget')
 
         self.rightWidget = QStackedWidget()
         # self.rightWidget.setAttribute(Qt.WA_StyledBackground, True)
@@ -141,12 +142,12 @@ class MainWindow(QMainWindow):
         self.rightWidget.addWidget(self.userWidget)
         self.rightWidget.addWidget(self.TcpSettingWidget)
         self.rightWidget.addWidget(self.RtuSettingWidget)
-        self.rightWidget.addWidget(self.hartWidget)
+        # self.rightWidget.addWidget(self.hartWidget)
-        self.rightWidget.addWidget(self.tcrtdWidget)
+        # self.rightWidget.addWidget(self.tcrtdWidget)
-        self.rightWidget.addWidget(self.analogWidget)
+        # self.rightWidget.addWidget(self.analogWidget)
-        self.rightWidget.addWidget(self.ffWidget)
+        # self.rightWidget.addWidget(self.ffWidget)
-        self.rightWidget.addWidget(self.ffsimulateWidget)
+        # self.rightWidget.addWidget(self.ffsimulateWidget)
-        self.rightWidget.addWidget(self.hartsimulateWidget)
+        # self.rightWidget.addWidget(self.hartsimulateWidget)
 
 
         self.rightWidget.widget(1)

UI/ProjectManages/ProjectModel.py

@@ -338,7 +338,8 @@ class ProTypeBoxDelegate(ProjectButtonDelegate):
             setattr(self, comboBox, QComboBox(self.parent()))
             cmBox = getattr(self, comboBox)
 
-            item = ['MODBUSTCP 主站模式', 'MODBUSTCP 从站模式', 'MODBUSRTU 主站模式', 'MODBUSRTU 从站模式','HART', 'TCRTD', 'AO/DO/PI', 'FF', 'FF模拟', 'HART模拟']
+            # item = ['MODBUSTCP 主站模式', 'MODBUSTCP 从站模式', 'MODBUSRTU 主站模式', 'MODBUSRTU 从站模式','HART', 'TCRTD', 'AO/DO/PI', 'FF', 'FF模拟', 'HART模拟']
+            item = ['MODBUSTCP 主站模式', 'MODBUSTCP 从站模式', 'MODBUSRTU 主站模式', 'MODBUSRTU 从站模式']
             cmBox.addItems(item)
             cmBox.index = [index.row(), index.column()]
             if self.parent().model.datas[index.row()][index.column()] in range(10):

model/HistoryDBModel/HistoryDBManage.py

@@ -20,7 +20,7 @@ def parseDate(date_string: str):
 class HistoryDBManage():
 	org = "DCS"
 	# bucket = "history"
-	url = "http://localhost:6324"
+	url = "http://127.0.0.1:8086"
 
 	def __init__(self, bucket, mem = None, isCelery = True):
 		self.getToken(isCelery)

model/ProjectModel/ProjectManage.py

@@ -144,11 +144,11 @@ class ProjectManage(object):
 		Globals.setValue('currentProDB', projectDB)
 		Globals.setValue('currentProType', proType)
 
-		if Globals.getValue('FFThread').isRunning():
+		# if Globals.getValue('FFThread').isRunning():
-			Globals.getValue('FFThread').reStart()
+		# 	Globals.getValue('FFThread').reStart()
-			return
+		# 	return
-		if proType == '7':
+		# if proType == '7':
-			Globals.getValue('FFThread').start()
+		# 	Globals.getValue('FFThread').start()
 
 # initDB
 	@classmethod
@@ -256,7 +256,7 @@ class ProjectManage(object):
 		curTime = float("{:.5f}".format(curTime))
 		cursor.execute('insert into InfluxMem (mem) values ({})'.format(str(curTime)))
 
-		historyDB = HistoryDBManage(mem = curTime, bucket =  projectName, isCelery = False)
+		historyDB = HistoryDBManage(mem = curTime, bucket =  projectName, isCelery = True)
 		return historyDB
 
 	@classmethod

nuitka.txt

@@ -1 +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
+nuitka --windows-disable-console --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