From e83c756161296258894f6674d52ecfb493340890 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 7 Feb 2014 17:43:53 +0000 Subject: [PATCH] Changed how ROFSTLookup object was obtained based on correct DocVersion --- .../PDFConsistencyCheckReport.cs | 4 ++-- PROMS/Volian.Print.Library/PDFReport.cs | 2 +- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 2 +- PROMS/Volian.Print.Library/vlnParagraph.cs | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs index c0ebf330..6978b904 100644 --- a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs +++ b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs @@ -299,9 +299,9 @@ namespace Volian.Print.Library Dictionary> ros = new Dictionary>(); DocVersionInfo dvi = MyItemInfoList[0].MyDocVersion; ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; - rofst.docVer = dvi; + //rofst.docVer = dvi; // ROFSTLookup lu = MyItemInfoList[0].MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; - ROFSTLookup lu = rofst.ROFSTLookup; + ROFSTLookup lu = rofst.GetROFSTLookup(dvi); if (types.ContainsKey(0)) { foreach (ProcedureInfo pi in MyItemInfoList) diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 30106449..fac0906d 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -1127,7 +1127,7 @@ namespace Volian.Print.Library private static string GetROTitleAndGroup(string roid, ItemInfo itm) { string rotitle = ""; - ROFSTLookup myrofstlookup = itm.MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; + ROFSTLookup myrofstlookup = itm.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(itm.MyDocVersion); List roTitleList = myrofstlookup.GetROTitleAndGroupPath(roid); for (int cnt = 0; cnt < roTitleList.Count; cnt++) { diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 98d2900e..59990a23 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -926,7 +926,7 @@ namespace Volian.Print.Library } private string ROLookup(string accpageid, string multiid, string deflt) { - ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; + ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion); string accpgid = accpageid; accpgid = accpgid.Replace("-HIGH", "-HI").Replace("-LOW", "-LO").Replace("_HIGH", "-HI").Replace("_LOW", "-LO").Replace(@"\u8209?", "-"); string val = myLookup.GetROValueByAccPagID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix); diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 4a5cc455..a5e3cdd9 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -848,11 +848,11 @@ namespace Volian.Print.Library // preceeding foldout. if (MyItemInfo.FoldoutIndex() <= -1) { - MyPageHelper.OnBlankPage = true; - cb.PdfDocument.Add(new iTextSharp.text.Table(1)); - cb.PdfDocument.NewPage(); - //_MyLog.InfoFormat("NewPage 10 blank {0}", cb.PdfWriter.CurrentPageNumber); - } + MyPageHelper.OnBlankPage = true; + cb.PdfDocument.Add(new iTextSharp.text.Table(1)); + cb.PdfDocument.NewPage(); + //_MyLog.InfoFormat("NewPage 10 blank {0}", cb.PdfWriter.CurrentPageNumber); + } } yPageStart = yTopMargin + YTopMost; DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart); @@ -1729,8 +1729,8 @@ namespace Volian.Print.Library // DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo; DocVersionInfo dvi = proc.MyDocVersion; ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; - rofst.docVer = dvi; - ROFSTLookup lookup = rofst.ROFSTLookup; + //rofst.docVer = dvi; + ROFSTLookup lookup = rofst.GetROFSTLookup(dvi); string linkInfoText = itemInfo.MyContent.Text.Replace(@"\v ", ""); Match m = Regex.Match(linkInfoText, @"(.*)[#]Link:([A-Za-z]*):(.*)"); if (m.Groups.Count < 4)