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

Improved error message when image data is not found during a ‘preview’ request

Browse Source 
Use UpRoImmAftrDashSpace to upper case RO units (flag was introduced for WCN)
This commit is contained in:
Kathy Ruffing 2014-02-05 13:46:15 +00:00
parent c2f11de722
commit 5ccdd9d3d7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,7 +701,7 @@ namespace Volian.Controls.Library
pvROImg.ShowDialog(); pvROImg.ShowDialog();
} }
else 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 else if (selectedChld.type == 2) // table
{ {

8
PROMS/Volian.Controls.Library/DisplayText.cs
View File

@ -1226,6 +1226,14 @@ namespace Volian.Controls.Library
//doUpCase = (prefix == @"\u8209? "); // Dash character before RO //doUpCase = (prefix == @"\u8209? "); // Dash character before RO
return UpperCaseUnits(rtnstr); 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 // Uppercase the RO Unit if the previous letter is uppercase
if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.ROData.UpRoIfPrevUpper && char.IsUpper(LastAlpha(beforeRO))) if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.ROData.UpRoIfPrevUpper && char.IsUpper(LastAlpha(beforeRO)))