This commit is contained in:
parent
4516759585
commit
295bcdb4e0
@ -145,7 +145,7 @@ namespace Volian.Print.Library
|
||||
float yLocation = CalculateYOffset(yPageStart, yTopMargin);
|
||||
if (MyItemInfo.HasChangeBar && MyPageHelper.ChangeBarDefinition.MyChangeBarType != PrintChangeBar.Without) MyPageHelper.AddChangeBar(DoChangeBar(cb, MyItemInfo, MyPageHelper, XOffset, yLocation, MyPageHelper.MaxRNO, MyItemInfo.ActiveFormat), cbMess);
|
||||
float retval = yLocation;
|
||||
|
||||
bool doprint = true;
|
||||
if (MyItemInfo.IsFigure)
|
||||
{
|
||||
yLocation -= (SixLinesPerInch * MyPageHelper.YMultiplier);
|
||||
@ -160,16 +160,16 @@ namespace Volian.Print.Library
|
||||
&& !MyItemInfo.MyDocStyle.CancelSectTitle
|
||||
&& !MyItemInfo.MyDocStyle.SpecialStepsFoldout)) // Don't ouput the Step Section title
|
||||
{
|
||||
bool doprint = true;
|
||||
// if this is a section, then check the section config for printable header too.
|
||||
if (MyItemInfo.IsSection)
|
||||
{
|
||||
SectionConfig sch = MyItemInfo.MyConfig as SectionConfig;
|
||||
if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles
|
||||
&& !MyItemInfo.MyDocStyle.CancelSectTitle
|
||||
&& !MyItemInfo.MyDocStyle.SpecialStepsFoldout)
|
||||
&& !MyItemInfo.MyDocStyle.SpecialStepsFoldout
|
||||
&& !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
|
||||
&&
|
||||
((sch != null && sch.Section_PrintHdr != "Y") || !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)) doprint = false;
|
||||
(sch != null && sch.Section_PrintHdr != "Y")) doprint = false;
|
||||
}
|
||||
if (MyItemInfo.MyContent.MyGrid != null)
|
||||
retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation);
|
||||
@ -199,7 +199,7 @@ namespace Volian.Print.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
//Height = yLocation - retval;
|
||||
if (!doprint) return yPageStart;
|
||||
if (_PartsLeft != null && _PartsLeft.Count > 0) yPageStart = PartsLeft.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
|
||||
if (_PartsRight != null && _PartsRight.Count > 0) yPageStart = PartsRight.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
|
||||
if (_PartsBelow != null && _PartsBelow.Count > 0) yPageStart = PartsBelow.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
|
||||
@ -844,7 +844,7 @@ namespace Volian.Print.Library
|
||||
MyTopRNO = this;
|
||||
else
|
||||
MyTopRNO = MyParent.MyTopRNO;
|
||||
if(MyTopRNO != null) MyTopRNO.LastRNO = this;
|
||||
if (MyTopRNO != null) MyTopRNO.LastRNO = this;
|
||||
}
|
||||
MyContentByte = cb;
|
||||
if (!MyPageHelper.MyParagraphs.ContainsKey(itemInfo.ItemID)) MyPageHelper.MyParagraphs.Add(itemInfo.ItemID, this);
|
||||
@ -856,7 +856,7 @@ namespace Volian.Print.Library
|
||||
// special case - this is a 'Word Doc' paragraph. The Processed flag is used to know
|
||||
// that steps need put out on a page for the pagination logic, and since there are no steps
|
||||
// we don't want to have to worry about putting this out for pagination logic.
|
||||
Processed = true;
|
||||
Processed = true;
|
||||
return;
|
||||
}
|
||||
YTopMost = YOffset = yoff;
|
||||
@ -869,11 +869,12 @@ namespace Volian.Print.Library
|
||||
XOffset += 72 * (itemInfo.FormatStepData.CautionOrNoteSubstepIndent == null ? 0 : (float)itemInfo.FormatStepData.CautionOrNoteSubstepIndent / (float)itemInfo.FormatStepData.Font.CPI);
|
||||
|
||||
if (itemInfo.IsStep && itemInfo.MyHLS.FormatStepData.UseSmartTemplate &&
|
||||
itemInfo.FormatStepData.StepLayoutData.AlignWithParentTab
|
||||
itemInfo.FormatStepData.StepLayoutData.AlignWithParentTab
|
||||
|| (itemInfo.Steps != null && itemInfo.Steps.Count > 0 && itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab))
|
||||
itemInfo.MyTab = null;
|
||||
|
||||
|
||||
float xMetaAdj = 0;
|
||||
|
||||
if (itemInfo.MyTab != null && itemInfo.MyTab.Text != null && itemInfo.MyTab.Text != "")
|
||||
{
|
||||
float localXOffset = XOffset;
|
||||
@ -885,7 +886,11 @@ namespace Volian.Print.Library
|
||||
&& !MyItemInfo.MyDocStyle.CancelSectTitle
|
||||
&& !MyItemInfo.MyDocStyle.SpecialStepsFoldout)
|
||||
&&
|
||||
((sch != null && sch.Section_PrintHdr != "Y") || !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)) doprint = false;
|
||||
((sch != null && sch.Section_PrintHdr != "Y") || !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections))
|
||||
{
|
||||
doprint = false;
|
||||
YTopMost = 0;
|
||||
}
|
||||
}
|
||||
if (doprint && itemInfo.IsSection && !itemInfo.MyDocStyle.CancelSectTitle && itemInfo.MyTab.Text.ToUpper() != "FOLDOUT")
|
||||
{
|
||||
@ -913,7 +918,7 @@ namespace Volian.Print.Library
|
||||
for (int i = 0; i < MetaLevel; i++)
|
||||
{
|
||||
xMetaAdj += (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos - (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
|
||||
xMetaAdj += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[i].SecNumPositionAdj;
|
||||
xMetaAdj += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[i].SecNumPositionAdj;
|
||||
|
||||
}
|
||||
offset += xMetaAdj;
|
||||
@ -946,7 +951,7 @@ namespace Volian.Print.Library
|
||||
float yoffLeft = yoff;
|
||||
if (itemInfo.Cautions != null && !(itemInfo.IsCaution || itemInfo.IsNote))
|
||||
{
|
||||
if(itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format)
|
||||
if (itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format)
|
||||
yoffLeft = ChildrenLeft.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo);
|
||||
else
|
||||
yoff = ChildrenAbove.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo);
|
||||
@ -993,7 +998,7 @@ namespace Volian.Print.Library
|
||||
bool dropCheckoff = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.DropCheckOff;
|
||||
if (itemInfo.MyContent.MyGrid != null)
|
||||
{
|
||||
VlnFlexGrid myFlexGrid = new VlnFlexGrid(1,1);
|
||||
VlnFlexGrid myFlexGrid = new VlnFlexGrid(1, 1);
|
||||
myFlexGrid.LoadGrid(itemInfo);
|
||||
MyGrid = new vlnTable(myFlexGrid, cb);
|
||||
Height = MyGrid.Height;
|
||||
@ -1070,7 +1075,7 @@ namespace Volian.Print.Library
|
||||
}
|
||||
if (itemInfo.IsStep && itemInfo.MyHLS.FormatStepData.UseSmartTemplate)
|
||||
{
|
||||
if (itemInfo.FormatStepData.StepLayoutData.AlignWithParentTab
|
||||
if (itemInfo.FormatStepData.StepLayoutData.AlignWithParentTab
|
||||
|| (itemInfo.Steps != null && itemInfo.Steps.Count > 0 && itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab))
|
||||
{
|
||||
int stplevl = TheStepLevel(itemInfo);
|
||||
@ -1095,7 +1100,7 @@ namespace Volian.Print.Library
|
||||
|
||||
// If WCN checklists, the substeps are printed in a row, need to keep track of the 'longest' in
|
||||
// y direction (bottommost) across the row.
|
||||
if (itemInfo.IsStep && itemInfo.MyHLS.FormatStepData.UseSmartTemplate && (TheStepLevel(itemInfo)>0))
|
||||
if (itemInfo.IsStep && itemInfo.MyHLS.FormatStepData.UseSmartTemplate && (TheStepLevel(itemInfo) > 0))
|
||||
{
|
||||
// do I need to get max of savCheckListBottomMost & (yoff+Height+SixLinesPerInch)
|
||||
savCheckListBottomMost = yoff + Height + SixLinesPerInch;
|
||||
@ -1104,7 +1109,7 @@ namespace Volian.Print.Library
|
||||
// text) for wcn checklist, i.e. .
|
||||
if ((!itemInfo.IsStepSection && !itemInfo.MyHLS.FormatStepData.UseSmartTemplate)
|
||||
|| printMetaHdr ||
|
||||
(formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles
|
||||
(formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles
|
||||
&& !MyItemInfo.MyDocStyle.CancelSectTitle
|
||||
&& !MyItemInfo.MyDocStyle.SpecialStepsFoldout)
|
||||
// In WCN Checklist: I don't have children or if I have children the first child doesn't alignwithparent.
|
||||
@ -1116,9 +1121,10 @@ namespace Volian.Print.Library
|
||||
yoff += AdjustForBlankLines();
|
||||
if (dropCheckoff)
|
||||
yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
CheckOff co = itemInfo.GetCheckOffStep();
|
||||
if (co != null)
|
||||
{
|
||||
@ -1161,17 +1167,16 @@ namespace Volian.Print.Library
|
||||
}
|
||||
|
||||
bool rightLonger = yOffRight > yoff;
|
||||
if(!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table
|
||||
yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, rightLonger?yOffRight:yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo);
|
||||
if (!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table
|
||||
yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, rightLonger ? yOffRight : yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo);
|
||||
else // AER or RNO Table
|
||||
yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo);
|
||||
}
|
||||
yOffRight = Math.Max(yOffRight, yoffLeft);
|
||||
|
||||
// Look for the meta section case where the 'Editable' flag is set to 'N', which means that
|
||||
// these steps should not be printed:
|
||||
bool printsteps = true;
|
||||
if (itemInfo.Steps != null && itemInfo.IsSection && itemInfo.Sections!=null && itemInfo.Sections.Count>0)
|
||||
if (itemInfo.Steps != null && itemInfo.IsSection && itemInfo.Sections != null && itemInfo.Sections.Count > 0)
|
||||
{
|
||||
SectionConfig sc = itemInfo.MyConfig as SectionConfig;
|
||||
if (sc != null && sc.SubSection_Edit != "Y") printsteps = false;
|
||||
@ -1189,7 +1194,7 @@ namespace Volian.Print.Library
|
||||
vlnParagraph rno = ChildrenRight[0];
|
||||
vlnParagraph bottomChild = BottomChild;
|
||||
float xsep = MyHighLevelParagraph.XOffset + RnoOffset;
|
||||
vlnRNOSeparator myRnoSep = new vlnRNOSeparator(this, cb, tmpRnoSepStr, xsep, yoff, formatInfo, bottomChild==null?true:bottomChild.MyItemInfo.HasChangeBar);
|
||||
vlnRNOSeparator myRnoSep = new vlnRNOSeparator(this, cb, tmpRnoSepStr, xsep, yoff, formatInfo, bottomChild == null ? true : bottomChild.MyItemInfo.HasChangeBar);
|
||||
// TODO: May need to handle more than one RNO column for RNO Separator
|
||||
if (rno.LastRNO.MyItemInfo.HasChangeBar == false && bottomChild != null && bottomChild.MyItemInfo.HasChangeBar)
|
||||
bottomChild.PartsBelow.Add(myRnoSep);
|
||||
@ -1201,7 +1206,7 @@ namespace Volian.Print.Library
|
||||
|
||||
// For WCN Checklist, the substeps are in rows of data. The YBottomMost is the bottom most for
|
||||
// the row.
|
||||
if (savCheckListBottomMost != 0 && savCheckListBottomMost>YBottomMost) YBottomMost = savCheckListBottomMost;
|
||||
if (savCheckListBottomMost != 0 && savCheckListBottomMost > YBottomMost) YBottomMost = savCheckListBottomMost;
|
||||
}
|
||||
|
||||
private int TheStepLevel(ItemInfo itemInfo)
|
||||
|
Loading…
x
Reference in New Issue
Block a user