Compare commits
7 Commits
C2026-003_
...
Developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e2a41b6cb | |||
| 258b1d2d1f | |||
| a4ea200e38 | |||
| 43a27c16a6 | |||
| 3c693baab0 | |||
| d186e2702c | |||
| aee478114b |
BIN
PROMS/Volian.Controls.Library/DisplayHistory.designer.cs
generated
BIN
PROMS/Volian.Controls.Library/DisplayHistory.designer.cs
generated
Binary file not shown.
@@ -112,13 +112,13 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="myVFG.MyBorderDetailString" xml:space="preserve">
|
||||
<value><?xml version="1.0" encoding="utf-8"?>
|
||||
<value><?xml version="1.0" encoding="utf-16"?>
|
||||
<VlnBorders Rows="4" Columns="3">
|
||||
<VerticalLines Rows="4" Columns="4">
|
||||
<Lines>
|
||||
@@ -161,7 +161,31 @@
|
||||
</HorizontalLines>
|
||||
</VlnBorders></value>
|
||||
</data>
|
||||
<data name="myVFG.StyleInfo" xml:space="preserve">
|
||||
<value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} </value>
|
||||
<data name="myVFG.MyShadingDetailString" xml:space="preserve">
|
||||
<value><?xml version="1.0" encoding="utf-16"?>
|
||||
<VlnGridCellShading Rows="4" Columns="3">
|
||||
<TableShadingInfo Rows="4" Columns="3">
|
||||
<CellShadingColor>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
</CellShadingColor>
|
||||
</TableShadingInfo>
|
||||
</VlnGridCellShading></value>
|
||||
</data>
|
||||
<data name="myVFG.StyleInfo" xml:space="preserve">
|
||||
<value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} FrozenAlternate{} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} </value>
|
||||
</data>
|
||||
<metadata name="myTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -537,6 +537,10 @@ namespace Volian.Controls.Library
|
||||
// if it is a modify and there will be no usages if it is new (the usage gets created on the save)
|
||||
if (!MyFlexGrid.IsRoTable)
|
||||
{
|
||||
// B2026-003 we where using a string.format on this inside the while loop - allocating memory each time
|
||||
// so I move it outside the while loop and did a simple assigment of text
|
||||
string lookForLinks = @"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>";
|
||||
|
||||
while (r < h)
|
||||
{
|
||||
CellRange cr = MyFlexGrid.GetMergedRange(r, c);
|
||||
@@ -546,8 +550,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
// see if there are any links and save these so that any deleted ROs or transitions in the
|
||||
// steprtb can have associated usages/transitions records removed from the database.
|
||||
string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>");
|
||||
MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookFor);
|
||||
MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookForLinks);
|
||||
for (int i = matches.Count - 1; i >= 0; i--)
|
||||
{
|
||||
Match m = matches[i];
|
||||
|
||||
@@ -272,10 +272,12 @@ namespace Volian.Controls.Library
|
||||
for (int i = 0; i < rows * cols; i++)
|
||||
datum.Add("|");
|
||||
XmlNodeList nl = xd.SelectNodes("C1FlexGrid/Cells/Cell/Data");
|
||||
string data = string.Empty;
|
||||
// B2026-003 use StringBuilder a "using" statement around the RichTextBox for better mememory management
|
||||
StringBuilder data = new StringBuilder();
|
||||
foreach (XmlNode xn in nl)
|
||||
{
|
||||
RichTextBox rtb = new RichTextBox();
|
||||
using (RichTextBox rtb = new RichTextBox())
|
||||
{
|
||||
rtb.Rtf = xn.InnerText;
|
||||
XmlAttribute xa = xn.ParentNode.Attributes.GetNamedItem("index") as XmlAttribute;
|
||||
string[] rc = xa.InnerText.Split(',');
|
||||
@@ -284,9 +286,10 @@ namespace Volian.Controls.Library
|
||||
int index = r * cols + c;
|
||||
datum[index] = "|" + (rtb.Text == "" ? "" : rtb.Text);
|
||||
}
|
||||
}
|
||||
foreach (string s in datum)
|
||||
data += s;
|
||||
return data;
|
||||
data.Append(s);
|
||||
return data.ToString();
|
||||
}
|
||||
private string GetCellFormatString(XmlDocument xd)
|
||||
{
|
||||
|
||||
@@ -460,6 +460,7 @@
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DisplayHistory.resx">
|
||||
<DependentUpon>DisplayHistory.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DisplayLibDocs.resx">
|
||||
<DependentUpon>DisplayLibDocs.cs</DependentUpon>
|
||||
|
||||
Reference in New Issue
Block a user