Skip to content

Commit

Permalink
Merge pull request #105 from RapidScada/develop
Browse files Browse the repository at this point in the history 
Merge Develop to Master
  • Loading branch information
@2mik
2mik authored Dec 14, 2020
2 parents 62b83e3 + 492705a commit 996cbf8
Show file tree
Hide file tree
Showing 221 changed files with 7,531 additions and 2,731 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# https://docs.github.com/en/free-pro-team@latest/github/using-git/configuring-git-to-handle-line-endings
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Declare files that will always have CRLF line endings on checkout.
*.bat text eol=crlf

# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf
Binary file removed Base/model/scada_6.0.png
View file
Binary file not shown.
1,503 changes: 0 additions & 1,503 deletions Base/model/scada_6.0.xml
View file

This file was deleted.

10 changes: 9 additions & 1 deletion Config/EmptyProject.en-GB/Instances/Default/ScadaWeb/config/WebSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,12 @@
<Plugin fileName="PlgTable.dll" />
<Plugin fileName="PlgWebPage.dll" />
</Plugins>
</WebSettings>
<CustomOptions>
<OptionGroup name="Scheme">
<!-- ScaleType: Numeric, FitScreen, FitWidth -->
<Option name="ScaleType" value="Numeric" />
<Option name="ScaleValue" value="100" />
<Option name="RememberScale" value="true" />
</OptionGroup>
</CustomOptions>
</WebSettings>
10 changes: 9 additions & 1 deletion Config/EmptyProject.ru-RU/Instances/Default/ScadaWeb/config/WebSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,12 @@
<Plugin fileName="PlgTable.dll" />
<Plugin fileName="PlgWebPage.dll" />
</Plugins>
</WebSettings>
<CustomOptions>
<OptionGroup name="Scheme">
<!-- ScaleType: Numeric, FitScreen, FitWidth -->
<Option name="ScaleType" value="Numeric" />
<Option name="ScaleValue" value="100" />
<Option name="RememberScale" value="true" />
</OptionGroup>
</CustomOptions>
</WebSettings>
71 changes: 71 additions & 0 deletions LangPack/v5.x/Chinese-Simplified/ScadaWeb/plugins/ChartPro/lang/PlgChartPro.zh-CN.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<PlgChartProDictionaries>
<Dictionary key="Scada.Web.Plugins.Chart">
<Phrase key="IncorrectStartDate">起始日期错误.</Phrase>
<Phrase key="IncorrectEndDate">截止日期错误.</Phrase>
<Phrase key="IncorrectPeriod">起始日期必须早于或等于截止日期.</Phrase>
<Phrase key="PeriodTooLong">最大周期长度是{0} 天.</Phrase>
<Phrase key="CnlNumsEmptyError">通道号没有指定.</Phrase>
<Phrase key="CountMismatchError">通道号和视图ID不匹配</Phrase>
<Phrase key="PerfWarning">警告! 过多的通道会影响性能.</Phrase>
<Phrase key="AddCnlBtn">添加</Phrase>
<Phrase key="RemoveCnlBtn">移除</Phrase>
<Phrase key="CnlInfoBtn">信息</Phrase>
<Phrase key="ObjectHint">对象: </Phrase>
<Phrase key="DeviceHint">设备: </Phrase>
<Phrase key="ViewHint">视图: </Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartCnls">
<Phrase key="this">图表通道</Phrase>
<Phrase key="btnAddCnls">添加通道</Phrase>
<Phrase key="lblSelCnls">已选通道:</Phrase>
<Phrase key="lblNoSelCnls">没有选择的输入通道</Phrase>
<Phrase key="lbtnBackToCnls">回到已选通道</Phrase>
<Phrase key="lblLoading">加载...</Phrase>
<Phrase key="lblUnableLoadView">无法加载视图</Phrase>
<Phrase key="lblNoCnlsByView">输入通道未找到</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartExport">
<Phrase key="this">导出图标</Phrase>
<Phrase key="btnExportPdf">导出图标成PDF</Phrase>
<Phrase key="btnExportPng">导出图标成PNG</Phrase>
<Phrase key="btnExportExcel">导出数据到Excel</Phrase>
<Phrase key="lblDateFrom">从</Phrase>
<Phrase key="txtDateTo">到</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartPeriod">
<Phrase key="this">图标周期</Phrase>
<Phrase key="lblDateFrom">从</Phrase>
<Phrase key="txtDateTo">到</Phrase>
<Phrase key="btnPrevDay">前一天</Phrase>
<Phrase key="btnNextDay">后一天</Phrase>
<Phrase key="btnPrevWeek">前一周</Phrase>
<Phrase key="btnNextWeek">后一周</Phrase>
<Phrase key="btnPrevMonth">前一月</Phrase>
<Phrase key="btnNextMonth">后一月</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartPeriodRolling">
<Phrase key="this">图标周期</Phrase>
<Phrase key="lblPeriod">周期</Phrase>
<Phrase key="lblPeriodUnit">分钟</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartPro">
<Phrase key="this">专业图标</Phrase>
<Phrase key="lblStatus">生成于 </Phrase>
<Phrase key="hlSelectCnls">已选通道</Phrase>
<Phrase key="hlChangePeriod">修改周期</Phrase>
<Phrase key="hlShowData">显示数据</Phrase>
<Phrase key="hlHideData">隐藏数据</Phrase>
<Phrase key="hlExport">导出</Phrase>
<Phrase key="btnClose">关闭</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.ChartPro.WFrmChartPro.Js">
<Phrase key="DataLoading">数据加载...</Phrase>
<Phrase key="LoadError">数据加载出错</Phrase>
<Phrase key="Generated">生成于 </Phrase>
<Phrase key="TimeCol">时间</Phrase>
<Phrase key="ZoomIn">放大</Phrase>
<Phrase key="ZoomOut">缩小</Phrase>
<Phrase key="ResetZoom">重置</Phrase>
</Dictionary>
</PlgChartProDictionaries>
28 changes: 28 additions & 0 deletions LangPack/v5.x/Chinese-Simplified/ScadaWeb/plugins/Dashboard/PlgDashboard.zh-CN.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<PlgDashboardDictionaries>
<Dictionary key="Scada.Web.Plugins.Dashboard">
<Phrase key="LoadDashboardListError">加载仪表盘清单出错</Phrase>
<Phrase key="LoadDashboardError">加载仪表盘配置信息出错</Phrase>
<Phrase key="LoadDashboardNameError">加载仪表盘名字出错</Phrase>
<Phrase key="InvalidDashboardKey">无效的仪表盘序列号.</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Dashboard.WFrmCurDataWidget.Js">
<Phrase key="LoadError">加载数据出错</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Dashboard.WFrmDashboard">
<Phrase key="btnExportPdf">导出成PDF</Phrase>
<Phrase key="DashboardNotFound">指定序列号的仪表盘未找到.</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Dashboard.WFrmDashboard.Js">
<Phrase key="ReceiveDashboardError">获取仪表盘配置信息出错</Phrase>
<Phrase key="NoWidgetsToExport">没有组件支持导出成PDF</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Dashboard.WFrmDashboardList">
<Phrase key="this">仪表盘</Phrase>
<Phrase key="lblTitle">仪表盘</Phrase>
<Phrase key="lblNoDashboards">没有可用的仪表盘</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.PlgDashboardSpec">
<Phrase key="DashboardsMenuItem">仪表盘</Phrase>
</Dictionary>
</PlgDashboardDictionaries>
149 changes: 149 additions & 0 deletions LangPack/v5.x/Chinese-Simplified/ScadaWeb/plugins/Table/lang/ScadaTable.zh-CN.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<?xml version="1.0" encoding="utf-8"?>
<PlgTableDictionaries>
<Dictionary key="Scada.Table.TableView">
<Phrase key="LoadTableViewError">从文件加载表格出错</Phrase>
<Phrase key="SaveTableViewError">保存表格到文件出错</Phrase>
</Dictionary>
<Dictionary key="Scada.Table.Editor.Forms.FrmItemInfo">
<Phrase key="this">条目信息</Phrase>
<Phrase key="gbInCnl">输入通道</Phrase>
<Phrase key="lblInCnl">通道</Phrase>
<Phrase key="lblInCnlObj">对象</Phrase>
<Phrase key="lblInCnlKP">设备</Phrase>
<Phrase key="gbCtrlCnl">输出通道</Phrase>
<Phrase key="lblCtrlCnl">通道</Phrase>
<Phrase key="lblCtrlCnlObj">对象</Phrase>
<Phrase key="lblCtrlCnlKP">设备</Phrase>
<Phrase key="btnClose">关闭</Phrase>
</Dictionary>
<Dictionary key="Scada.Table.Editor.Forms.FrmMain">
<Phrase key="miFile">&amp;文件</Phrase>
<Phrase key="miFileNew">新建</Phrase>
<Phrase key="miFileOpen">打开...</Phrase>
<Phrase key="miFileSave">保存</Phrase>
<Phrase key="miFileSaveAs">另存为...</Phrase>
<Phrase key="miFileExit">退出</Phrase>
<Phrase key="miHelp">&amp;帮助</Phrase>
<Phrase key="miHelpAbout">关于</Phrase>
<Phrase key="btnFileNew.ToolTip">新建表格 (Ctrl+N)</Phrase>
<Phrase key="btnFileOpen.ToolTip">打开表格 (Ctrl+O)</Phrase>
<Phrase key="btnFileSave.ToolTip">保存表格 (Ctrl+S)</Phrase>
<Phrase key="btnRefreshBase.ToolTip">刷新配置数据库</Phrase>
<Phrase key="btnAddItem.ToolTip">添加条目</Phrase>
<Phrase key="btnAddEmptyItem.ToolTip">添加空条目</Phrase>
<Phrase key="btnMoveUpItem.ToolTip">上移条目</Phrase>
<Phrase key="btnMoveDownItem.ToolTip">下移条目</Phrase>
<Phrase key="btnDeleteItem.ToolTip">删除选中的条目</Phrase>
<Phrase key="btnItemInfo.ToolTip">显示条目信息</Phrase>
<Phrase key="miDeviceAddItems">添加所有条目</Phrase>
<Phrase key="cbCnlKind.Items[0]">输入通道</Phrase>
<Phrase key="cbCnlKind.Items[1]">输出通道</Phrase>
<Phrase key="lblHint">回车或双击一个节点将其添加到表格。右键单击设备节点显示其上下文菜单。</Phrase>
<Phrase key="colItemCnlNum">输入通道</Phrase>
<Phrase key="colItemCtrlCnlNum">输出通道</Phrase>
<Phrase key="colItemCaption">标题</Phrase>
<Phrase key="colItemHidden">隐藏</Phrase>
<Phrase key="EditorTitle">{0} - 表格编辑器</Phrase>
<Phrase key="DefaultTableTitle">表格标题</Phrase>
<Phrase key="TableFileFilter">表格视图 (*.tbl)|*.tbl|所有文件 (*.*)|*.*</Phrase>
<Phrase key="SaveTableConfirm">表格视图已修改，要保存么？</Phrase>
<Phrase key="BaseNotFound">配置数据库未找到</Phrase>
<Phrase key="EmptyDeviceNode">空设备</Phrase>
<Phrase key="LoadConfigBaseError">加载配置数据库出错</Phrase>
<Phrase key="FillCnlTreeError">填充通道树出错</Phrase>
<Phrase key="LoadFormStateError">加载表单状态出错</Phrase>
<Phrase key="SaveFormStateError">保存表单状态出错</Phrase>
<Phrase key=""></Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.EventsRepBuilder">
<Phrase key="EventsWorksheet">事件</Phrase>
<Phrase key="AllEventsTitle">所有事件, {0}</Phrase>
<Phrase key="EventsByViewTitle">{0}, {1}</Phrase>
<Phrase key="EventsGen">生成 </Phrase>
<Phrase key="NumCol">序号</Phrase>
<Phrase key="TimeCol">日期和时间</Phrase>
<Phrase key="ObjCol">对象</Phrase>
<Phrase key="DevCol">设备</Phrase>
<Phrase key="CnlCol">通道</Phrase>
<Phrase key="TextCol">描述</Phrase>
<Phrase key="AckCol">确认</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.HourDataRepBuilder">
<Phrase key="HourDataWorksheet">小时数据</Phrase>
<Phrase key="HourDataTitle">{0}, {1}, {2}</Phrase>
<Phrase key="HourDataGen">生成 </Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.EventsWndSpec">
<Phrase key="EventsTitle">事件</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmCommand">
<Phrase key="this">命令 - Rapid SCADA</Phrase>
<Phrase key="lblCtrlCnlNotFound">输出通道 {0} 未找到.</Phrase>
<Phrase key="lblWrongPwd">密码错误.</Phrase>
<Phrase key="lblNoRights">权限不足.</Phrase>
<Phrase key="lblIncorrectCmdVal">错误的命令值.</Phrase>
<Phrase key="lblIncorrectCmdData">错误的命令数据.</Phrase>
<Phrase key="lblCtrlCnlCaption">输出通道:</Phrase>
<Phrase key="lblObjCaption">对象:</Phrase>
<Phrase key="lblDevCaption">设备:</Phrase>
<Phrase key="lblPassword">密码</Phrase>
<Phrase key="lblCmdVal">值</Phrase>
<Phrase key="lblCommand">命令</Phrase>
<Phrase key="lblCmdData">数据</Phrase>
<Phrase key="lblStr">字符串</Phrase>
<Phrase key="lblHex">十六进制</Phrase>
<Phrase key="lblCmdEnqueded">命令已加入队列准备执行.</Phrase>
<Phrase key="lblCloseAfter">窗口将关闭</Phrase>
<Phrase key="lblSec">秒.</Phrase>
<Phrase key="lblCmdNotSent">无法执行命令。服务器不可用。</Phrase>
<Phrase key="lblCmdRejected">命令被服务器拒绝.</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmEventAck">
<Phrase key="this">事件确认 - Rapid SCADA</Phrase>
<Phrase key="lblEventNotFound">事件未找到.</Phrase>
<Phrase key="lblAckNotSent">无法发送“确认”. 服务器不可用.</Phrase>
<Phrase key="lblAckRejected">“确认”被服务器拒绝.</Phrase>
<Phrase key="lblNumCaption">序号:</Phrase>
<Phrase key="lblTimeCaption">日期和时间:</Phrase>
<Phrase key="lblObjCaption">对象:</Phrase>
<Phrase key="lblDevCaption">设备:</Phrase>
<Phrase key="lblCnlCaption">通道:</Phrase>
<Phrase key="lblTextCaption">描述:</Phrase>
<Phrase key="lblAckCaption">已确认:</Phrase>
<Phrase key="lblByUser">被 {0}</Phrase>
<Phrase key="lblTip">点击“OK” 按钮确认事件.</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmEvents">
<Phrase key="lblAllEventsBtn">所有事件</Phrase>
<Phrase key="lblEventsByViewBtn">视图事件</Phrase>
<Phrase key="lblNumCol">序号</Phrase>
<Phrase key="lblTimeCol">日期和时间</Phrase>
<Phrase key="lblObjCol">对象</Phrase>
<Phrase key="lblDevCol">设备</Phrase>
<Phrase key="lblCnlCol">通道</Phrase>
<Phrase key="lblTextCol">描述</Phrase>
<Phrase key="lblAckCol">确认</Phrase>
<Phrase key="lblNoEvents">没有事件</Phrase>
<Phrase key="lblLoading">加载中...</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmEvents.Js">
<Phrase key="UpdateEventsError">更新事件出错</Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmTable">
<Phrase key="SelectedDay">选择的日期:</Phrase>
<Phrase key="PreviousDay">过去的日期:</Phrase>
<Phrase key="PrevDayItem">过去. </Phrase>
<Phrase key="ItemCol">条目</Phrase>
<Phrase key="CurCol">当前</Phrase>
<Phrase key="InCnlHint">输入通道: </Phrase>
<Phrase key="CtrlCnlHint">输出通道: </Phrase>
<Phrase key="ObjectHint">对象: </Phrase>
<Phrase key="DeviceHint">设备: </Phrase>
<Phrase key="QuantityHint">数量: </Phrase>
<Phrase key="UnitHint">单位: </Phrase>
</Dictionary>
<Dictionary key="Scada.Web.Plugins.Table.WFrmTable.Js">
<Phrase key="UpdateCurDataError">更新当前数据出错</Phrase>
<Phrase key="UpdateHourDataError">更新小时数据出错</Phrase>
</Dictionary>
</PlgTableDictionaries>
4 changes: 2 additions & 2 deletions LangPack/v5.x/Chinese-Simplified/info.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Language : Chinese-Simplified
Culture name: : zh-CN
Rapid SCADA version : 5.8.1
Rapid SCADA applications : All
Author : circler3
Author's email : circler3@sina.com
Authors : circler3, [email protected]
qiuqiaoan, 99256197@qq.com
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin5/ScadaAdmin/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="BasicHttpBinding_AgentSvc" transferMode="Streamed" maxReceivedMessageSize="10485760" />
<binding name="BasicHttpBinding_AgentSvc" transferMode="Streamed" maxReceivedMessageSize="104857600" />
</basicHttpBinding>
</bindings>
<client>
Expand Down
8 changes: 4 additions & 4 deletions ...DbImport/DbImport/Configuration/Config.cs → ...Import/DbImport/Configuration/KpConfig.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Mikhail Shiryaev
* Copyright 2020 Mikhail Shiryaev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@
*
* Author : Mikhail Shiryaev
* Created : 2018
* Modified : 2019
* Modified : 2020
*/

using System;
Expand All @@ -34,12 +34,12 @@ namespace Scada.Comm.Devices.DbImport.Configuration
/// Driver configuration.
/// <para>Конфигурация драйвера.</para>
/// </summary>
internal class Config
internal class KpConfig
{
/// <summary>
/// Initializes a new instance of the class.
/// </summary>
public Config()
public KpConfig()
{
SetToDefault();
}
Expand Down
6 changes: 3 additions & 3 deletions ScadaComm/OpenKPs/KpDbImport/DbImport/Data/DataSource.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018 Mikhail Shiryaev
* Copyright 2020 Mikhail Shiryaev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@
*
* Author : Mikhail Shiryaev
* Created : 2018
* Modified : 2018
* Modified : 2020
*/

using Scada.Comm.Devices.DbImport.Configuration;
Expand Down Expand Up @@ -140,7 +140,7 @@ public void Disconnect()
/// <summary>
/// Initializes the data source.
/// </summary>
public void Init(string connectionString, Config config)
public void Init(string connectionString, KpConfig config)
{
if (config == null)
throw new ArgumentNullException("config");
Expand Down
Loading

0 comments on commit 996cbf8

Please sign in to comment.