Skip to content

Commit

Permalink
Merge pull request #67 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 10, 2023
2 parents f0783ee + 2bfa1c9 commit f12d605
Show file tree
Hide file tree
Showing 213 changed files with 3,933 additions and 1,077 deletions.
4 changes: 2 additions & 2 deletions Projects/HelloWorld/BaseXML/CnlStatus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</CnlStatus>
<CnlStatus>
<CnlStatusID>11</CnlStatusID>
<Name>Extremely low</Name>
<Name>Low low</Name>
<MainColor>Blue</MainColor>
<SecondColor>Blue</SecondColor>
<BackColor>DodgerBlue</BackColor>
Expand Down Expand Up @@ -92,7 +92,7 @@
</CnlStatus>
<CnlStatus>
<CnlStatusID>15</CnlStatusID>
<Name>Extremely high</Name>
<Name>High high</Name>
<MainColor>Red</MainColor>
<SecondColor>Red</SecondColor>
<BackColor>LightCoral</BackColor>
Expand Down
16 changes: 11 additions & 5 deletions Projects/HelloWorld/BaseXML/DevType.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<DevType>
<DevTypeID>208</DevTypeID>
<Name>CE6850</Name>
<Driver>DrvCE6850</Driver>
<Driver>DrvCe6850</Driver>
<Descr>Electricity meter CE6850 (6822, 6823, 6827, 6828, 6850М) manufactured by Energomera</Descr>
</DevType>
<DevType>
Expand Down Expand Up @@ -128,9 +128,9 @@
</DevType>
<DevType>
<DevTypeID>222</DevTypeID>
<Name>Wiren Board ST</Name>
<Driver>DrvWirenBoardST</Driver>
<Descr>Wiren Board controller with the custom Sensor-Tools firmware</Descr>
<Name>Anemon</Name>
<Driver>DrvAnemon</Driver>
<Descr>Receives data from Anemon controllers manufactured by Disystec</Descr>
</DevType>
<DevType>
<DevTypeID>223</DevTypeID>
Expand All @@ -153,7 +153,7 @@
<DevType>
<DevTypeID>226</DevTypeID>
<Name>CE30X</Name>
<Driver>DrvCE301</Driver>
<Driver>DrvCe301</Driver>
<Descr>Electricity meters CE30X, which use IEC 61107-2011, manufactured by Energomera</Descr>
</DevType>
<DevType>
Expand Down Expand Up @@ -216,6 +216,12 @@
<Driver>DrvMqttPublisher</Driver>
<Descr>Transmits channel data to MQTT broker and receives commands</Descr>
</DevType>
<DevType>
<DevTypeID>237</DevTypeID>
<Name>CSV Reader</Name>
<Driver>DrvCsvReader</Driver>
<Descr>Reads data from a CSV file</Descr>
</DevType>
<DevType>
<DevTypeID>1001</DevTypeID>
<Name>Custom driver</Name>
Expand Down
22 changes: 9 additions & 13 deletions Projects/HelloWorld/BaseXML/ViewType.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,44 @@
<ArrayOfViewType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ViewType>
<ViewTypeID>1</ViewTypeID>
<Name>Table view</Name>
<Name>Table</Name>
<Code>TableView</Code>
<FileExt>tbl</FileExt>
<Descr>Requires Main Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>2</ViewTypeID>
<Name>Scheme view</Name>
<Name>Scheme</Name>
<Code>SchemeView</Code>
<FileExt>sch</FileExt>
<Descr />
<Descr>Requires Scheme Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>3</ViewTypeID>
<Name>Web page view</Name>
<Name>Web page</Name>
<Code>WebPageView</Code>
<Descr>Requires Web Page Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>4</ViewTypeID>
<Name>Chart Pro view</Name>
<Name>Chart Pro</Name>
<Code>ChartProView</Code>
<Descr>Requires Chart Pro Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>5</ViewTypeID>
<Name>Dashboard view</Name>
<Name>Dashboard</Name>
<Code>DashboardView</Code>
<FileExt>dash</FileExt>
<Descr>Requires Dashboard Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>6</ViewTypeID>
<Name>Map view</Name>
<Name>Map</Name>
<Code>MapView</Code>
<FileExt>map</FileExt>
<Descr>Requires Map Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>7</ViewTypeID>
<Name>Elastic report</Name>
<Code>ElasticRep</Code>
<Descr>Requires Elastic Report Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>101</ViewTypeID>
<Name>Custom view</Name>
Expand Down
4 changes: 2 additions & 2 deletions Projects/WirenBoardDemo/BaseXML/CnlStatus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</CnlStatus>
<CnlStatus>
<CnlStatusID>11</CnlStatusID>
<Name>Extremely low</Name>
<Name>Low low</Name>
<MainColor>Blue</MainColor>
<SecondColor>Blue</SecondColor>
<BackColor>DodgerBlue</BackColor>
Expand Down Expand Up @@ -92,7 +92,7 @@
</CnlStatus>
<CnlStatus>
<CnlStatusID>15</CnlStatusID>
<Name>Extremely high</Name>
<Name>High high</Name>
<MainColor>Red</MainColor>
<SecondColor>Red</SecondColor>
<BackColor>LightCoral</BackColor>
Expand Down
22 changes: 14 additions & 8 deletions Projects/WirenBoardDemo/BaseXML/DevType.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<DevType>
<DevTypeID>208</DevTypeID>
<Name>CE6850</Name>
<Driver>DrvCE6850</Driver>
<Driver>DrvCe6850</Driver>
<Descr>Electricity meter CE6850 (6822, 6823, 6827, 6828, 6850М) manufactured by Energomera</Descr>
</DevType>
<DevType>
Expand Down Expand Up @@ -86,8 +86,8 @@
</DevType>
<DevType>
<DevTypeID>215</DevTypeID>
<Name>OPC</Name>
<Driver>DrvOpc</Driver>
<Name>OPC Classic</Name>
<Driver>DrvOpcClassic</Driver>
<Descr>Interacts with controllers according to the OPC DA and OPC AE specifications</Descr>
</DevType>
<DevType>
Expand Down Expand Up @@ -128,9 +128,9 @@
</DevType>
<DevType>
<DevTypeID>222</DevTypeID>
<Name>Wiren Board ST</Name>
<Driver>DrvWirenBoardST</Driver>
<Descr>Wiren Board controller with the custom Sensor-Tools firmware</Descr>
<Name>Anemon</Name>
<Driver>DrvAnemon</Driver>
<Descr>Receives data from Anemon controllers manufactured by Disystec</Descr>
</DevType>
<DevType>
<DevTypeID>223</DevTypeID>
Expand All @@ -153,7 +153,7 @@
<DevType>
<DevTypeID>226</DevTypeID>
<Name>CE30X</Name>
<Driver>DrvCE301</Driver>
<Driver>DrvCe301</Driver>
<Descr>Electricity meters CE30X, which use IEC 61107-2011, manufactured by Energomera</Descr>
</DevType>
<DevType>
Expand Down Expand Up @@ -184,7 +184,7 @@
<DevTypeID>231</DevTypeID>
<Name>MQTT</Name>
<Driver>DrvMqtt</Driver>
<Descr>Interacts with controllers via MQTT protocol</Descr>
<Descr>Interacts with controllers via MQTT protocol. Deprecated</Descr>
</DevType>
<DevType>
<DevTypeID>232</DevTypeID>
Expand Down Expand Up @@ -216,6 +216,12 @@
<Driver>DrvMqttPublisher</Driver>
<Descr>Transmits channel data to MQTT broker and receives commands</Descr>
</DevType>
<DevType>
<DevTypeID>237</DevTypeID>
<Name>CSV Reader</Name>
<Driver>DrvCsvReader</Driver>
<Descr>Reads data from a CSV file</Descr>
</DevType>
<DevType>
<DevTypeID>1001</DevTypeID>
<Name>Custom driver</Name>
Expand Down
22 changes: 9 additions & 13 deletions Projects/WirenBoardDemo/BaseXML/ViewType.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,44 @@
<ArrayOfViewType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ViewType>
<ViewTypeID>1</ViewTypeID>
<Name>Table view</Name>
<Name>Table</Name>
<Code>TableView</Code>
<FileExt>tbl</FileExt>
<Descr>Requires Main Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>2</ViewTypeID>
<Name>Scheme view</Name>
<Name>Scheme</Name>
<Code>SchemeView</Code>
<FileExt>sch</FileExt>
<Descr />
<Descr>Requires Scheme Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>3</ViewTypeID>
<Name>Web page view</Name>
<Name>Web page</Name>
<Code>WebPageView</Code>
<Descr>Requires Web Page Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>4</ViewTypeID>
<Name>Chart Pro view</Name>
<Name>Chart Pro</Name>
<Code>ChartProView</Code>
<Descr>Requires Chart Pro Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>5</ViewTypeID>
<Name>Dashboard view</Name>
<Name>Dashboard</Name>
<Code>DashboardView</Code>
<FileExt>dash</FileExt>
<Descr>Requires Dashboard Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>6</ViewTypeID>
<Name>Map view</Name>
<Name>Map</Name>
<Code>MapView</Code>
<FileExt>map</FileExt>
<Descr>Requires Map Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>7</ViewTypeID>
<Name>Elastic report</Name>
<Code>ElasticRep</Code>
<Descr>Requires Elastic Report Plugin</Descr>
</ViewType>
<ViewType>
<ViewTypeID>101</ViewTypeID>
<Name>Custom view</Name>
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/OpenExtensions/ExtDepPostgreSql/ExtDepPostgreSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="6.0.6" />
<PackageReference Include="Npgsql" Version="6.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion ScadaAdmin/OpenExtensions/ExtProjectTools/Controls/CtrlMainMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ private void SetMenuItemsEnabled()
miChannelMapByDevice.Enabled = projectIsOpen;
miChannelMapByObject.Enabled = projectIsOpen;
miDeviceMap.Enabled = projectIsOpen;
miObjectMap.Enabled = projectIsOpen;
miCheckIntegrity.Enabled = projectIsOpen;
miEncryptPassword.Enabled = projectIsOpen;
miEncryptPassword.Enabled = true;
miImportTable.Enabled = projectIsOpen;
miExportTable.Enabled = projectIsOpen;
}
Expand Down
4 changes: 2 additions & 2 deletions ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private void btnCreateLim_Click(object sender, EventArgs e)
{
// create new limit
int.TryParse(txtCnlNum.Text, out int cnlNum);
FrmLimCreate frmLimCreate = new(configDatabase) { CnlNum = cnlNum };
FrmLimCreate frmLimCreate = new(configDatabase, cnlNum);

if (frmLimCreate.ShowDialog() == DialogResult.OK)
{
Expand Down
Loading

0 comments on commit f12d605

Please sign in to comment.