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

Note box printing (separate versus same box).

Browse Source 
Support for Metasectionnumber & title page list items
This commit is contained in:
Kathy Ruffing 2013-12-13 15:29:54 +00:00
parent e3c0de2793
commit 6170cd205b
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1142,12 +1142,26 @@ namespace Volian.Print.Library
plstr = plstr.Replace(token, ""); plstr = plstr.Replace(token, "");
//svgGroup.Add(PageItemToSvgText(pageItem, section.DisplayText)); //svgGroup.Add(PageItemToSvgText(pageItem, section.DisplayText));
break; break;
case "{METASECTIONTITLE}":
case "[METASECTIONTITLE]":
if (section.MyParent.IsSection)
plstr = SplitTitle(svgGroup, pageItem, section.MyParent.DisplayText, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr);
else
plstr = plstr.Replace(token, "");
break;
case "{SECTIONLEVELNUMBER}": case "{SECTIONLEVELNUMBER}":
case "[SECTIONLEVELNUMBER]": case "[SECTIONLEVELNUMBER]":
plstr = plstr.Replace(token, section.DisplayNumber); plstr = plstr.Replace(token, section.DisplayNumber);
_sectLevelNumTtlDiff = (int)pageItem.Row; _sectLevelNumTtlDiff = (int)pageItem.Row;
//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, section.DisplayNumber))); //svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, section.DisplayNumber)));
break; break;
case "{METASECTIONNUMBER}":
case "[METASECTIONNUMBER]":
if (section.MyParent.IsSection)
plstr = plstr.Replace(token, section.MyParent.DisplayNumber);
else
plstr = plstr.Replace(token, "");
break;
case "{UNITTEXT}": case "{UNITTEXT}":
case "[UNITTEXT]": case "[UNITTEXT]":
plstr = plstr.Replace(token, MySection.MyDocVersion.DocVersionConfig.Unit_Text); plstr = plstr.Replace(token, MySection.MyDocVersion.DocVersionConfig.Unit_Text);

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

@ -124,8 +124,15 @@ namespace Volian.Print.Library
yoff = Add(cb, childItemInfo.Notes, xoff, yoff, yoffRight, rnoLevel, maxRNO, formatInfo); yoff = Add(cb, childItemInfo.Notes, xoff, yoff, yoffRight, rnoLevel, maxRNO, formatInfo);
//int? bxIndx = childItemInfo.FormatStepData == null ? -1 : childItemInfo.FormatStepData.StepLayoutData.STBoxindex; //int? bxIndx = childItemInfo.FormatStepData == null ? -1 : childItemInfo.FormatStepData.StepLayoutData.STBoxindex;
bool boxHLS = false; bool boxHLS = false;
// If this step has a previous, and its header is different than the previous's header. Allow it to go
// into the box code. Without this check, none of the box code is run. This caused a problem
// for VCS where two different type notes where not getting separate boxes.
bool doSeparateBoxHdrChg = false;
if (childItemInfo.MyPrevious != null && childItemInfo.MyHeader != null && childItemInfo.MyPrevious.MyHeader != null
&& childItemInfo.MyHeader.CleanText != childItemInfo.MyPrevious.MyHeader.CleanText) doSeparateBoxHdrChg = true;
if ((bxIndx ?? -1) != -1 && (bxIndex != bxIndx || childItemInfo.FormatStepData.BoxIt || childItemInfo.MyHeader != null)) if ((bxIndx ?? -1) != -1 && (bxIndex != bxIndx || childItemInfo.FormatStepData.BoxIt || childItemInfo.MyHeader != null || doSeparateBoxHdrChg))
{ {
if (childItemInfo.FormatStepData.BoxIt) // this is a boxed HLS if (childItemInfo.FormatStepData.BoxIt) // this is a boxed HLS
{ {
@ -159,7 +166,7 @@ namespace Volian.Print.Library
if (childItemInfo.IsCaution && !childItemInfo.FormatStepData.SeparateBox && !childItemInfo.FormatStepData.SeparateBoxCautions) handleSeparateBox = false; if (childItemInfo.IsCaution && !childItemInfo.FormatStepData.SeparateBox && !childItemInfo.FormatStepData.SeparateBoxCautions) handleSeparateBox = false;
if (childItemInfo.IsNote && !childItemInfo.FormatStepData.SeparateBox) handleSeparateBox = false; if (childItemInfo.IsNote && !childItemInfo.FormatStepData.SeparateBox) handleSeparateBox = false;
if (bxIndx != null && (handleSeparateBox || bxIndex != bxIndx)) if (bxIndx != null && (handleSeparateBox || bxIndex != bxIndx || doSeparateBoxHdrChg))
{ {
if (box != null) if (box != null)
{ {