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

Changed how ROFSTLookup object was obtained based on correct DocVersion

Browse Source
This commit is contained in:
Rich 2014-02-07 17:43:53 +00:00
parent ffd5191ffc
commit e83c756161
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs
View File

@ -299,9 +299,9 @@ namespace Volian.Print.Library
Dictionary<string, Dictionary<string, bool>> ros = new Dictionary<string, Dictionary<string, bool>>(); Dictionary<string, Dictionary<string, bool>> ros = new Dictionary<string, Dictionary<string, bool>>();
DocVersionInfo dvi = MyItemInfoList[0].MyDocVersion; DocVersionInfo dvi = MyItemInfoList[0].MyDocVersion;
ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst;
rofst.docVer = dvi; //rofst.docVer = dvi;
// ROFSTLookup lu = MyItemInfoList[0].MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; // ROFSTLookup lu = MyItemInfoList[0].MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup;
ROFSTLookup lu = rofst.ROFSTLookup; ROFSTLookup lu = rofst.GetROFSTLookup(dvi);
if (types.ContainsKey(0)) if (types.ContainsKey(0))
{ {
foreach (ProcedureInfo pi in MyItemInfoList) foreach (ProcedureInfo pi in MyItemInfoList)

2
PROMS/Volian.Print.Library/PDFReport.cs
View File

@ -1127,7 +1127,7 @@ namespace Volian.Print.Library
private static string GetROTitleAndGroup(string roid, ItemInfo itm) private static string GetROTitleAndGroup(string roid, ItemInfo itm)
{ {
string rotitle = ""; string rotitle = "";
ROFSTLookup myrofstlookup = itm.MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; ROFSTLookup myrofstlookup = itm.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(itm.MyDocVersion);
List<string> roTitleList = myrofstlookup.GetROTitleAndGroupPath(roid); List<string> roTitleList = myrofstlookup.GetROTitleAndGroupPath(roid);
for (int cnt = 0; cnt < roTitleList.Count; cnt++) for (int cnt = 0; cnt < roTitleList.Count; cnt++)
{ {

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

@ -926,7 +926,7 @@ namespace Volian.Print.Library
} }
private string ROLookup(string accpageid, string multiid, string deflt) 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; string accpgid = accpageid;
accpgid = accpgid.Replace("-HIGH", "-HI").Replace("-LOW", "-LO").Replace("_HIGH", "-HI").Replace("_LOW", "-LO").Replace(@"\u8209?", "-"); 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); string val = myLookup.GetROValueByAccPagID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);

14
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -848,11 +848,11 @@ namespace Volian.Print.Library
// preceeding foldout. // preceeding foldout.
if (MyItemInfo.FoldoutIndex() <= -1) if (MyItemInfo.FoldoutIndex() <= -1)
{ {
MyPageHelper.OnBlankPage = true; MyPageHelper.OnBlankPage = true;
cb.PdfDocument.Add(new iTextSharp.text.Table(1)); cb.PdfDocument.Add(new iTextSharp.text.Table(1));
cb.PdfDocument.NewPage(); cb.PdfDocument.NewPage();
//_MyLog.InfoFormat("NewPage 10 blank {0}", cb.PdfWriter.CurrentPageNumber); //_MyLog.InfoFormat("NewPage 10 blank {0}", cb.PdfWriter.CurrentPageNumber);
} }
} }
yPageStart = yTopMargin + YTopMost; yPageStart = yTopMargin + YTopMost;
DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart); DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart);
@ -1729,8 +1729,8 @@ namespace Volian.Print.Library
// DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo; // DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo;
DocVersionInfo dvi = proc.MyDocVersion; DocVersionInfo dvi = proc.MyDocVersion;
ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst;
rofst.docVer = dvi; //rofst.docVer = dvi;
ROFSTLookup lookup = rofst.ROFSTLookup; ROFSTLookup lookup = rofst.GetROFSTLookup(dvi);
string linkInfoText = itemInfo.MyContent.Text.Replace(@"\v ", ""); string linkInfoText = itemInfo.MyContent.Text.Replace(@"\v ", "");
Match m = Regex.Match(linkInfoText, @"(.*)[#]Link:([A-Za-z]*):(.*)"); Match m = Regex.Match(linkInfoText, @"(.*)[#]Link:([A-Za-z]*):(.*)");
if (m.Groups.Count < 4) if (m.Groups.Count < 4)