Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Jake
2022-06-07 15:03:04 +00:00
parent 3a2f6f58e5
commit 0e0a733c55
3 changed files with 18 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PROMS/Volian.Controls.Library/DisplayRO.cs
View File

@@ -128,7 +128,7 @@ namespace Volian.Controls.Library
if (!_isInitializedDocVersionID && _docVersionInfo != null)
{
_currDocVersionID = (int?) _docVersionInfo.VersionID;?
_currDocVersionID = (int?) _docVersionInfo.VersionID;
}
}
}
@@ -711,7 +711,7 @@ namespace Volian.Controls.Library
public static bool GreaterValue(string value1, string value2)
{
Match match1 = _regExGetNumber.Match(value1);
Match match2 = _regExGetNumber.Match(value2);?
Match match2 = _regExGetNumber.Match(value2);
if (match1.Success && !match1.Value.Contains("/") && match2.Success && !match2.Value.Contains("/")) // Compare the numeric value?
{
@@ -719,11 +719,11 @@ namespace Volian.Controls.Library
double dbl2;
//B2017-232 changed from Parse to TryParse. AEP had figure title that had a number containing two periods which caused Parse to error?
if (double.TryParse(match1.ToString(), out dbl1) && double.TryParse(match2.ToString(), out dbl2))?
{?
if (double.TryParse(match1.ToString(), out dbl1) && double.TryParse(match2.ToString(), out dbl2))
{
if (dbl1 != dbl2) //B2021-144 if the numerical is identical default to the string comparison?
return dbl1 > dbl2;?
}?
return dbl1 > dbl2;
}
}
return string.Compare(value1, value2, true) > 0;
@@ -752,20 +752,20 @@ namespace Volian.Controls.Library
{
ROFSTLookup.rochild ch = (ROFSTLookup.rochild)tn.Tag;
MyROFSTLookup.LoadChildren(ref ch);
children = ch.children;?
children = ch.children;
}
// if children, add dummy node
if (children != null && children.Length > 0)
{?
{
//ProgressBar_Initialize(children.Length, tn.Text);
for (int i = 0; i < children.Length; i++)
{
//ProgressBar_SetValue(i);
TreeNode tmp = null;?
TreeNode tmp = null;
ROFSTLookup.rochild roc = children[i];
// if this is a group, i.e. type 0, add a dummy node
@@ -773,7 +773,7 @@ namespace Volian.Controls.Library
{
continue; // Ignore: Junk Scenario
}
else if (ROTypeFilter != E_ROValueType.All && (roc.type & (uint)ROTypeFilter) == 0)?
else if (ROTypeFilter != E_ROValueType.All && (roc.type & (uint)ROTypeFilter) == 0)
{
continue; // Ignore: Filter Doesn't Match
}