diff --git a/CharacteristicList.cpp b/CharacteristicList.cpp index 4974f18..299b98a 100644 --- a/CharacteristicList.cpp +++ b/CharacteristicList.cpp @@ -82,10 +82,10 @@ void CCharacteristicList::DisPlayCharacteristic() }else if(g_ChannelBaseInfo[i].defaultDisplay == "峰值"){ model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DiagnosisPeak,'f',g_Charateristic[j].ChUnitDot)); }else if(g_ChannelBaseInfo[i].defaultDisplay == "平均值"){ - if(g_ChannelBaseInfo[i].channelType == "PULSE_CURRENT" && g_Charateristic[j].DiagnosisPk2Pk < 0.9 && g_Charateristic[j].DiagnosisPk2Pk > 0.4){ + if(g_ChannelBaseInfo[i].channelType == "PULSE_CURRENT" && g_Charateristic[j].DCValues < 0.9 && g_Charateristic[j].DCValues > 0.4){ model->setData(model->index(j,2,QModelIndex()),"0.0"); }else{ - model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DiagnosisPk2Pk,'f',g_Charateristic[j].ChUnitDot)); + model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DCValues,'f',g_Charateristic[j].ChUnitDot)); } }else if(g_ChannelBaseInfo[i].defaultDisplay == "转速"){ model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].speedRPM,'f',g_Charateristic[j].ChUnitDot)); @@ -96,7 +96,14 @@ void CCharacteristicList::DisPlayCharacteristic() model->setData(model->index(j,3,QModelIndex()),QString::number(g_Charateristic[j].DiagnosisPk2Pk,'f',g_Charateristic[j].ChUnitDot)); model->setData(model->index(j,4,QModelIndex()),g_Charateristic[j].InvertDanger); model->setData(model->index(j,5,QModelIndex()),g_Charateristic[j].InvertAlarm); - model->setData(model->index(j,6,QModelIndex()),g_Charateristic[j].xFullScalePosition); + if(g_ChannelBaseInfo[i].channelType == "PULSE_CURRENT" && g_Charateristic[j].xFullScalePosition < 0.9 && g_Charateristic[j].xFullScalePosition > 0.4){ + model->setData(model->index(j,6,QModelIndex()),g_Charateristic[j].xFullScalePosition); + model->setData(model->index(j,6,QModelIndex()),"0.0"); + + }else{ + model->setData(model->index(j,6,QModelIndex()),g_Charateristic[j].xFullScalePosition); + } + model->setData(model->index(j,7,QModelIndex()),QString::number(g_Charateristic[j].Gap,'f',g_Charateristic[j].ChUnitDot)); model->setData(model->index(j,8,QModelIndex()),g_Charateristic[j].ZeroScalePosition); model->setData(model->index(j,9,QModelIndex()),g_Charateristic[j].SensorStatus); diff --git a/CopyDatFile.h b/CopyDatFile.h index e45fb03..b2a9306 100644 --- a/CopyDatFile.h +++ b/CopyDatFile.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/config/UnitBoardsInfo.json b/config/UnitBoardsInfo.json deleted file mode 100644 index 8f0bbf5..0000000 --- a/config/UnitBoardsInfo.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "BoardType": { - "Options": [ - "高速IEPE型采集板卡", - "高速电流型采集板卡", - "高速摆度采集板卡", - "高速振动采集板卡", - "低速电流采集板", - "开入开出板" - ] - }, - "UnitBoards": [ - { - "BoardType": "高速IEPE型采集板卡", - "BoardTypeNo": 0, - "SN": "1" - }, - { - "BoardType": "高速电流型采集板卡", - "BoardTypeNo": 1, - "SN": "2" - }, - { - "BoardType": "高速摆度采集板卡", - "BoardTypeNo": 2, - "SN": "3" - }, - { - "BoardType": "高速电流型采集板卡", - "BoardTypeNo": 3, - "SN": "4" - }, - { - "BoardType": "低速电流采集板", - "BoardTypeNo": 4, - "SN": "5" - }, - { - "BoardType": "开入开出板", - "BoardTypeNo": 5, - "SN": "6" - } - ] -} diff --git a/config/UnitConfigurations.json b/config/UnitConfigurations.json deleted file mode 100644 index a6f79e1..0000000 --- a/config/UnitConfigurations.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "Configuraitons": [ - { - "BoardNo": 3, - "ChannelId": "50294D2080380301", - "ChannelName": "继电器输出-1", - "ChannelNoInBoard": 1, - "logicExpress": [ - "logicOR", - { - "logicAND": { - "Inputs": [ - { - "alarm": 1, - "channelId": "50294D208038011", - "displayTitle": "第1板卡第1通道-DiagnosisPk2Pk-DELTA_EU-50294D208038011-警报阈值", - "key": "wSBQDfNRYWeBT-oe1SvCB", - "triggerFeatureName": "第1板卡第1通道-DiagnosisPk2Pk-DELTA_EU-50294D208038011-警报阈值" - }, - { - "alarm": 1, - "channelId": "50294D208038021", - "displayTitle": "第2板卡第1通道-DCValues-LEVEL-50294D208038021-警报阈值", - "key": "po9n-tQIi5sh94ifJj1Hf", - "triggerFeatureName": "第2板卡第1通道-DCValues-LEVEL-50294D208038021-警报阈值" - } - ], - "MinimumNumber": 2 - } - } - ] - }, - { - "BoardNo": 3, - "ChannelId": "50294D2080380302", - "ChannelName": "继电器输出-1", - "ChannelNoInBoard": 2, - "logicExpress": [ - "logicOR", - { - "logicAND": { - "Inputs": [ - { - "alarm": 1, - "channelId": "50294D2080380101", - "displayTitle": "第1板卡第1通道-DiagnosisPk2Pk-DELTA_EU-50294D208038011-警报阈值", - "key": "wSBQDfNRYWeBT-oe1SvCB", - "triggerFeatureName": "第1板卡第1通道-DiagnosisPk2Pk-DELTA_EU-50294D208038011-警报阈值" - }, - { - "alarm": 1, - "channelId": "50294D2080380201", - "displayTitle": "第2板卡第1通道-DCValues-LEVEL-50294D208038021-警报阈值", - "key": "po9n-tQIi5sh94ifJj1Hf", - "triggerFeatureName": "第2板卡第1通道-DCValues-LEVEL-50294D208038021-警报阈值" - } - ], - "MinimumNumber": 2 - } - } - ] - } - ], - "TheFirstDelayTime": "5", - "TheSecondDelayTime": "10", - "TheThirdDelayTime": "15" -} diff --git a/config/UnitParameters.json b/config/UnitParameters.json deleted file mode 100644 index 40994d1..0000000 --- a/config/UnitParameters.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "BladesNumber": { - "content": "4.0", - "display": "叶片数" - }, - "DesignHead": { - "Unit": "m", - "content": "9.7", - "display": "设计水头" - }, - "FlowCoefficient": { - "content": "0.00000", - "display": "流量系数" - }, - "GeneratorManufacturer": { - "content": "0.00", - "display": "发电机制造厂家" - }, - "GuideVanesNumber": { - "content": "16.0", - "display": "导叶数" - }, - "LowerGuideVaneWattage": { - "content": "12.00", - "display": "下导瓦数" - }, - "MaximumHead": { - "Unit": "m", - "content": "18.70", - "display": "最大水头" - }, - "MinimumHead": { - "Unit": "m", - "content": "3", - "display": "最小水头" - }, - "PlantID": { - "content": "ZG", - "display": "电厂编号" - }, - "PlantName": { - "content": "金沙水电站", - "display": "电厂名称" - }, - "PressurePulsationDisplayunit": { - "Options": [ - "Kpa", - "%" - ], - "content": "Kpa", - "display": "压力脉动显示" - }, - "RatedExcitationCurrent": { - "Unit": "A", - "content": "864.00", - "display": "额定励磁电流" - }, - "RatedPower": { - "Unit": "MW", - "content": "160.0", - "display": "额定功率" - }, - "RatedSpeed": { - "Unit": "rpm", - "content": "57.7", - "display": "额定转速" - }, - "ThrustWattage": { - "content": "24.00", - "display": "推力瓦数" - }, - "TurbineManufacturer": { - "content": "0.00", - "display": "水轮机制造厂家" - }, - "UnitID": { - "content": "1", - "display": "机组编号" - }, - "UnitName": { - "content": "1号机组", - "display": "机组名称" - }, - "UnitStyle": { - "Options": [ - "混流式机组", - "轴流定桨式机组", - "轴流转浆式机组", - "可逆式机组", - "灯泡式机组", - "冲击式机组" - ], - "content": "轴流转浆式机组", - "display": "机组类型" - }, - "UpperGuideVaneWattage": { - "content": "12.00", - "display": "上导瓦数" - }, - "WaterGuideVaneWattage": { - "content": "12.00", - "display": "水导瓦数" - } -} diff --git a/config/UnitSystemSoftwareBaseInfo.json b/config/UnitSystemSoftwareBaseInfo.json deleted file mode 100644 index 002a053..0000000 --- a/config/UnitSystemSoftwareBaseInfo.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "DeviceIPAddress": [ - "192.168.1.191192.168.1.192" - ], - "EnterpriseLOGO": "/CIDW/LOGO/logo.jpg", - "FunctionMenu": [ - "实时监测", - "事故追溯", - "数据组态", - "系统设置" - ], - "ProjectName": "安徽绩溪抽水蓄能电站1号机组", - "SoftwareName": "南瑞SJ90C状态监测装置状态监测软件V1.0", - "Timestamp": "1663593331", - "UnitSpeed": "0" -} diff --git a/config/UnitWorkConditionsInfo.json b/config/UnitWorkConditionsInfo.json deleted file mode 100644 index e5c6643..0000000 --- a/config/UnitWorkConditionsInfo.json +++ /dev/null @@ -1,425 +0,0 @@ -{ - "WorkConditionChannels": [ - { - "BoardNo": 1, - "ChannelDispalyName": "有功功率通道", - "ChannelName": "有功功率", - "ChannelNoInBoard": 1, - "Enable": 1, - "WorkConditionChannelType": 1 - }, - { - "BoardNo": 1, - "ChannelDispalyName": "无功功率通道", - "ChannelName": "无功功率", - "ChannelNoInBoard": 2, - "Enable": 1, - "WorkConditionChannelType": 2 - }, - { - "BoardNo": 1, - "ChannelDispalyName": "励磁电流通道", - "ChannelName": "励磁电流", - "ChannelNoInBoard": 3, - "Enable": 1, - "WorkConditionChannelType": 3 - }, - { - "BoardNo": 1, - "ChannelDispalyName": "导叶开度通道", - "ChannelName": "导叶开度", - "ChannelNoInBoard": 4, - "Enable": 1, - "WorkConditionChannelType": 4 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "桨叶开度通道", - "ChannelName": "桨叶开度", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 5 - }, - { - "BoardNo": 2, - "ChannelDispalyName": "工作水头通道", - "ChannelName": "机组水头", - "ChannelNoInBoard": 1, - "Enable": 1, - "WorkConditionChannelType": 6 - }, - { - "BoardNo": 2, - "ChannelDispalyName": "机组流量通道", - "ChannelName": "机组流量", - "ChannelNoInBoard": 2, - "Enable": 1, - "WorkConditionChannelType": 7 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "蜗壳差压通道", - "ChannelName": "蜗壳差压", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 8 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "机组效率通道", - "ChannelName": "机组效率", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 9 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "发电机出口开关通道", - "ChannelName": "发电机出口开关", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 10 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "励磁开关通道", - "ChannelName": "励磁开关", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 11 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "发电/抽水工况通道", - "ChannelName": "发电/抽水工况", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 12 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "蜗壳进口压力通道", - "ChannelName": "蜗壳进口压力", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 13 - }, - { - "BoardNo": 0, - "ChannelDispalyName": "尾水出口压力通道", - "ChannelName": "尾水出口压力", - "ChannelNoInBoard": 0, - "Enable": 0, - "WorkConditionChannelType": 14 - }, - { - "BoardNo": 2, - "ChannelDispalyName": "转速通道", - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "Enable": 1, - "WorkConditionChannelType": 15 - } - ], - "WorkConditionTemplates": [ - { - "TemplatesName": "常规机组工况模板", - "WorkConditions": [ - { - "CheckWorkConditionInterval": 5, - "Description": "稳态工况:机组工作在稳态", - "Enable": 1, - "SN": "1", - "StartWorkCondition": false, - "WorkConditionName": "稳态工况", - "WorkConditionRules": [ - { - "BoardNo": 2, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnRangeLower": true, - "EnableCheckVolatility": 0, - "LowerSideOfRange": 95, - "LowerSideOfRangePercent": true, - "WorkConditionChannelType": 15 - }, - { - "BoardNo": 7, - "ChannelName": "有功功率", - "ChannelNoInBoard": 1, - "EnRangeLower": true, - "EnVolatilityRangeUpper": true, - "EnableCheckVolatility": 1, - "LowerSideOfRange": 5, - "LowerSideOfRangePercent": false, - "UpperSideOfVolatilityRange": 5, - "UpperSideOfVolatilityRangePercent": false, - "WorkConditionChannelType": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "停机工况:机组处于停机状态", - "Enable": 1, - "SN": "2", - "StartWorkCondition": true, - "WorkConditionName": "停机工况", - "WorkConditionRules": [ - { - "BoardNo": 2, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnRangeUpper": true, - "EnableCheckVolatility": 0, - "UpperSideOfRange": 5, - "UpperSideOfRangePercent": true, - "WorkConditionChannelType": 15 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "变负荷工况:机组处于负荷变化的过程,是稳态过程", - "Enable": 1, - "SN": "3", - "StartWorkCondition": false, - "WorkConditionName": "变负荷工况", - "WorkConditionRules": [ - { - "BoardNo": 2, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnRangeLower": true, - "EnableCheckVolatility": 0, - "LowerSideOfRange": 95, - "LowerSideOfRangePercent": true, - "WorkConditionChannelType": 15 - }, - { - "BoardNo": 7, - "ChannelName": "有功功率", - "ChannelNoInBoard": 1, - "EnRangeLower": true, - "EnVolatilityRangeLower": true, - "EnableCheckVolatility": 1, - "LowerSideOfRange": 5, - "LowerSideOfRangePercent": false, - "LowerSideOfVolatilityRange": 5, - "LowerSideOfVolatilityRangePercent": false, - "WorkConditionChannelType": 1 - } - ] - } - ] - }, - { - "TemplatesName": "抽水蓄能机组工况模板", - "WorkConditions": [ - { - "CheckWorkConditionInterval": 5, - "Description": "停机工况", - "Enable": 1, - "SN": "1", - "StartWorkCondition": true, - "WorkConditionName": "停机", - "WorkConditionRules": [ - { - "ChannelName": "停机", - "EnableCheckVolatility": 0, - "LowerSideOfRange": 1, - "UpperSideOfRange": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "发电工况", - "Enable": 1, - "SN": "2", - "StartWorkCondition": false, - "WorkConditionName": "发电", - "WorkConditionRules": [ - { - "ChannelName": "发电", - "EnableCheckVolatility": 0, - "LowerSideOfRange": 1, - "UpperSideOfRange": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "发电调相工况", - "Enable": 1, - "SN": "3", - "StartWorkCondition": false, - "WorkConditionName": "发电调相", - "WorkConditionRules": [ - { - "ChannelName": "发电调相", - "EnableCheckVolatility": 0, - "LowerSideOfRange": 1, - "UpperSideOfRange": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "抽水调相工况", - "Enable": 1, - "SN": "4", - "StartWorkCondition": false, - "WorkConditionName": "抽水调相", - "WorkConditionRules": [ - { - "ChannelName": "抽水调相", - "EnableCheckVolatility": 0, - "LowerSideOfRange": 1, - "UpperSideOfRange": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "水泵工况", - "Enable": 1, - "SN": "5", - "StartWorkCondition": false, - "WorkConditionName": "水泵", - "WorkConditionRules": [ - { - "ChannelName": "水泵", - "EnableCheckVolatility": 0, - "LowerSideOfRange": 1, - "UpperSideOfRange": 1 - } - ] - } - ] - } - ], - "WorkConditionsInfo": [ - { - "CheckWorkConditionInterval": 5, - "Description": "稳态工况:机组工作在稳态", - "Enable": 1, - "SN": "1", - "StartWorkCondition": false, - "WorkConditionJudgeLogicRules": { - "logicAND": [ - { - "WC_NO": 1, - "key": "wSBQDfNRYWeBT-oe1SvCB" - }, - { - "WC_NO": 2, - "key": "wSBQDfNRYWeBT-oe1SvCc" - } - ] - }, - "WorkConditionName": "稳态工况", - "WorkConditionRules": [ - { - "BoardNo": 1, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnLowerSideOfRangePercent": true, - "EnRangeLower": true, - "EnableCheckVolatility": 0, - "LowerSideOfRange": 95, - "WC_NO": 1, - "WorkConditionChannelType": 15 - }, - { - "BoardNo": 2, - "ChannelName": "有功功率", - "ChannelNoInBoard": 1, - "EnLowerSideOfRangePercent": true, - "EnRangeLower": true, - "EnVolatilityRangeUpper": true, - "EnableCheckVolatility": 1, - "LowerSideOfRange": 5, - "UpperSideOfVolatilityRange": 5, - "WC_NO": 2, - "WorkConditionChannelType": 1 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "停机工况:机组处于停机状态", - "Enable": 1, - "SN": "2", - "StartWorkCondition": true, - "WorkConditionJudgeLogicRules": { - "logicAND": [ - { - "WC_NO": 1, - "key": "wSBQDfNRYWeBT-oe1SvCc" - } - ] - }, - "WorkConditionName": "停机工况", - "WorkConditionRules": [ - { - "BoardNo": 1, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnRangeUpper": true, - "EnUpperSideOfRangePercent": true, - "EnableCheckVolatility": 0, - "UpperSideOfRange": 5, - "WC_NO": 1, - "WorkConditionChannelType": 15 - } - ] - }, - { - "CheckWorkConditionInterval": 5, - "Description": "变负荷工况:机组处于负荷变化的过程,是稳态过程", - "Enable": 1, - "SN": "3", - "StartWorkCondition": false, - "WorkConditionJudgeLogicRules": { - "logicAND": [ - { - "WC_NO": 1, - "key": "wSBQDfNRYWeBT-oe1SvCB" - }, - { - "WC_NO": 2, - "key": "wSBQDfNRYWeBT-oe1SvCc" - } - ] - }, - "WorkConditionName": "变负荷工况", - "WorkConditionRules": [ - { - "BoardNo": 1, - "ChannelName": "转速", - "ChannelNoInBoard": 1, - "EnLowerSideOfRangePercent": true, - "EnRangeLower": true, - "EnableCheckVolatility": 0, - "LowerSideOfRange": 95, - "WC_NO": 1, - "WorkConditionChannelType": 15 - }, - { - "BoardNo": 2, - "ChannelName": "有功功率", - "ChannelNoInBoard": 1, - "EnLowerSideOfRangePercent": true, - "EnRangeLower": true, - "EnVolatilityRangeLower": true, - "EnableCheckVolatility": 1, - "LowerSideOfRange": 5, - "LowerSideOfVolatilityRange": 5, - "WC_NO": 2, - "WorkConditionChannelType": 1 - } - ] - } - ] -} diff --git a/config/config.db b/config/config.db deleted file mode 100644 index 9a9a92d..0000000 Binary files a/config/config.db and /dev/null differ diff --git a/image/unit/1.png b/image/unit/1.png deleted file mode 100644 index 4cc179f..0000000 Binary files a/image/unit/1.png and /dev/null differ diff --git a/image/unit/dengpaoshi.png b/image/unit/dengpaoshi.png deleted file mode 100644 index eeb8224..0000000 Binary files a/image/unit/dengpaoshi.png and /dev/null differ diff --git a/image/unit/hunliushi.png b/image/unit/hunliushi.png deleted file mode 100644 index 2ea278c..0000000 Binary files a/image/unit/hunliushi.png and /dev/null differ diff --git a/image/unit/kenishi.png b/image/unit/kenishi.png deleted file mode 100644 index 695f864..0000000 Binary files a/image/unit/kenishi.png and /dev/null differ diff --git a/image/unit/zhouliushi.png b/image/unit/zhouliushi.png deleted file mode 100644 index 76e78bd..0000000 Binary files a/image/unit/zhouliushi.png and /dev/null differ diff --git a/plugins/sqldrivers/qsqlite.dll b/plugins/sqldrivers/qsqlite.dll deleted file mode 100644 index c9b1c55..0000000 Binary files a/plugins/sqldrivers/qsqlite.dll and /dev/null differ diff --git a/plugins/sqldrivers/qsqlited.dll b/plugins/sqldrivers/qsqlited.dll deleted file mode 100644 index 94c93d6..0000000 Binary files a/plugins/sqldrivers/qsqlited.dll and /dev/null differ diff --git a/plugins/sqldrivers/qsqlodbc.dll b/plugins/sqldrivers/qsqlodbc.dll deleted file mode 100644 index ccfb753..0000000 Binary files a/plugins/sqldrivers/qsqlodbc.dll and /dev/null differ diff --git a/plugins/sqldrivers/qsqlodbcd.dll b/plugins/sqldrivers/qsqlodbcd.dll deleted file mode 100644 index a1e9a38..0000000 Binary files a/plugins/sqldrivers/qsqlodbcd.dll and /dev/null differ diff --git a/plugins/sqldrivers/qsqlpsql.dll b/plugins/sqldrivers/qsqlpsql.dll deleted file mode 100644 index 0cf39b6..0000000 Binary files a/plugins/sqldrivers/qsqlpsql.dll and /dev/null differ diff --git a/plugins/sqldrivers/qsqlpsqld.dll b/plugins/sqldrivers/qsqlpsqld.dll deleted file mode 100644 index 9d120f0..0000000 Binary files a/plugins/sqldrivers/qsqlpsqld.dll and /dev/null differ