diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index e1d686ce..72f658d0 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -701,7 +701,7 @@ namespace Volian.Controls.Library pvROImg.ShowDialog(); } else - MessageBox.Show("Cannot Find Image Data"); + MessageBox.Show(string.Format("Cannot Find Image Data: {0}, {1}", MyROFST.ROFstID, fname)); } else if (selectedChld.type == 2) // table { diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index e15e831e..ed6c94cd 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -1226,6 +1226,14 @@ namespace Volian.Controls.Library //doUpCase = (prefix == @"\u8209? "); // Dash character before RO return UpperCaseUnits(rtnstr); } + // For Wolf Creek, the "- " should be right before the link. This ro format flag was introduced + // for Wolf Creek only because a problem was found with some of their data that was incorrectly + // processed through the 'UpRoAftrDash' flag. That flag was more general, i.e. upper cased units + // if there was a dash and then a space or hard space anywhere before the RO text. The original + // 16bit flag was more specific. Other plants that were released had the UpRoAftrDash, but + // we didn't want to change their formats since they had gone through testing. + if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.ROData.UpRoImmAftrDashSpace && Regex.IsMatch(beforeRO, @".*\\u8209\?( )")) + return UpperCaseUnits(rtnstr); // Uppercase the RO Unit if the previous letter is uppercase if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.ROData.UpRoIfPrevUpper && char.IsUpper(LastAlpha(beforeRO)))