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

F2021-053: BNPP Alarm – need ability to have super/sub scripts in the text of Alarm Tables (ROs)

Browse Source
This commit is contained in:
Kathy Ruffing
2021-10-25 12:18:49 +00:00
parent 6a10408a94
commit 2b25136036
6 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@@ -1393,6 +1393,14 @@ i = 0;
// parts[1] - Which of the multiple return value from the RO to return
// parts[2] - the value to use if not found in ROs - usually defined in a PSI field for that Alarm procedure
string ROLookupVal = ROLookup(parts[0], parts[1], parts[2]);
// F2021-053: Do replace words for Page List items. This uses a DisplayText constructor that flags this case
// and gets the resulting replaced words
if (pageItem.RepWords)
{
DisplayText dt1 = new DisplayText(MyPromsPrinter.MyItem, ROLookupVal, false, true);
ROLookupVal = dt1.StartText;
}
pltok = pltok.Substring(0, idxstart) + ROLookupVal + ((idxstart + idxend < pltok.Length) ? pltok.Substring(idxstart + idxend + 1) : "");
}
MatchCollection matches = regexFindToken.Matches(pltok);//(pageItem.Token);
@@ -2629,6 +2637,10 @@ i = 0;
private static SvgText PageItemToSvgText(VEPROMS.CSLA.Library.PageItem pageItem, string text, SectionInfo mySection)
{
SvgText svgText = new SvgText();
// F2021-053: Do replace words for Page List items. Send format items down to svgtext.
SvgText.CompressSuper = mySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressHPSuper;
SvgText.CompressSub = mySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressHPSub;
SvgText.CompressPropSubSup = mySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressPropSubSup;
svgText.Text = text;
VEPROMS.CSLA.Library.E_Justify justify = pageItem.Justify ?? VEPROMS.CSLA.Library.E_Justify.PSLeft;
float colAdj16bit = 0;
@@ -2752,6 +2764,10 @@ i = 0;
int dotsPerChar = (int)(2400 / (MySection.MyDocStyle.Layout.PageWidth / 6));
lcol = (lcol * 25) / dotsPerChar;
}
// F2021-053: Do replace words for Page List items. Send format items down to svgtext.
SvgText.CompressSuper = MySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressHPSuper;
SvgText.CompressSub = MySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressHPSub;
SvgText.CompressPropSubSup = MySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressPropSubSup;
svgText.Font = font.WindowsFont;
svgText.X = new SvgMeasurement((float)lcol - colAdj16bit, E_MeasurementUnits.PT); // new SvgMeasurement((float)(pageItem.Col ?? 0), E_MeasurementUnits.PT);
svgText.Y = new SvgMeasurement(row, E_MeasurementUnits.PT);